[plugin.audio.ampache@matrix] 3.2.4+matrix.1

Author: lusum

plugin.audio.ampache/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.audio.ampache" version="3.2.3+matrix.1" name="Ampache" provider-name="lusum">
+<addon id="plugin.audio.ampache" version="3.2.4+matrix.1" name="Ampache" provider-name="lusum">
     <requires>
       <import addon="script.module.future" version="1.0.0"/>
       <import addon="xbmc.python" version="3.0.0"/>

plugin.audio.ampache/resources/lib/ampache_connect.py

@@ -100,6 +100,8 @@ def getCodeMessError(self,tree):
         return errormess
 
     def getHashedPassword(self,timeStamp):
+        if self._connectionData is None:
+            raise self.ConnectionError
         enablePass = self._connectionData["enable_password"]
         if enablePass:
             sdf = self._connectionData["password"]
@@ -117,6 +119,8 @@ def getHashedPassword(self,timeStamp):
         return passwordHash
 
     def get_user_pwd_login_url(self,nTime):
+        if self._connectionData is None:
+            raise self.ConnectionError
         myTimeStamp = str(nTime)
         myPassphrase = self.getHashedPassword(myTimeStamp)
         myURL = self._connectionData["url"] + self.getBaseUrl() + '?action=handshake&auth='
@@ -125,6 +129,8 @@ def get_user_pwd_login_url(self,nTime):
         return myURL
 
     def get_auth_key_login_url(self):
+        if self._connectionData is None:
+            raise self.ConnectionError
         myURL = self._connectionData["url"] +  self.getBaseUrl() + '?action=handshake&auth='
         myURL += self._connectionData["api_key"]
         myURL += '&version=' + self.version
@@ -169,6 +175,8 @@ def handle_request(self,url):
         return headers,contents
 
     def AMPACHECONNECT(self,showok=False):
+        if self._connectionData is None:
+            raise self.ConnectionError
         socket.setdefaulttimeout(3600)
         nTime = int(time.time())
         use_api_key = self._connectionData["use_api_key"]
@@ -244,6 +252,8 @@ def ampache_http_request(self,action):
         return tree
 
     def build_ampache_url(self,action):
+        if self._connectionData is None:
+            raise self.ConnectionError
         token = self._ampache.getSetting("token")
         thisURL = self._connectionData["url"] +  self.getBaseUrl() + '?action=' + action
         thisURL += '&auth=' + token

plugin.audio.ampache/resources/lib/ampache_monitor.py

@@ -1,18 +1,19 @@
 import xbmc
 import xbmcaddon
 
-#service class
+# service class
 ampache = xbmcaddon.Addon("plugin.audio.ampache")
 
 from resources.lib.utils import get_objectId_from_fileURL
 
-class AmpacheMonitor( xbmc.Monitor ):
+
+class AmpacheMonitor(xbmc.Monitor):
     # Monitor for Ampache service events
 
     onPlay = False
 
     def __init__(self):
-        xbmc.log( 'AmpacheMonitor::ServiceMonitor called', xbmc.LOGDEBUG)
+        xbmc.log("AmpacheMonitor::ServiceMonitor called", xbmc.LOGDEBUG)
 
     # start mainloop
     def run(self):
@@ -25,35 +26,51 @@ def close(self):
         pass
 
     def onNotification(self, sender, method, data):
-        xbmc.log('AmpacheMonitor::onNotification called - method: %s, sender: %s' % (method, sender), xbmc.LOGDEBUG)
+        xbmc.log(
+            "AmpacheMonitor::onNotification called - method: %s, sender: %s"
+            % (method, sender),
+            xbmc.LOGDEBUG,
+        )
 
         if not sender or not method or not data:
             xbmc.log("AmpacheMonitor::Invalid notification data", xbmc.LOGWARNING)
             return
 
-        #a little hack to avoid calling rate every time a song start
-        if method == 'Player.OnStop':
+        # a little hack to avoid calling rate every time a song start
+        if method == "Player.OnStop":
             self.onPlay = False
             xbmc.log("AmpacheMonitor::onPlay status changed to False", xbmc.LOGDEBUG)
-        elif method == 'Player.OnPlay':
+        elif method == "Player.OnPlay":
             self.onPlay = True
             xbmc.log("AmpacheMonitor::onPlay status changed to True", xbmc.LOGDEBUG)
-        elif method == 'Info.OnChanged' and self.onPlay:
+        elif method == "Info.OnChanged" and self.onPlay:
             if xbmc.Player().isPlaying():
                 try:
                     file_url = xbmc.Player().getPlayingFile()
                     if not file_url:
-                        raise ValueError("No playing file")
+                        xbmc.log(
+                            "AmpacheMonitor::No playing file, skipping", xbmc.LOGDEBUG
+                        )
+                        return
 
                     if not get_objectId_from_fileURL(file_url):
-                        raise ValueError("No object ID found in URL")
+                        xbmc.log(
+                            "AmpacheMonitor::No object ID found in URL, skipping",
+                            xbmc.LOGDEBUG,
+                        )
+                        return
 
-                    xbmc.log("AmpacheMonitor::Starting setRating for URL: %s" % file_url, xbmc.LOGDEBUG)
-                    xbmc.executebuiltin('RunPlugin(plugin://plugin.audio.ampache/?mode=205)')
+                    xbmc.log(
+                        "AmpacheMonitor::Starting setRating for URL: %s" % file_url,
+                        xbmc.LOGDEBUG,
+                    )
+                    xbmc.executebuiltin(
+                        "RunPlugin(plugin://plugin.audio.ampache/?mode=205)"
+                    )
                 except ValueError as e:
                     xbmc.log("AmpacheMonitor::Value error: %s" % str(e), xbmc.LOGDEBUG)
                 except Exception as e:
-                    xbmc.log("AmpacheMonitor::Error in onNotification: %s" % repr(e), xbmc.LOGERROR)
-
-
-
+                    xbmc.log(
+                        "AmpacheMonitor::Error in onNotification: %s" % repr(e),
+                        xbmc.LOGERROR,
+                    )

plugin.audio.ampache/resources/lib/art_clean.py

@@ -1,28 +1,29 @@
 from future.utils import PY2
 import os
-import xbmc,xbmcaddon
+import xbmc, xbmcaddon
 import xbmcvfs
 
 from datetime import datetime, timedelta
-#split the art library to not have import problems, as the function is used by
-#service and the main plugin
-#library used both by service and main plugin, DO NOT INCLUDE OTHER LOCAL
-#LIBRARIES
+# split the art library to not have import problems, as the function is used by
+# service and the main plugin
+# library used both by service and main plugin, DO NOT INCLUDE OTHER LOCAL
+# LIBRARIES
 
 ampache = xbmcaddon.Addon("plugin.audio.ampache")
 
 # Cache configuration constants
 ART_CACHE_EXPIRY_DAYS = 30
 ART_CACHE_TYPES = ["album", "artist", "song", "podcast", "playlist"]
 
-#different functions in kodi 19 (python3) and kodi 18 (python2)
+# different functions in kodi 19 (python3) and kodi 18 (python2)
 if PY2:
-    user_dir = xbmc.translatePath( ampache.getAddonInfo('profile'))
-    user_dir = user_dir.decode('utf-8')
+    user_dir = xbmc.translatePath(ampache.getAddonInfo("profile"))
+    user_dir = user_dir.decode("utf-8")
 else:
-    user_dir = xbmcvfs.translatePath( ampache.getAddonInfo('profile'))
-user_mediaDir = os.path.join( user_dir , 'media' )
-cacheDir = os.path.join( user_mediaDir , 'cache' )
+    user_dir = xbmcvfs.translatePath(ampache.getAddonInfo("profile"))
+user_mediaDir = os.path.join(user_dir, "media")
+cacheDir = os.path.join(user_mediaDir, "cache")
+
 
 def clean_settings():
     ampache.setSetting("session_expire", "")
@@ -37,9 +38,10 @@ def clean_settings():
     ampache.setSetting("podcasts", "")
     ampache.setSetting("live_streams", "")
 
-    #hack to force the creation of profile directory if don't exists
+    # hack to force the creation of profile directory if don't exists
     if not os.path.isdir(user_dir):
-        ampache.setSetting("api-version","350001")
+        ampache.setSetting("api-version", "350001")
+
 
 def is_expired(cache_file_path: str) -> bool:
     """Check if the cache file has expired (older than one month)."""
@@ -52,42 +54,55 @@ def is_expired(cache_file_path: str) -> bool:
         last_modified = datetime.fromtimestamp(mod_time)
 
         # Calculate if more than a month has passed since modification
-        expiration_duration = timedelta(days=ART_CACHE_EXPIRY_DAYS)  # ART_CACHE_EXPIRY_DAYS
+        expiration_duration = timedelta(
+            days=ART_CACHE_EXPIRY_DAYS
+        )  # ART_CACHE_EXPIRY_DAYS
 
         return (now - last_modified) > expiration_duration
     except FileNotFoundError:
         return True  # Treat missing files as expired
 
+
 def delete_expired_files():
 
     for c_type in ART_CACHE_TYPES:
-        cacheDirType = os.path.join( cacheDir , c_type )
+        cacheDirType = os.path.join(cacheDir, c_type)
         if not os.path.isdir(cacheDirType):
             continue
         for currentFile in os.listdir(cacheDirType):
-            #xbmc.log("Clear Cache Art " + str(currentFile),xbmc.LOGDEBUG)
-            pathDel = os.path.join( cacheDirType, currentFile)
+            # xbmc.log("Clear Cache Art " + str(currentFile),xbmc.LOGDEBUG)
+            pathDel = os.path.join(cacheDirType, currentFile)
             if is_expired(pathDel):
                 try:
                     os.remove(pathDel)
                 except OSError as e:
-                    raise
+                    xbmc.log(
+                        "AmpachePlugin::art_clean: Failed to delete file %s: %s"
+                        % (pathDel, repr(e)),
+                        xbmc.LOGDEBUG,
+                    )
+                    continue
+
 
 def remove_expired():
     try:
         print("Starting cache cleanup...")
         delete_expired_files()
         print("Cache cleanup completed.")
     except Exception as e:
-        xbmc.log("AmpachePlugin::Service failed to cleanup cache: %s" % repr(e), xbmc.LOGERROR)
+        xbmc.log(
+            "AmpachePlugin::Service failed to cleanup cache: %s" % repr(e),
+            xbmc.LOGERROR,
+        )
+
 
 def init_cache():
-    #if cacheDir doesn't exist, create it
+    # if cacheDir doesn't exist, create it
     if not os.path.isdir(user_mediaDir):
         os.mkdir(user_mediaDir)
     if not os.path.isdir(cacheDir):
         os.mkdir(cacheDir)
     for c_type in ART_CACHE_TYPES:
-        cacheDirType = os.path.join( cacheDir , c_type )
+        cacheDirType = os.path.join(cacheDir, c_type)
         if not os.path.isdir(cacheDirType):
-            os.mkdir( cacheDirType )
+            os.mkdir(cacheDirType)

plugin.audio.ampache/resources/lib/servers_manager.py

@@ -92,8 +92,8 @@ def switchServer():
     try:
         ampacheConnect = ampache_connect.AmpacheConnect()
         ampacheConnect.AMPACHECONNECT(showok=True)
-    except:
-        pass
+    except Exception as e:
+        xbmc.log("AmpachePlugin::switchServer error: %s" % repr(e), xbmc.LOGERROR)
 
 def addServer():
     xbmc.log("AmpachePlugin::addServer" , xbmc.LOGDEBUG )
@@ -203,5 +203,5 @@ def modifyServer():
     try:
         ampacheConnect = ampache_connect.AmpacheConnect()
         ampacheConnect.AMPACHECONNECT()
-    except:
-        pass
+    except Exception as e:
+        xbmc.log("AmpachePlugin::modifyServer error: %s" % repr(e), xbmc.LOGERROR)