Merge pull request #2 from twolaw/dev

0.3.8

Author: simonc56

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.duration" name="Duration script" version="0.3.7" provider-name="Twolaw, axbmcuser">
+<addon id="script.duration" name="Duration script" version="0.3.8" provider-name="Twolaw, axbmcuser">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
   </requires>
@@ -34,8 +34,39 @@
     <disclaimer lang="de">Ihre skin hat gezwickt, um dieses Skript verwenden werden.</disclaimer>
     <disclaimer lang="es">Su skin tiene que ser ajustado para utilizar este script.</disclaimer>
     <disclaimer lang="it">Il tuo skin deve essere ottimizzato per utilizzare questo script.</disclaimer>
+    <news>[B]0.3.8[/B] (2018-04-26)
+- Minor improvements and optimizations
+
+[B]0.3.7[/B] (2018-04-19)
+- Minor improvements and optimizations
+
+[B]0.3.5[/B] (2017-07-14)
+- Reworked script, changed/removed deprecated stuff
+- New property names (see description for details)
+
+[B]0.3.4[/B] (2017-07-11)
+- ListItem.DBID is now also set - for verification purposes (Duration.DBID)
+
+[B]0.3.3[/B] (2016-08-03)
+- Minor cleanup
+
+[B]0.3.2[/B] (2016-07-23)
+- axbmcuser MOD: Fix for KODI 17 (Krypton): "videolibrary" renamed to "videos" [default.py]
+
+[B]0.3.1[/B]
+- axbmcuser MOD: Minor improvements and optimizations
+
+[B]0.3[/B]
+- axbmcuser MOD: Script now outputs H:MM
+
+[B]0.2[/B]
+- Correction of crash when duration value isn't properly written in database
+
+[B]0.1[/B]
+- Initial release
+    </news>
     <assets>
-		<icon>icon.png</icon>
-	</assets>
+      <icon>icon.png</icon>
+    </assets>
   </extension>
 </addon>

changelog.txt

@@ -1,3 +1,6 @@
+[B]0.3.8[/B] (2018-04-26)
+- Minor improvements and optimizations
+
 [B]0.3.7[/B] (2018-04-19)
 - Minor improvements and optimizations
 

service.py

@@ -56,10 +56,15 @@ def run_service(self):
                 if (self.selecteditem and self.selecteditem != self.previousitem):
                     self.previousitem = self.selecteditem
 
-                    if (xbmc.getInfoLabel("ListItem.DBID") > -1 and not xbmc.getCondVisibility("ListItem.IsFolder")) and xbmc.getInfoLabel("ListItem.Duration") and int(float(xbmc.getInfoLabel("ListItem.Duration"))) > 0:
-                        self.duration = xbmc.getInfoLabel("ListItem.Duration")
-                        self.dbid = xbmc.getInfoLabel("ListItem.DBID")
-                        self.set_duration_values()
+                    if (xbmc.getInfoLabel("ListItem.DBID") and xbmc.getInfoLabel("ListItem.DBTYPE") and (xbmc.getInfoLabel("ListItem.DBTYPE") == 'movie' or xbmc.getInfoLabel("ListItem.DBTYPE") == 'episode') and not xbmc.getCondVisibility("ListItem.IsFolder")) and xbmc.getInfoLabel("ListItem.Duration"):
+                        try:
+                            tmpval = float(int(xbmc.getInfoLabel("ListItem.Duration")))
+                            if (tmpval > 0) :
+                                self.duration = xbmc.getInfoLabel("ListItem.Duration")
+                                self.dbid = xbmc.getInfoLabel("ListItem.DBID")
+                                self.set_duration_values()
+                        except:
+                            pass
             else:
                 my_container_id = xbmc.getInfoLabel("Window(Home).Property(Durations.WidgetContainerId)")
                 my_container_window = xbmc.getInfoLabel("Window(Home).Property(Durations.WidgetContainerWindowName)")
@@ -68,10 +73,15 @@ def run_service(self):
                     self.selecteditem = xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBID")
                     if (self.selecteditem and self.selecteditem != self.previousitem):
                         self.previousitem = self.selecteditem
-                        if (xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBID") > -1 and not xbmc.getCondVisibility("Container("+my_container_id+").ListItem.IsFolder")) and xbmc.getInfoLabel("Container("+my_container_id+").ListItem.Duration") and int(float(xbmc.getInfoLabel("Container("+my_container_id+").ListItem.Duration"))) > 0:
-                            self.duration = xbmc.getInfoLabel("Container("+my_container_id+").ListItem.Duration")
-                            self.dbid = xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBID")
-                            self.set_duration_values()
+                        if (xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBID") and xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBTYPE") and (xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBTYPE") == 'movie' or xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBTYPE") == 'episode') and not xbmc.getCondVisibility("Container("+my_container_id+").ListItem.IsFolder")) and xbmc.getInfoLabel("Container("+my_container_id+").ListItem.Duration"):
+                            try:
+                                tmpval = float(int(xbmc.getInfoLabel("Container("+my_container_id+").ListItem.Duration")))
+                                if (tmpval > 0) :
+                                    self.duration = xbmc.getInfoLabel("Container("+my_container_id+").ListItem.Duration")
+                                    self.dbid = xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBID")
+                                    self.set_duration_values()
+                            except:
+                                pass
     #run_service end
 
     def set_duration_values(self):