Fix removing old backups (#622)

Author: mediaminister

lib/inputstreamhelper/kodiutils.py

@@ -363,22 +363,25 @@ def open_file(path, flags='r'):
 def copy(src, dest):
     """Copy a file (using xbmcvfs)"""
     from xbmcvfs import copy as vfscopy
-    log(2, "Copy file '{src}' to '{dest}'.", src=src, dest=dest)
+    log(0, "Copy file '{src}' to '{dest}'.", src=src, dest=dest)
     return vfscopy(from_unicode(src), from_unicode(dest))
 
 
 def delete(path):
     """Remove a file (using xbmcvfs)"""
     from xbmcvfs import delete as vfsdelete
-    log(2, "Delete file '{path}'.", path=path)
+    log(0, "Delete file '{path}'.", path=path)
     return vfsdelete(from_unicode(path))
 
 
 def exists(path):
     """Whether the path exists (using xbmcvfs)"""
     # File or folder (folder must end with slash or backslash)
     from xbmcvfs import exists as vfsexists
-    return vfsexists(from_unicode(path))
+    if vfsexists(from_unicode(path)):
+        log(0, "Path '{path}' exists.", path=path)
+        return True
+    return False
 
 
 def listdir(path):
@@ -391,14 +394,14 @@ def listdir(path):
 def mkdir(path):
     """Create a directory (using xbmcvfs)"""
     from xbmcvfs import mkdir as vfsmkdir
-    log(2, "Create directory '{path}'.", path=path)
+    log(0, "Create directory '{path}'.", path=path)
     return vfsmkdir(from_unicode(path))
 
 
 def mkdirs(path):
     """Create directory including parents (using xbmcvfs)"""
     from xbmcvfs import mkdirs as vfsmkdirs
-    log(2, "Recursively create directory '{path}'.", path=path)
+    log(0, "Recursively create directory '{path}'.", path=path)
     return vfsmkdirs(from_unicode(path))
 
 

lib/inputstreamhelper/utils.py

@@ -49,7 +49,7 @@ def __eq__(self, other):
 
 def temp_path():
     """Return temporary path, usually ~/.kodi/userdata/addon_data/script.module.inputstreamhelper/temp/"""
-    tmp_path = translate_path(os.path.join(get_setting('temp_path', 'special://masterprofile/addon_data/script.module.inputstreamhelper'), 'temp'))
+    tmp_path = translate_path(os.path.join(get_setting('temp_path', 'special://masterprofile/addon_data/script.module.inputstreamhelper'), 'temp', ''))
     if not exists(tmp_path):
         mkdirs(tmp_path)
 
@@ -388,7 +388,7 @@ def hardlink(src, dest):
         link(compat_path(src), compat_path(dest))
     except (AttributeError, OSError, ImportError):
         return copy(src, dest)
-    log(2, "Hardlink file '{src}' to '{dest}'.", src=src, dest=dest)
+    log(0, "Hardlink file '{src}' to '{dest}'.", src=src, dest=dest)
     return True
 
 

lib/inputstreamhelper/widevine/widevine.py

@@ -97,7 +97,6 @@ def has_widevinecdm():
         return True
 
     widevinecdm = widevinecdm_path()
-    log(3, widevinecdm)
     if widevinecdm is None:
         return False
     if not exists(widevinecdm):
@@ -178,6 +177,7 @@ def latest_widevine_version():
 def remove_old_backups(bpath):
     """Removes old Widevine backups, if number of allowed backups is exceeded"""
     max_backups = get_setting_int('backups', 4)
+    to_remove = []
     versions = sorted([parse_version(version) for version in listdir(bpath)])
 
     if len(versions) < 2:
@@ -186,13 +186,16 @@ def remove_old_backups(bpath):
     try:
         installed_version = load_widevine_config()['version']
     except TypeError:
-        log(2, "could not determine installed version. Aborting cleanup of old versions.")
+        log(2, "Could not determine installed version. Aborting cleanup of old versions.")
         return
 
-    while len(versions) > max_backups + 1:
-        remove_version = str(versions[1] if versions[0] == parse_version(installed_version) else versions[0])
-        log(0, 'Removing oldest backup which is not installed: {version}', version=remove_version)
-        remove_tree(os.path.join(bpath, remove_version))
-        versions = sorted([parse_version(version) for version in listdir(bpath)])
+    filtered = [v for v in versions if v != parse_version(installed_version)]
 
+    if len(filtered) > max_backups:
+        to_remove = filtered[: len(filtered) - max_backups]
+
+    for v in to_remove:
+        remove_version = str(v)
+        log(2, 'Removing old backup: {version}', version=remove_version)
+        remove_tree(os.path.join(bpath, remove_version, ''))  # ensure trailing separator
     return

tests/userdata/addon_settings.json

@@ -10,6 +10,7 @@
         "disabled": false,
         "last_modified": "88888",
         "last_check": "",
+        "backups": 4,
         "temp_path": "special://masterprofile/addon_data/script.module.inputstreamhelper",
         "update_frequency": "31",
         "version": "0.7.0"