Merge pull request #1 from twolaw/0.3.7

Update to 0.3.7

Author: simonc56

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.duration" name="Duration script" version="0.3.5" provider-name="Twolaw, axbmcuser">
+<addon id="script.duration" name="Duration script" version="0.3.7" provider-name="Twolaw, axbmcuser">
   <requires>
-    <import addon="xbmc.python" version="2.14.0"/>
+    <import addon="xbmc.python" version="2.24.0"/>
   </requires>
   <extension library="service.py" point="xbmc.service" start="login">
   </extension>
@@ -38,4 +38,4 @@
 		<icon>icon.png</icon>
 	</assets>
   </extension>
-</addon>
+</addon>

changelog.txt

@@ -1,3 +1,6 @@
+[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)
@@ -21,4 +24,4 @@
 - Correction of crash when duration value isn't properly written in database
 
 [B]0.1[/B]
-- Initial release
+- Initial release

service.py

@@ -43,37 +43,40 @@ def get_minutes_only(minutes_string):
 class Main:
     def __init__( self ):
         log("version %s started" % __version__)
-        self.run_backend()
-
-    def run_backend(self):
         self.previousitem = ""
-        while 1:
+        self.monitor = xbmc.Monitor()
+        self.run_service()
+
+    def run_service(self):
+        while not self.monitor.abortRequested():
+            if self.monitor.waitForAbort(0.2):
+                break
             if ((xbmc.getCondVisibility("Window.IsActive(Videos)") and xbmc.getCondVisibility("Window.Is(Videos)")) or (xbmc.getCondVisibility("Window.IsActive(MovieInformation)") and xbmc.getCondVisibility("Window.Is(MovieInformation)"))) and not xbmc.getCondVisibility("Container.Scrolling"):
                 self.selecteditem = xbmc.getInfoLabel("ListItem.DBID")
-                if (self.selecteditem != self.previousitem):
+                if (self.selecteditem and self.selecteditem != self.previousitem):
                     #xbmc.executebuiltin('Notification(Hello World,test,500)')
                     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.display_duration()
+                        self.set_duration_values()
             else:
                 my_container_id = xbmc.getInfoLabel("Window(Home).Property(Duration.WidgetContainerId)")
                 my_container_window = xbmc.getInfoLabel("Window(Home).Property(Duration.WidgetContainerWindowName)")
 
                 if (my_container_id and my_container_window and (xbmc.getCondVisibility("Control.HasFocus("+my_container_id+")") and xbmc.getCondVisibility("Window.IsActive("+my_container_window+")") and xbmc.getCondVisibility("Window.Is("+my_container_window+")")) and not xbmc.getCondVisibility("Window.IsActive(Videos)") and not xbmc.getCondVisibility("Window.IsActive(MovieInformation)")) and not xbmc.getCondVisibility("Container("+my_container_id+").Scrolling"):
                     #xbmc.executebuiltin('Notification(Hello World,'+my_container_id+' '+my_container_window+',500)')
                     self.selecteditem = xbmc.getInfoLabel("Container("+my_container_id+").ListItem.DBID")
-                    if (self.selecteditem != self.previousitem):
+                    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.display_duration()
-            xbmc.sleep(200)
+                            self.set_duration_values()
+    #run_service end
 
-    def display_duration(self):
+    def set_duration_values(self):
         log('Converts: '+self.duration+' min')
         #xbmc.executebuiltin('Notification(Hello World,'+self.duration+' '+self.dbid+',250)')