Updated rmtree to handle readonly files

pytlas/interpreters/snips.py

@@ -1,9 +1,8 @@
 import os
-from shutil import rmtree
 from pytlas.interpreters.interpreter import Interpreter, compute_checksum
 from pytlas.interpreters.intent import Intent
 from pytlas.interpreters.slot import SlotValue
-from pytlas.utils import read_file
+from pytlas.utils import read_file, rmtree
 from snips_nlu import load_resources, SnipsNLUEngine, __version__
 from snips_nlu.constants import ENTITIES, AUTOMATICALLY_EXTENSIBLE, RESOLVED_VALUE, \
   ENTITY_KIND, ENTITY, RES_VALUE, RES_RAW_VALUE, RES_INTENT, RES_INTENT_NAME, RES_SLOTS, \

pytlas/pam.py

@@ -1,8 +1,7 @@
 from pytlas.skill import handlers, module_metas
 from pytlas.localization import module_translations
-from pytlas.utils import get_package_name_from_module
+from pytlas.utils import get_package_name_from_module, rmtree
 from pytlas.skill_data import SkillData
-from shutil import rmtree
 import re, logging, os, subprocess
 
 DEFAULT_REPO_URL = os.environ.get('PYTLAS_DEFAULT_REPO_URL', 'https://github.com/')
@@ -148,9 +147,7 @@ def install_skills(directory, stdout=None, *names):
     if os.path.isdir(dest):
       if stdout:
         stdout('  Skill folder already exists, updating')
-
-      logging.warning('Skill already exists, will update it')
-
+
       installed_skills.extend(update_skills(directory, stdout, name))
 
       continue
@@ -269,8 +266,6 @@ def uninstall_skills(directory, stdout, *names):
       if stdout:
         stdout('  Uninstalled ✔️')
 
-      logging.info('Uninstalled "%s"' % name)
-
       removed_skills.append(name)
     except Exception as e:
       if stdout:

pytlas/utils.py

@@ -1,4 +1,5 @@
 import sys, inspect, os, random
+from shutil import rmtree as shrmtree
 from fuzzywuzzy import process
 from markdown import markdown
 from bs4 import BeautifulSoup
@@ -152,4 +153,34 @@ def find_match(choices, value):
 
   match = process.extractOne(value, choices, score_cutoff=60)
 
-  return match[0] if match else None
+  return match[0] if match else None
+
+def _onerror(func, path, exc_info):
+  """Error handler for ``shutil.rmtree``.
+
+  If the error is due to an access error (read only file)
+  it attempts to add write permission and then retries.
+
+  If the error is for another reason it re-raises the error.
+
+  """
+  import stat
+
+  if not os.access(path, os.W_OK):
+      # Is the error an access error ?
+      os.chmod(path, stat.S_IWUSR)
+      func(path)
+  else:
+      raise
+
+def rmtree(path, ignore_errors=False):
+  """Recursively deletes a folder and its children and handle readonly files as per
+  https://stackoverflow.com/a/2656405/7641999.
+
+  Args:
+    path (str): Path to delete
+    ignore_errors (bool): Should we ignore errors
+
+  """
+
+  shrmtree(path, ignore_errors=ignore_errors, onerror=_onerror)