Kodi 19 updates

Author: Chris Nappi

addon.xml

@@ -6,7 +6,7 @@
   </requires>
   <extension library="service.py" point="xbmc.service" start="login"/>
   <extension point="xbmc.python.script" library="default.py">  
-            <provides>executable</provides>
+            <provides>video</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <platform>all</platform>

resources/lib/functions.py

@@ -5,17 +5,20 @@
 import os
 import time
 import json
-import StringIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 import xbmcplugin
 import xbmcgui
 import xbmcaddon
 import xbmc
 
-from kodi_utils import HomeWindow
-from views import DefaultViews, loadSkinDefaults
-from simple_logging import SimpleLogging
-from translation import i18n
+from resources.lib.kodi_utils import HomeWindow
+from resources.lib.views import DefaultViews, loadSkinDefaults
+from resources.lib.simple_logging import SimpleLogging
+from resources.lib.translation import i18n
 
 __addon__ = xbmcaddon.Addon(id='script.viewmaster')
 __addondir__ = xbmc.translatePath(__addon__.getAddonInfo('profile'))

resources/lib/kodi_utils.py

@@ -5,7 +5,7 @@
 import sys
 import json
 
-from simple_logging import SimpleLogging
+from resources.lib.simple_logging import SimpleLogging
 
 log = SimpleLogging(__name__)
 

resources/lib/translation.py

@@ -1,5 +1,5 @@
 import xbmcaddon
-from simple_logging import SimpleLogging
+from resources.lib.simple_logging import SimpleLogging
 
 log = SimpleLogging(__name__)
 addon = xbmcaddon.Addon(id='script.viewmaster')

resources/lib/views.py

@@ -7,8 +7,8 @@
 
 import json
 
-from simple_logging import SimpleLogging
-from translation import i18n
+from resources.lib.simple_logging import SimpleLogging
+from resources.lib.translation import i18n
 
 log = SimpleLogging(__name__)
 __addon__ = xbmcaddon.Addon(id='script.viewmaster')
@@ -108,7 +108,7 @@ def getSortNameById(self, sortId):
         if (sortId == None):
             return "None"
 
-        for name, id in self.sortData.iteritems():
+        for name, id in self.sortData.items():
             if id == sortId:
                 return name
 
@@ -118,7 +118,7 @@ def getViewNameById(self, viewId):
         if (viewId == None):
             return "None"
 
-        for name, id in self.viewData.iteritems():
+        for name, id in self.viewData.items():
             if id == viewId:
                 return name
 

service.py

@@ -6,6 +6,6 @@ def viewNotification(notificationData):
    setView(notificationData['view_type'])
 
 AddonSignals.registerSlot('embycon', 'display_items', viewNotification)
-
-while not xbmc.abortRequested:
+monitor = xbmc.Monitor()
+while not monitor.abortRequested:
     xbmc.sleep(1000)