From e76bf71591996fa8b3868f2b5cab07351813871e Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Wed, 6 May 2015 22:53:55 +0200 Subject: [PATCH] some changes to the video nodes building --- resources/lib/Utils.py | 383 ++++++++++++++++++++++++----------------- 1 file changed, 222 insertions(+), 161 deletions(-) diff --git a/resources/lib/Utils.py b/resources/lib/Utils.py index 8f2d32cd..3dbff4be 100644 --- a/resources/lib/Utils.py +++ b/resources/lib/Utils.py @@ -212,47 +212,135 @@ def reset(): xbmc.executebuiltin("RestartApp") -def buildVideoNodeForView(tagname, type): +def buildVideoNodeForView(tagname, type, windowPropId): #this method will build a video node for a particular Emby view (= tag in kodi) + #we set some window props here to for easy future reference and to be used in skins (for easy access only) + WINDOW = xbmcgui.Window(10000) libraryPath = xbmc.translatePath("special://profile/library/video/Emby - %s/" %tagname) - if not xbmcvfs.exists(libraryPath): - #create tag node - index - xbmcvfs.mkdir(libraryPath) - nodefile = os.path.join(libraryPath, "index.xml") - root = Element("node", {"order":"1"}) - SubElement(root, "label").text = "Emby - " + tagname - SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - try: - ET.ElementTree(root).write(nodefile, xml_declaration=True) - except: - ET.ElementTree(root).write(nodefile) - - #create tag node - all items - nodefile = os.path.join(libraryPath, tagname + "_all.xml") - root = Element("node", {"order":"1", "type":"filter"}) - SubElement(root, "label").text = tagname + #create tag node - index + xbmcvfs.mkdir(libraryPath) + nodefile = os.path.join(libraryPath, "index.xml") + root = Element("node", {"order":"0"}) + SubElement(root, "label").text = "Emby - " + tagname + SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" + try: + ET.ElementTree(root).write(nodefile, xml_declaration=True) + except: + ET.ElementTree(root).write(nodefile) + + #create tag node - all items + nodefile = os.path.join(libraryPath, tagname + "_all.xml") + root = Element("node", {"order":"1", "type":"filter"}) + SubElement(root, "label").text = tagname + SubElement(root, "match").text = "all" + SubElement(root, "content").text = type + SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" + SubElement(root, "order", {"direction":"ascending"}).text = "sorttitle" + Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) + WINDOW.setProperty("Emby.nodes.%s.title" %str(windowPropId),tagname) + path = "library://video/Emby - %s/%s_all.xml"%(tagname,tagname) + WINDOW.setProperty("Emby.nodes.%s.path" %str(windowPropId),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.content" %str(windowPropId),path) + WINDOW.setProperty("Emby.nodes.%s.type" %str(windowPropId),type) + SubElement(Rule, "value").text = tagname + try: + ET.ElementTree(root).write(nodefile, xml_declaration=True) + except: + ET.ElementTree(root).write(nodefile) + + #create tag node - recent items + nodefile = os.path.join(libraryPath, tagname + "_recent.xml") + root = Element("node", {"order":"2", "type":"filter"}) + if type == "tvshows": + label = tagname + " - " + language(30170) + else: + label = tagname + " - " + language(30174) + SubElement(root, "label").text = label + SubElement(root, "match").text = "all" + SubElement(root, "content").text = type + SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" + Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) + SubElement(Rule, "value").text = tagname + SubElement(root, "order", {"direction":"descending"}).text = "dateadded" + #set limit to 25 --> currently hardcoded --> TODO: add a setting for this ? + SubElement(root, "limit").text = "25" + #exclude watched items --> currently hardcoded --> TODO: add a setting for this ? + Rule2 = SubElement(root, "rule", {"field":"playcount","operator":"is"}) + SubElement(Rule2, "value").text = "0" + WINDOW.setProperty("Emby.nodes.%s.recent.title" %str(windowPropId),label) + path = "library://video/Emby - %s/%s_recent.xml"%(tagname,tagname) + WINDOW.setProperty("Emby.nodes.%s.recent.path" %str(windowPropId),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.recent.content" %str(windowPropId),path) + try: + ET.ElementTree(root).write(nodefile, xml_declaration=True) + except: + ET.ElementTree(root).write(nodefile) + + #create tag node - inprogress items + nodefile = os.path.join(libraryPath, tagname + "_progress.xml") + root = Element("node", {"order":"3", "type":"filter"}) + if type == "tvshows": + label = tagname + " - " + language(30171) + else: + label = tagname + " - " + language(30177) + SubElement(root, "label").text = label + SubElement(root, "match").text = "all" + SubElement(root, "content").text = type + SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" + Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) + SubElement(Rule, "value").text = tagname + #set limit to 25 --> currently hardcoded --> TODO: add a setting for this ? + SubElement(root, "limit").text = "25" + Rule2 = SubElement(root, "rule", {"field":"inprogress","operator":"true"}) + WINDOW.setProperty("Emby.nodes.%s.inprogress.title" %str(windowPropId),label) + path = "library://video/Emby - %s/%s_progress.xml"%(tagname,tagname) + WINDOW.setProperty("Emby.nodes.%s.inprogress.path" %str(windowPropId),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.inprogress.content" %str(windowPropId),path) + try: + ET.ElementTree(root).write(nodefile, xml_declaration=True) + except: + ET.ElementTree(root).write(nodefile) + + #create tag node - add unwatched movies node for movies + if type == "movies": + nodefile = os.path.join(libraryPath, tagname + "_unwatched.xml") + root = Element("node", {"order":"4", "type":"filter"}) + label = tagname + " - " + language(30189) + SubElement(root, "label").text = label SubElement(root, "match").text = "all" - SubElement(root, "content").text = type + SubElement(root, "content").text = "movies" SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - SubElement(root, "order", {"direction":"ascending"}).text = "sorttitle" Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) SubElement(Rule, "value").text = tagname + Rule = SubElement(root, "rule", {"field":"playcount","operator":"is"}) + SubElement(Rule, "value").text = "0" + SubElement(root, "order", {"direction":"ascending"}).text = "sorttitle" + #set limit to 25 --> currently hardcoded --> TODO: add a setting for this ? + SubElement(root, "limit").text = "25" + #exclude watched items --> currently hardcoded --> TODO: add a setting for this ? + Rule2 = SubElement(root, "rule", {"field":"playcount","operator":"is"}) + SubElement(Rule2, "value").text = "0" + WINDOW.setProperty("Emby.nodes.%s.unwatched.title" %str(windowPropId),label) + path = "library://video/Emby - %s/%s_unwatched.xml"%(tagname,tagname) + WINDOW.setProperty("Emby.nodes.%s.unwatched.path" %str(windowPropId),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.unwatched.content" %str(windowPropId),path) try: ET.ElementTree(root).write(nodefile, xml_declaration=True) except: ET.ElementTree(root).write(nodefile) - - #create tag node - recent items - nodefile = os.path.join(libraryPath, tagname + "_recent.xml") - root = Element("node", {"order":"2", "type":"filter"}) - if type == "tvshows": - SubElement(root, "label").text = tagname + " - " + language(30170) - else: - SubElement(root, "label").text = tagname + " - " + language(30174) + + + #add some additional nodes for episodes + if type == "tvshows": + #create tag node - recent episodes + nodefile = os.path.join(libraryPath, tagname + "_recent_episodes.xml") + root = Element("node", {"order":"3", "type":"filter"}) + label = tagname + " - " + language(30175) + SubElement(root, "label").text = label SubElement(root, "match").text = "all" - SubElement(root, "content").text = type + SubElement(root, "content").text = "episodes" SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) SubElement(Rule, "value").text = tagname @@ -262,115 +350,60 @@ def buildVideoNodeForView(tagname, type): #exclude watched items --> currently hardcoded --> TODO: add a setting for this ? Rule2 = SubElement(root, "rule", {"field":"playcount","operator":"is"}) SubElement(Rule2, "value").text = "0" - + WINDOW.setProperty("Emby.nodes.%s.recentepisodes.title" %str(windowPropId),label) + path = "library://video/Emby - %s/%s_recent_episodes.xml"%(tagname,tagname) + WINDOW.setProperty("Emby.nodes.%s.recentepisodes.path" %str(windowPropId),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.recentepisodes.content" %str(windowPropId),path) try: ET.ElementTree(root).write(nodefile, xml_declaration=True) except: ET.ElementTree(root).write(nodefile) #create tag node - inprogress items - nodefile = os.path.join(libraryPath, tagname + "_progress.xml") - root = Element("node", {"order":"3", "type":"filter"}) - if type == "tvshows": - SubElement(root, "label").text = tagname + " - " + language(30171) - else: - SubElement(root, "label").text = tagname + " - " + language(30177) + nodefile = os.path.join(libraryPath, tagname + "_progress_episodes.xml") + root = Element("node", {"order":"4", "type":"filter"}) + label = tagname + " - " + language(30178) + SubElement(root, "label").text = label SubElement(root, "match").text = "all" - SubElement(root, "content").text = type + SubElement(root, "content").text = "episodes" SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) SubElement(Rule, "value").text = tagname #set limit to 25 --> currently hardcoded --> TODO: add a setting for this ? SubElement(root, "limit").text = "25" Rule2 = SubElement(root, "rule", {"field":"inprogress","operator":"true"}) - + WINDOW.setProperty("Emby.nodes.%s.inprogressepisodes.title" %str(windowPropId),label) + path = "library://video/Emby - %s/%s_progress_episodes.xml"%(tagname,tagname) + WINDOW.setProperty("Emby.nodes.%s.inprogressepisodes.path" %str(windowPropId),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.inprogressepisodes.content" %str(windowPropId),path) try: ET.ElementTree(root).write(nodefile, xml_declaration=True) except: ET.ElementTree(root).write(nodefile) - - #create tag node - add unwatched movies node for movies - if type == "movies": - nodefile = os.path.join(libraryPath, tagname + "_unwatched.xml") - root = Element("node", {"order":"4", "type":"filter"}) - SubElement(root, "label").text = tagname + " - " + language(30189) - SubElement(root, "match").text = "all" - SubElement(root, "content").text = "movies" - SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) - SubElement(Rule, "value").text = tagname - Rule = SubElement(root, "rule", {"field":"playcount","operator":"is"}) - SubElement(Rule, "value").text = "0" - SubElement(root, "order", {"direction":"ascending"}).text = "sorttitle" - #set limit to 25 --> currently hardcoded --> TODO: add a setting for this ? - SubElement(root, "limit").text = "25" - #exclude watched items --> currently hardcoded --> TODO: add a setting for this ? - Rule2 = SubElement(root, "rule", {"field":"playcount","operator":"is"}) - SubElement(Rule2, "value").text = "0" - try: - ET.ElementTree(root).write(nodefile, xml_declaration=True) - except: - ET.ElementTree(root).write(nodefile) - - - #add some additional nodes for episodes - if type == "tvshows": - #create tag node - recent episodes - nodefile = os.path.join(libraryPath, tagname + "_recent_episodes.xml") - root = Element("node", {"order":"3", "type":"filter"}) - SubElement(root, "label").text = tagname + " - " + language(30175) - SubElement(root, "match").text = "all" - SubElement(root, "content").text = "episodes" - SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) - SubElement(Rule, "value").text = tagname - SubElement(root, "order", {"direction":"descending"}).text = "dateadded" - #set limit to 25 --> currently hardcoded --> TODO: add a setting for this ? - SubElement(root, "limit").text = "25" - #exclude watched items --> currently hardcoded --> TODO: add a setting for this ? - Rule2 = SubElement(root, "rule", {"field":"playcount","operator":"is"}) - SubElement(Rule2, "value").text = "0" - - try: - ET.ElementTree(root).write(nodefile, xml_declaration=True) - except: - ET.ElementTree(root).write(nodefile) - - #create tag node - inprogress items - nodefile = os.path.join(libraryPath, tagname + "_progress_episodes.xml") - root = Element("node", {"order":"4", "type":"filter"}) - SubElement(root, "label").text = tagname + " - " + language(30178) - SubElement(root, "match").text = "all" - SubElement(root, "content").text = "episodes" - SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) - SubElement(Rule, "value").text = tagname - #set limit to 25 --> currently hardcoded --> TODO: add a setting for this ? - SubElement(root, "limit").text = "25" - Rule2 = SubElement(root, "rule", {"field":"inprogress","operator":"true"}) - - try: - ET.ElementTree(root).write(nodefile, xml_declaration=True) - except: - ET.ElementTree(root).write(nodefile) - - #create tag node - nextup items - nodefile = os.path.join(libraryPath, tagname + "_nextup_episodes.xml") - root = Element("node", {"order":"4", "type":"folder"}) - SubElement(root, "label").text = tagname + " - " + language(30179) - SubElement(root, "content").text = "episodes" - SubElement(root, "path").text = "plugin://plugin.video.emby/?id=%s&mode=nextup&limit=25" %tagname - SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - try: - ET.ElementTree(root).write(nodefile, xml_declaration=True) - except: - ET.ElementTree(root).write(nodefile) + #create tag node - nextup items + nodefile = os.path.join(libraryPath, tagname + "_nextup_episodes.xml") + root = Element("node", {"order":"4", "type":"folder"}) + label = tagname + " - " + language(30179) + SubElement(root, "label").text = label + SubElement(root, "content").text = "episodes" + path = "plugin://plugin.video.emby/?id=%s&mode=nextup&limit=25" %tagname + SubElement(root, "path").text = path + SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" + WINDOW.setProperty("Emby.nodes.%s.nextepisodes.title" %str(windowPropId),label) + path = "library://video/Emby - %s/%s_nextup_episodes.xml"%(tagname,tagname) + WINDOW.setProperty("Emby.nodes.%s.nextepisodes.path" %str(windowPropId),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.nextepisodes.content" %str(windowPropId),path) + try: + ET.ElementTree(root).write(nodefile, xml_declaration=True) + except: + ET.ElementTree(root).write(nodefile) def buildVideoNodesListing(): import shutil from ReadEmbyDB import ReadEmbyDB + WINDOW = xbmcgui.Window(10000) try: @@ -393,62 +426,90 @@ def buildVideoNodesListing(): if file.startswith("emby"): xbmcvfs.delete(path + file) - #create tag node for emby channels - nodefile = os.path.join(xbmc.translatePath("special://profile/library/video"), "emby_channels.xml") - if not xbmcvfs.exists(nodefile): - root = Element("node", {"order":"1", "type":"folder"}) - SubElement(root, "label").text = "Emby - " + language(30173) - SubElement(root, "content").text = "movies" - SubElement(root, "path").text = "plugin://plugin.video.emby/?id=0&mode=channels" - SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - try: - ET.ElementTree(root).write(nodefile, xml_declaration=True) - except: - ET.ElementTree(root).write(nodefile) - - #create tag node - favorite shows - nodefile = os.path.join(xbmc.translatePath("special://profile/library/video"),"emby_favorite_shows.xml") - if not xbmcvfs.exists(nodefile): - root = Element("node", {"order":"1", "type":"filter"}) - SubElement(root, "label").text = "Emby - " + language(30181) - SubElement(root, "match").text = "all" - SubElement(root, "content").text = "tvshows" - SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - SubElement(root, "order", {"direction":"ascending"}).text = "sorttitle" - Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) - SubElement(Rule, "value").text = "Favorite tvshows" #do not localize the tagname itself - try: - ET.ElementTree(root).write(nodefile, xml_declaration=True) - except: - ET.ElementTree(root).write(nodefile) - - #create tag node - favorite movies - nodefile = os.path.join(xbmc.translatePath("special://profile/library/video"),"emby_favorite_movies.xml") - if not xbmcvfs.exists(nodefile): - root = Element("node", {"order":"1", "type":"filter"}) - SubElement(root, "label").text = "Emby - " + language(30180) - SubElement(root, "match").text = "all" - SubElement(root, "content").text = "movies" - SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" - SubElement(root, "order", {"direction":"ascending"}).text = "sorttitle" - Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) - SubElement(Rule, "value").text = "Favorite movies" #do not localize the tagname itself - try: - ET.ElementTree(root).write(nodefile, xml_declaration=True) - except: - ET.ElementTree(root).write(nodefile) + #we build up a listing and set window props for all nodes we created + #the window props will be used by the main entry point to quickly build up the listing and can be used in skins (like titan) too for quick reference + #comment marcelveldt: please leave the window props as-is because I will be referencing them in titan skin... + totalNodesCount = 0 #build the listing for all views views_movies = ReadEmbyDB().getCollections("movies") if views_movies: for view in views_movies: - buildVideoNodeForView(view.get('title'), "movies") + buildVideoNodeForView(view.get('title'), "movies", totalNodesCount) + totalNodesCount +=1 views_shows = ReadEmbyDB().getCollections("tvshows") if views_shows: for view in views_shows: - buildVideoNodeForView(view.get('title'), "tvshows") + buildVideoNodeForView(view.get('title'), "tvshows", totalNodesCount) + totalNodesCount +=1 + + #create tag node for emby channels + nodefile = os.path.join(xbmc.translatePath("special://profile/library/video"), "emby_channels.xml") + root = Element("node", {"order":"1", "type":"folder"}) + label = "Emby - " + language(30173) + SubElement(root, "label").text = label + SubElement(root, "content").text = "movies" + SubElement(root, "path").text = "plugin://plugin.video.emby/?id=0&mode=channels" + SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" + WINDOW.setProperty("Emby.nodes.%s.title" %str(totalNodesCount),label) + WINDOW.setProperty("Emby.nodes.%s.type" %str(totalNodesCount),"channels") + path = "library://video/emby_channels.xml" + WINDOW.setProperty("Emby.nodes.%s.path" %str(totalNodesCount),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.content" %str(totalNodesCount),path) + totalNodesCount +=1 + try: + ET.ElementTree(root).write(nodefile, xml_declaration=True) + except: + ET.ElementTree(root).write(nodefile) + + #create tag node - favorite shows + nodefile = os.path.join(xbmc.translatePath("special://profile/library/video"),"emby_favorite_shows.xml") + root = Element("node", {"order":"1", "type":"filter"}) + label = "Emby - " + language(30181) + SubElement(root, "label").text = label + SubElement(root, "match").text = "all" + SubElement(root, "content").text = "tvshows" + SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" + SubElement(root, "order", {"direction":"ascending"}).text = "sorttitle" + Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) + SubElement(Rule, "value").text = "Favorite tvshows" #do not localize the tagname itself + WINDOW.setProperty("Emby.nodes.%s.title" %str(totalNodesCount),label) + WINDOW.setProperty("Emby.nodes.%s.type" %str(totalNodesCount),"favourites") + path = "library://video/emby_favorite_shows.xml" + WINDOW.setProperty("Emby.nodes.%s.path" %str(totalNodesCount),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.content" %str(totalNodesCount),path) + totalNodesCount +=1 + try: + ET.ElementTree(root).write(nodefile, xml_declaration=True) + except: + ET.ElementTree(root).write(nodefile) + + #create tag node - favorite movies + nodefile = os.path.join(xbmc.translatePath("special://profile/library/video"),"emby_favorite_movies.xml") + root = Element("node", {"order":"1", "type":"filter"}) + label = "Emby - " + language(30180) + SubElement(root, "label").text = label + SubElement(root, "match").text = "all" + SubElement(root, "content").text = "movies" + SubElement(root, "icon").text = "special://home/addons/plugin.video.emby/icon.png" + SubElement(root, "order", {"direction":"ascending"}).text = "sorttitle" + Rule = SubElement(root, "rule", {"field":"tag","operator":"is"}) + SubElement(Rule, "value").text = "Favorite movies" #do not localize the tagname itself + WINDOW.setProperty("Emby.nodes.%s.title" %str(totalNodesCount),label) + WINDOW.setProperty("Emby.nodes.%s.type" %str(totalNodesCount),"favourites") + path = "library://video/emby_favorite_movies.xml" + WINDOW.setProperty("Emby.nodes.%s.path" %str(totalNodesCount),"ActivateWindow(Video,%s,return)"%path) + WINDOW.setProperty("Emby.nodes.%s.content" %str(totalNodesCount),path) + totalNodesCount +=1 + try: + ET.ElementTree(root).write(nodefile, xml_declaration=True) + except: + ET.ElementTree(root).write(nodefile) + + WINDOW.setProperty("Emby.nodes.total", str(totalNodesCount)) - except: + except Exception as e: logMsg("Emby addon","Error while creating videonodes listings, restart required ?") + print e \ No newline at end of file