cleanup

mediathekview · Nov 21, 2020 · 1e401ea · 1e401ea
1 parent bcedff9
commit 1e401ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/resources/lib/kodi/kodiaddon.py b/resources/lib/kodi/kodiaddon.py
@@ -38,15 +38,23 @@ def __init__(self):
         self.fanart = self.addon.getAddonInfo('fanart')
         self.version = self.addon.getAddonInfo('version')
         self.path = mvutils.py2_decode(self.addon.getAddonInfo('path'))
-        ## TODO fix me
-        try:
-            self.datapath = mvutils.py2_decode(xbmc.translatePath(self.addon.getAddonInfo('profile')))
-        except Exception as err:
+        ##
+        if self.getKodiVersion() > 18:
             self.datapath = mvutils.py2_decode(xbmcvfs.translatePath(self.addon.getAddonInfo('profile')))
-
+        else:
+            self.datapath = mvutils.py2_decode(xbmc.translatePath(self.addon.getAddonInfo('profile')))
+        ##
         self.language = self.addon.getLocalizedString
         KodiLogger.__init__(self, self.addon_id, self.version)
-
+
+    def getKodiVersion(self):
+        """
+        Get Kodi major version
+        Returns:
+            int: Kodi major version (e.g. 18)
+        """
+        xbmc_version = xbmc.getInfoLabel("System.BuildVersion")
+        return int(xbmc_version.split('-')[0].split('.')[0])
 
     def get_addon_info(self, info_id):
         """

diff --git a/resources/lib/mvutils.py b/resources/lib/mvutils.py
@@ -143,27 +143,6 @@ def file_remove(name):
             pass
     return False
 
-def deleteFiles(rootDir, regexp):
-    """
-    Delete a file via regexp (e.g. 'Filmliste-akt-Test$' )
-
-    Args:
-        rootDir(str): pathname
-        regexp(str): regexp
-    """
-    regex = re.compile(regexp)
-    cnt = 0
-    for root, dirs, files in os.walk(rootDir):
-        for file in files:
-            if regex.match(file):
-                try:
-                    os.remove(os.path.join(root, file))
-                    cnt += 1
-                except OSError:
-                    pass
-                    return -1
-    return cnt
-
 def file_rename(srcname, dstname):
     """
     Rename a file

diff --git a/resources/lib/updater.py b/resources/lib/updater.py
@@ -359,7 +359,7 @@ def get_newest_list(self, full):
         # cleanup downloads
         self.logger.info('Cleaning up old downloads...')
         mvutils.file_remove(compfile)
-        mvutils.file_remove(destfile)        
+        mvutils.file_remove(destfile)
 
         # download filmliste
         self.notifier.show_download_progress()