[plugin.audio.ampache@matrix] 3.2.2+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.1+matrix.1" name="Ampache" provider-name="lusum">
+<addon id="plugin.audio.ampache" version="3.2.2+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

@@ -32,7 +32,7 @@ def __init__(self):
         serverStorage = jsStorServer.getData()
         try:
             self._connectionData = serverStorage["servers"][serverStorage["current_server"]]
-        except:
+        except KeyError:
             self._connectionData = None
         #self._connectionData = None
         self.filter=None

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

@@ -590,13 +590,14 @@ def get_items(object_type, object_id=None, add=None,\
 def setRating():
     try:
         file_url = xbmc.Player().getPlayingFile()
-        if not file_url:
-            raise ValueError("No playing file")
-        xbmc.log("AmpachePlugin::setRating url " + file_url , xbmc.LOGDEBUG)
-        
     except Exception:
         raise ValueError("Error getting playing file")
 
+    if not file_url:
+        raise ValueError("No playing file")
+    
+    xbmc.log("AmpachePlugin::setRating url " + file_url , xbmc.LOGDEBUG)
+    
     try:
         object_id = ut.get_objectId_from_fileURL(file_url)
         if not object_id:

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

@@ -70,8 +70,9 @@ def delete_expired_files():
             if is_expired(pathDel):
                 try:
                     os.remove(pathDel)
-                except PermissionError if not PY2 else OSError:
-                    pass
+                except OSError:
+                    if not PY2:
+                        raise
 
 def remove_expired():
     print("Starting cache cleanup...")