From 796d1ed4092213f9c542ff9d1aeef23bbd84025e Mon Sep 17 00:00:00 2001 From: xnappo Date: Sun, 29 Mar 2015 15:03:39 -0500 Subject: [PATCH] Revert "Nonetype checks" This reverts commit 526e079f445ccea18cce8c14158a39510d8a1a6e. --- resources/lib/LibrarySync.py | 169 +++++++++++++++++------------------ 1 file changed, 82 insertions(+), 87 deletions(-) diff --git a/resources/lib/LibrarySync.py b/resources/lib/LibrarySync.py index 177c3dde..6e3ede7e 100644 --- a/resources/lib/LibrarySync.py +++ b/resources/lib/LibrarySync.py @@ -440,10 +440,7 @@ class LibrarySync(): allKodiTVShows = ReadKodiDB().getKodiTvShows(False) if allKodiTVShows != None: kodishow = allKodiTVShows.get(tvshow,None) - if kodishow != None: - kodiEpisodes = ReadKodiDB().getKodiEpisodes(kodishow["tvshowid"],True,True) - else: - kodiEpisodes = None + kodiEpisodes = ReadKodiDB().getKodiEpisodes(kodishow["tvshowid"],True,True) else: kodiEpisodes = None @@ -533,50 +530,49 @@ class LibrarySync(): for tvshow in allTVShows: episodeData = ReadEmbyDB().getEpisodes(tvshow,True) kodishow = allKodiTVShows.get(tvshow,None) - if kodishow != None: - kodiEpisodes = ReadKodiDB().getKodiEpisodes(kodishow["tvshowid"],True,True) + kodiEpisodes = ReadKodiDB().getKodiEpisodes(kodishow["tvshowid"],True,True) + + if(self.ShouldStop(pDialog)): + return False + + if(pDialog != None): + progressTitle = "Sync DB : Processing Tv Show " + str(showCurrent) + " of " + str(showTotal) + pDialog.update(0, progressTitle) + total = len(episodeData) + 1 + count = 0 + + #we have to compare the lists somehow + for item in episodeData: + #add episodeId to the list of all episodes for use later on the deletes + allMB3EpisodeIds.append(item["Id"]) + + comparestring1 = str(item.get("ParentIndexNumber")) + "-" + str(item.get("IndexNumber")) + matchFound = False + + if kodiEpisodes != None: + KodiItem = kodiEpisodes.get(comparestring1, None) + if(KodiItem != None): + updated = WriteKodiDB().updateEpisodeToKodiLibrary(item, KodiItem) + if(updated): + totalItemsUpdated += 1 if(self.ShouldStop(pDialog)): - return False - + return False + + # update progress bar if(pDialog != None): - progressTitle = "Sync DB : Processing Tv Show " + str(showCurrent) + " of " + str(showTotal) - pDialog.update(0, progressTitle) - total = len(episodeData) + 1 - count = 0 - - #we have to compare the lists somehow - for item in episodeData: - #add episodeId to the list of all episodes for use later on the deletes - allMB3EpisodeIds.append(item["Id"]) - - comparestring1 = str(item.get("ParentIndexNumber")) + "-" + str(item.get("IndexNumber")) - matchFound = False - - if kodiEpisodes != None: - KodiItem = kodiEpisodes.get(comparestring1, None) - if(KodiItem != None): - updated = WriteKodiDB().updateEpisodeToKodiLibrary(item, KodiItem) - if(updated): - totalItemsUpdated += 1 - - if(self.ShouldStop(pDialog)): - return False - - # update progress bar - if(pDialog != None): - percentage = int(((float(count) / float(total)) * 100)) - pDialog.update(percentage, progressTitle, "Updating Episode: " + str(count)) - count += 1 - - - #add all kodi episodes to a list with episodes for use later on to delete episodes - #the mediabrowser ID is set as uniqueID in the NFO... for some reason this has key 'unknown' in the json response - show = ReadKodiDB().getKodiEpisodes(kodishow["tvshowid"],False,False) - if show != None: - for episode in show: - dict = {'episodeid': str(episode["uniqueid"]["unknown"]),'tvshowid': tvshow} - allKodiEpisodeIds.append(dict) + percentage = int(((float(count) / float(total)) * 100)) + pDialog.update(percentage, progressTitle, "Updating Episode: " + str(count)) + count += 1 + + + #add all kodi episodes to a list with episodes for use later on to delete episodes + #the mediabrowser ID is set as uniqueID in the NFO... for some reason this has key 'unknown' in the json response + show = ReadKodiDB().getKodiEpisodes(kodishow["tvshowid"],False,False) + if show != None: + for episode in show: + dict = {'episodeid': str(episode["uniqueid"]["unknown"]),'tvshowid': tvshow} + allKodiEpisodeIds.append(dict) showCurrent += 1 @@ -895,49 +891,48 @@ class LibrarySync(): episodeData = ReadEmbyDB().getEpisodes(item["Id"], False) allKodiTVShows = ReadKodiDB().getKodiTvShows(False) kodishow = allKodiTVShows.get(item["Id"],None) - if kodishow != None: - kodiEpisodes = ReadKodiDB().getKodiEpisodes(kodishow["tvshowid"],False,True) - - if (episodeData != None): - if(pDialog != None): - progressTitle = "Sync PlayCounts: Processing TV Show " + str(showCurrent) + " of " + str(showTotal) - pDialog.update(0, progressTitle) - totalCount = len(episodeData) + 1 - count = 1 - - for episode in episodeData: - - kodiItem = None - comparestring1 = str(episode.get("ParentIndexNumber")) + "-" + str(episode.get("IndexNumber")) - matchFound = False - if kodiEpisodes != None: - kodiItem = kodiEpisodes.get(comparestring1, None) - - userData=API().getUserData(episode) - timeInfo = API().getTimeInfo(episode) - if kodiItem != None: - WINDOW = xbmcgui.Window( 10000 ) - WINDOW.setProperty("episodeid" + str(kodiItem['episodeid']), episode.get('Name') + ";;" + episode.get('Id')) - kodiresume = int(round(kodiItem['resume'].get("position"))) - resume = int(round(float(timeInfo.get("ResumeTime"))))*60 - total = int(round(float(timeInfo.get("TotalTime"))))*60 - if kodiresume != resume: - WriteKodiDB().setKodiResumePoint(kodiItem['episodeid'],resume,total,"episode") - totalPositionsUpdated += 1 - - updated = WriteKodiDB().updateProperty(kodiItem,"playcount",int(userData.get("PlayCount")),"episode") - updated |= WriteKodiDB().updateProperty(kodiItem,"lastplayed",userData.get("LastPlayedDate"), "episode") - if(updated): - totalCountsUpdated += 1 - if(self.ShouldStop(pDialog)): - return False + kodiEpisodes = ReadKodiDB().getKodiEpisodes(kodishow["tvshowid"],False,True) + + if (episodeData != None): + if(pDialog != None): + progressTitle = "Sync PlayCounts: Processing TV Show " + str(showCurrent) + " of " + str(showTotal) + pDialog.update(0, progressTitle) + totalCount = len(episodeData) + 1 + count = 1 + + for episode in episodeData: + + kodiItem = None + comparestring1 = str(episode.get("ParentIndexNumber")) + "-" + str(episode.get("IndexNumber")) + matchFound = False + if kodiEpisodes != None: + kodiItem = kodiEpisodes.get(comparestring1, None) + + userData=API().getUserData(episode) + timeInfo = API().getTimeInfo(episode) + if kodiItem != None: + WINDOW = xbmcgui.Window( 10000 ) + WINDOW.setProperty("episodeid" + str(kodiItem['episodeid']), episode.get('Name') + ";;" + episode.get('Id')) + kodiresume = int(round(kodiItem['resume'].get("position"))) + resume = int(round(float(timeInfo.get("ResumeTime"))))*60 + total = int(round(float(timeInfo.get("TotalTime"))))*60 + if kodiresume != resume: + WriteKodiDB().setKodiResumePoint(kodiItem['episodeid'],resume,total,"episode") + totalPositionsUpdated += 1 + + updated = WriteKodiDB().updateProperty(kodiItem,"playcount",int(userData.get("PlayCount")),"episode") + updated |= WriteKodiDB().updateProperty(kodiItem,"lastplayed",userData.get("LastPlayedDate"), "episode") + if(updated): + totalCountsUpdated += 1 + if(self.ShouldStop(pDialog)): + return False + + # update progress bar + if(pDialog != None): + percentage = int(((float(count) / float(totalCount)) * 100)) + pDialog.update(percentage, progressTitle, "Updating Episode: " + str(count)) + count += 1 - # update progress bar - if(pDialog != None): - percentage = int(((float(count) / float(totalCount)) * 100)) - pDialog.update(percentage, progressTitle, "Updating Episode: " + str(count)) - count += 1 - showCurrent += 1 if(playCountSyncFirstRun != "true"):