From 58020021fafc4eb06b9556dd0af66de95037b966 Mon Sep 17 00:00:00 2001 From: tomkat83 Date: Sat, 23 Jan 2016 12:05:56 +0100 Subject: [PATCH] Merge conflicts --- resources/lib/entrypoint.py | 22 +++++++++++----------- resources/lib/librarysync.py | 7 +++++-- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/lib/entrypoint.py b/resources/lib/entrypoint.py index 53f49e81..70eb0424 100644 --- a/resources/lib/entrypoint.py +++ b/resources/lib/entrypoint.py @@ -112,15 +112,15 @@ def doMainListing(): addDirectoryItem("Live Tv Recordings (experimental)", "plugin://plugin.video.plexkodiconnect/?mode=browsecontent&type=recordings&folderid=root") # some extra entries for settings and stuff. TODO --> localize the labels - addDirectoryItem("Network credentials", "plugin://plugin.video.emby/?mode=passwords") - addDirectoryItem("Settings", "plugin://plugin.video.emby/?mode=settings") - addDirectoryItem("Add user to session", "plugin://plugin.video.emby/?mode=adduser") - addDirectoryItem("Refresh Emby playlists/nodes", "plugin://plugin.video.emby/?mode=refreshplaylist") - addDirectoryItem("Perform manual sync", "plugin://plugin.video.emby/?mode=manualsync") - addDirectoryItem("Repair local database (force update all content)", "plugin://plugin.video.emby/?mode=repair") - addDirectoryItem("Perform local database reset (full resync)", "plugin://plugin.video.emby/?mode=reset") - addDirectoryItem("Cache all images to Kodi texture cache", "plugin://plugin.video.emby/?mode=texturecache") - addDirectoryItem("Sync Emby Theme Media to Kodi", "plugin://plugin.video.emby/?mode=thememedia") + addDirectoryItem("Network credentials", "plugin://plugin.video.plexkodiconnect/?mode=passwords") + addDirectoryItem("Settings", "plugin://plugin.video.plexkodiconnect/?mode=settings") + addDirectoryItem("Add user to session", "plugin://plugin.video.plexkodiconnect/?mode=adduser") + addDirectoryItem("Refresh Emby playlists/nodes", "plugin://plugin.video.plexkodiconnect/?mode=refreshplaylist") + addDirectoryItem("Perform manual sync", "plugin://plugin.video.plexkodiconnect/?mode=manualsync") + addDirectoryItem("Repair local database (force update all content)", "plugin://plugin.video.plexkodiconnect/?mode=repair") + addDirectoryItem("Perform local database reset (full resync)", "plugin://plugin.video.plexkodiconnect/?mode=reset") + addDirectoryItem("Cache all images to Kodi texture cache", "plugin://plugin.video.plexkodiconnect/?mode=texturecache") + addDirectoryItem("Sync Emby Theme Media to Kodi", "plugin://plugin.video.plexkodiconnect/?mode=thememedia") xbmcplugin.endOfDirectory(int(sys.argv[1])) @@ -969,12 +969,12 @@ def getExtraFanArt(): # for tvshows we get the embyid just from the path if xbmc.getCondVisibility("Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)"): itemPath = xbmc.getInfoLabel("ListItem.Path").decode('utf-8') - if "plugin.video.emby" in itemPath: + if "plugin.video.plexkodiconnect" in itemPath: embyId = itemPath.split("/")[-2] else: #for movies we grab the emby id from the params itemPath = xbmc.getInfoLabel("ListItem.FileNameAndPath").decode('utf-8') - if "plugin.video.emby" in itemPath: + if "plugin.video.plexkodiconnect" in itemPath: params = urlparse.parse_qs(itemPath) embyId = params.get('id') if embyId: embyId = embyId[0] diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py index d98f48ed..2ef9c269 100644 --- a/resources/lib/librarysync.py +++ b/resources/lib/librarysync.py @@ -971,12 +971,16 @@ class LibrarySync(threading.Thread): for type in types: if pdialog: + pdialog.update( + heading="Emby for Kodi", + message="Gathering %s..." % type) + all_embyitems = process[type][0](dialog=pdialog) total = all_embyitems['TotalRecordCount'] embyitems = all_embyitems['Items'] if pdialog: - pass + pdialog.update(heading="Processing %s / %s items" % (type, total)) count = 0 for embyitem in embyitems: @@ -1096,7 +1100,6 @@ class LibrarySync(threading.Thread): kodicursor.close() embycursor.close() - def compareDBVersion(self, current, minimum): # It returns True is database is up to date. False otherwise. self.logMsg("current: %s minimum: %s" % (current, minimum), 1)