added profiling to default.py to measure speed improvements

added caching to nextup widget generation

default.py

@@ -1,23 +1,25 @@
 # -*- coding: utf-8 -*-
-
+import xbmcaddon, xbmc
-import os
+import os, sys
-import sys
+import urlparse
-from urlparse import parse_qs
-
-import xbmcaddon
-import xbmc
 
 addon_ = xbmcaddon.Addon(id='plugin.video.emby')
 addon_path = addon_.getAddonInfo('path').decode('utf-8')
 base_resource_path = xbmc.translatePath(os.path.join(addon_path, 'resources', 'lib')).decode('utf-8')
 sys.path.append(base_resource_path)
-
 import Entrypoint as entrypoint
 
+enableProfiling = False
+
+class Main:
+
+    # MAIN ENTRY POINT
+    def __init__(self):
+
         # Parse parameters
         base_url = sys.argv[0]
         addon_handle = int(sys.argv[1])
-params = parse_qs(sys.argv[2][1:])
+        params = urlparse.parse_qs(sys.argv[2][1:])
         xbmc.log("Parameter string: %s" % sys.argv[2])
 
         try:
@@ -99,3 +101,27 @@ elif "extrafanart" in sys.argv[0]:
         ##### SHOW ADDON NODES LISTING #####    
         if not mode:
             entrypoint.doMainListing()
+                      
+if ( __name__ == "__main__" ):
+    xbmc.log('plugin.video.emby started')
+
+    if enableProfiling:
+        import cProfile
+        import pstats
+        import random
+        from time import gmtime, strftime
+        addonid      = addon_.getAddonInfo('id').decode( 'utf-8' )
+        datapath     = os.path.join( xbmc.translatePath( "special://profile/" ).decode( 'utf-8' ), "addon_data", addonid )
+        
+        filename = os.path.join( datapath, strftime( "%Y%m%d%H%M%S",gmtime() ) + "-" + str( random.randrange(0,100000) ) + ".log" )
+        cProfile.run( 'Main()', filename )
+        
+        stream = open( filename + ".txt", 'w')
+        p = pstats.Stats( filename, stream = stream )
+        p.sort_stats( "cumulative" )
+        p.print_stats()
+    
+    else:
+        Main()
+    
+    xbmc.log('plugin.video.emby stopped')

resources/lib/Entrypoint.py

@@ -437,6 +437,21 @@ def BrowseChannels(id, folderid=None):
 
 ##### GET NEXTUP EPISODES FOR TAGNAME #####    
 def getNextUpEpisodes(tagname,limit):
+    count=0
+    
+    #try to load from cache first
+    win = xbmcgui.Window( 10000 )
+    data = win.getProperty("emby.widget.nextup." + tagname)
+    if data and not win.getProperty("clearwidgetcache") == "clear":
+        data = json.loads(data)
+        for item in data:
+            liz = createListItem(item)
+            xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=item['file'], listitem=liz)
+        xbmcplugin.endOfDirectory(handle=int(sys.argv[1]))   
+    else:
+        episodes = list()
+        addonSettings = xbmcaddon.Addon(id='plugin.video.emby')
+        win.clearProperty("clearwidgetcache")
         #if the addon is called with nextup parameter, we return the nextepisodes list of the given tagname
         xbmcplugin.setContent(int(sys.argv[1]), 'episodes')
         # First we get a list of all the in-progress TV shows - filtered by tag
@@ -446,32 +461,33 @@ def getNextUpEpisodes(tagname,limit):
         # If we found any, find the oldest unwatched show for each one.
         if json_result.has_key('result') and json_result['result'].has_key('tvshows'):
             for item in json_result['result']['tvshows']:
-            addonSettings = xbmcaddon.Addon(id='plugin.video.emby')
 
                 # If Ignore Specials is true only choose episodes from seasons greater than 0.
                 if addonSettings.getSetting("ignoreSpecialsNextEpisodes")=="true":
-                json_query2 = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %d, "sort": {"method":"episode"}, "filter": {"and": [ {"field": "playcount", "operator": "lessthan", "value":"1"}, {"field": "season", "operator": "greaterthan", "value": "0"} ]}, "properties": [ "title", "playcount", "season", "episode", "showtitle", "plot", "file", "rating", "resume", "tvshowid", "art", "streamdetails", "firstaired", "runtime", "writer", "cast", "dateadded", "lastplayed" ], "limits":{"end":1}}, "id": "1"}' %item['tvshowid'])
+                    json_query2 = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %d, "sort": {"method":"episode"}, "filter": {"and": [ {"field": "playcount", "operator": "lessthan", "value":"1"}, {"field": "season", "operator": "greaterthan", "value": "0"} ]}, "properties": [ "title", "playcount", "season", "episode", "showtitle", "plot", "file", "rating", "resume", "tvshowid", "art", "streamdetails", "firstaired", "runtime", "writer", "dateadded", "lastplayed" ], "limits":{"end":1}}, "id": "1"}' %item['tvshowid'])
                 else:
-                json_query2 = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %d, "sort": {"method":"episode"}, "filter": {"field": "playcount", "operator": "lessthan", "value":"1"}, "properties": [ "title", "playcount", "season", "episode", "showtitle", "plot", "file", "rating", "resume", "tvshowid", "art", "streamdetails", "firstaired", "runtime", "writer", "cast", "dateadded", "lastplayed" ], "limits":{"end":1}}, "id": "1"}' %item['tvshowid'])
+                    json_query2 = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %d, "sort": {"method":"episode"}, "filter": {"field": "playcount", "operator": "lessthan", "value":"1"}, "properties": [ "title", "playcount", "season", "episode", "showtitle", "plot", "file", "rating", "resume", "tvshowid", "art", "streamdetails", "firstaired", "runtime", "writer", "dateadded", "lastplayed" ], "limits":{"end":1}}, "id": "1"}' %item['tvshowid'])
 
                 if json_query2:
                     json_query2 = json.loads(json_query2)
                     if json_query2.has_key('result') and json_query2['result'].has_key('episodes'):
-                    count = 0
                         for item in json_query2['result']['episodes']:
                             liz = createListItem(item)
+                            episodes.append(item)
                             xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=item['file'], listitem=liz)
                             count +=1
                 if count == limit:
                     break
+        #use window prop as cache
+        win.setProperty("emby.widget.nextup." + tagname, json.dumps(episodes))
         xbmcplugin.endOfDirectory(handle=int(sys.argv[1]))
 
 def getInProgressEpisodes(tagname,limit):
+    count = 0
     #if the addon is called with inprogressepisodes parameter, we return the inprogressepisodes list of the given tagname
     xbmcplugin.setContent(int(sys.argv[1]), 'episodes')
     # First we get a list of all the in-progress TV shows - filtered by tag
     json_query_string = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.GetTVShows", "params": { "sort": { "order": "descending", "method": "lastplayed" }, "filter": {"and": [{"operator":"true", "field":"inprogress", "value":""}, {"operator": "contains", "field": "tag", "value": "%s"}]}, "properties": [ "title", "studio", "mpaa", "file", "art" ]  }, "id": "libTvShows"}' %tagname)
-    
     json_result = json.loads(json_query_string)
     # If we found any, find all in progress episodes for each one.
     if json_result.has_key('result') and json_result['result'].has_key('tvshows'):
@@ -481,7 +497,6 @@ def getInProgressEpisodes(tagname,limit):
             if json_query2:
                 json_query2 = json.loads(json_query2)
                 if json_query2.has_key('result') and json_query2['result'].has_key('episodes'):
-                    count = 0
                     for item in json_query2['result']['episodes']:
                         liz = createListItem(item)
                         xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=item['file'], listitem=liz)
@@ -515,7 +530,7 @@ def getRecentEpisodes(tagname,limit):
                         liz = createListItem(item)
                         xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=item['file'], listitem=liz)
                         count += 1
-                    if count >= limit:
+                    if count == limit:
                         break
     xbmcplugin.endOfDirectory(handle=int(sys.argv[1]))
     

resources/lib/KodiMonitor.py

@@ -153,6 +153,6 @@ class Kodi_Monitor(xbmc.Monitor):
         self.WINDOW.clearProperty("Played%s%s" % (type,id))
         self.WINDOW.clearProperty('played_skipWatched')
             
-        
+        #clear the widget cache
-                
+        self.WINDOW.setProperty('clearwidgetcache','clear')