From fc05e83d90eb334d34074384df622863d41c593d Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Mon, 4 May 2015 13:54:42 -0500 Subject: [PATCH 1/4] Fix for manually marked as watched/unwatched The videolibrary.onupdate triggers 3 times. This prevents from sending more than one mark watched/unwatched to Emby API --- resources/lib/KodiMonitor.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/resources/lib/KodiMonitor.py b/resources/lib/KodiMonitor.py index be4688ef..a9104355 100644 --- a/resources/lib/KodiMonitor.py +++ b/resources/lib/KodiMonitor.py @@ -17,6 +17,9 @@ from DownloadUtils import DownloadUtils from PlaybackUtils import PlaybackUtils class Kodi_Monitor(xbmc.Monitor): + + WINDOW = xbmcgui.Window(10000) + def __init__(self, *args, **kwargs): xbmc.Monitor.__init__(self) @@ -26,7 +29,8 @@ class Kodi_Monitor(xbmc.Monitor): #this library monitor is used to detect a watchedstate change by the user through the library #as well as detect when a library item has been deleted to pass the delete to the Emby server def onNotification (self,sender,method,data): - addon = xbmcaddon.Addon(id='plugin.video.emby') + + WINDOW = self.WINDOW downloadUtils = DownloadUtils() if method == "VideoLibrary.OnUpdate": @@ -37,15 +41,26 @@ class Kodi_Monitor(xbmc.Monitor): playcount = jsondata.get("playcount") item = jsondata.get("item").get("id") type = jsondata.get("item").get("type") - if playcount != None: + prop = WINDOW.getProperty('Played%s%s' % (type,item)) + + if (playcount != None) and (prop != "true"): + WINDOW.setProperty("Played%s%s" % (type,item), "true") utils.logMsg("MB# Sync","Kodi_Monitor--> VideoLibrary.OnUpdate : " + str(data),2) WriteKodiDB().updatePlayCountFromKodi(item, type, playcount) + + self.clearProperty(type,item) if method == "System.OnWake": xbmc.sleep(10000) #Allow network to wake up utils.logMsg("Doing_Db_Sync Post Resume: syncDatabase (Started)",1) libSync = LibrarySync().FullLibrarySync() utils.logMsg("Doing_Db_Sync Post Resume: syncDatabase (Finished) " + str(libSync),1) + + def clearProperty(self,type,id): + # The sleep is necessary since VideoLibrary.OnUpdate + # triggers 3 times in a row. + xbmc.sleep(100) + self.WINDOW.clearProperty("Played%s%s" % (type,id)) From b996037e4e40c21304a0f54a21cd4c2ed251481c Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Mon, 4 May 2015 14:09:01 -0500 Subject: [PATCH 2/4] Handle unexpected response API seems to return text/html response for playeditems --- resources/lib/DownloadUtils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lib/DownloadUtils.py b/resources/lib/DownloadUtils.py index 390a9d2d..d18d2b8a 100644 --- a/resources/lib/DownloadUtils.py +++ b/resources/lib/DownloadUtils.py @@ -238,7 +238,10 @@ class DownloadUtils(): self.logMsg("====== 200 Success ======", 2) return r except: - self.logMsg("Unable to convert the response for: %s" % url, 1) + if r.headers['content-type'] == "text/html": + pass + else: + self.logMsg("Unable to convert the response for: %s" % url, 1) else: r.raise_for_status() From b882596e29a6514bbdc52e2f6e0450191bd4074d Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Mon, 4 May 2015 16:40:44 -0500 Subject: [PATCH 3/4] Quick fix for deprecated method RunPlugin goes with pluginsource default.py. This gets rid of the deprecated message when using the action to reset local db. --- default.py | 7 +++---- resources/settings.xml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/default.py b/default.py index cc6bc0bd..b9e7f365 100644 --- a/default.py +++ b/default.py @@ -36,7 +36,9 @@ if mode == "play": result = DownloadUtils().downloadUrl(url) item = PlaybackUtils().PLAY(result, setup="default") - +elif mode == "reset": + utils.reset() + #get extrafanart for listitem - this will only be used for skins that actually call the listitem's path + fanart dir... elif "extrafanart" in sys.argv[0]: itemPath = "" @@ -84,9 +86,6 @@ elif "extrafanart" in sys.argv[0]: #always do endofdirectory to prevent errors in the logs xbmcplugin.endOfDirectory(int(sys.argv[1])) - -elif sys.argv[1] == "reset": - utils.reset() else: xbmc.executebuiltin('Addon.OpenSettings(plugin.video.emby)') diff --git a/resources/settings.xml b/resources/settings.xml index b1305123..a58bea71 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -10,7 +10,6 @@ - @@ -21,6 +20,7 @@ + @@ -29,6 +29,6 @@ - + From d8475d76b2a6b8b3ccf0d8cfd0962c15c3736cdf Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Mon, 4 May 2015 16:42:21 -0500 Subject: [PATCH 4/4] Missed a line. --- default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.py b/default.py index b9e7f365..31f2cb3b 100644 --- a/default.py +++ b/default.py @@ -25,7 +25,7 @@ from API import API try: params = utils.get_params(sys.argv[2]) mode = params['mode'] - id = params['id'] + id = params.get('id', None) except: params = {} mode = None