From e475d3366d25b01af975301d9a2b5342aaf242d8 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Sun, 27 Dec 2015 17:04:40 -0600 Subject: [PATCH 1/5] Fix transcode h265 --- resources/lib/playutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py index 32452d9a..e2835929 100644 --- a/resources/lib/playutils.py +++ b/resources/lib/playutils.py @@ -192,7 +192,7 @@ class PlayUtils(): item = self.item if (utils.settings('transcodeH265') == "true" and - result['MediaSources'][0]['Name'].startswith("1080P/H265")): + item['MediaSources'][0]['Name'].startswith("1080P/H265")): # Avoid H265 1080p self.logMsg("Option to transcode 1080P/H265 enabled.", 1) return False From 601f578892f93e6de8ecd955a38a22cec8ca9a2d Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Sun, 27 Dec 2015 17:06:50 -0600 Subject: [PATCH 2/5] Fix dialog --- resources/lib/librarysync.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py index 7020af13..b72e377f 100644 --- a/resources/lib/librarysync.py +++ b/resources/lib/librarysync.py @@ -934,17 +934,14 @@ class LibrarySync(threading.Thread): # Process individual episode if self.shouldStop(): - return False - - if pdialog: - percentage = int((float(count) / float(total))*100) - pdialog.update(percentage, message=title) - count += 1 + return False title = episode['SeriesName'] episodetitle = episode['Name'] if pdialog: + percentage = int((float(count) / float(total))*100) pdialog.update(percentage, message="%s - %s" % (title, episodetitle)) + count += 1 tvshows.add_updateEpisode(episode) else: self.logMsg("TVShows finished.", 2) From a7131c286703086b7cd95a4a225eb02ffddc30a8 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Sun, 27 Dec 2015 22:47:49 -0600 Subject: [PATCH 3/5] Correct typo --- resources/lib/librarysync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py index b72e377f..c78f7048 100644 --- a/resources/lib/librarysync.py +++ b/resources/lib/librarysync.py @@ -1315,7 +1315,7 @@ class LibrarySync(threading.Thread): if utils.window('emby_syncRunning') != "true": self.logMsg("SyncDatabase onWake (started)", 0) librarySync = self.startSync() - self.logMsg("SyncDatabase onWake (finished) %s", librarySync, 0) + self.logMsg("SyncDatabase onWake (finished) %s" % librarySync, 0) if self.stop_thread: # Set in service.py From e4fb2de7c253385578c89c4874b0331cf1be1f99 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Sun, 27 Dec 2015 22:51:47 -0600 Subject: [PATCH 4/5] Prevent deleting artwork during initial sync --- resources/lib/artwork.py | 3 ++- resources/lib/librarysync.py | 1 + service.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lib/artwork.py b/resources/lib/artwork.py index 9ca2d63a..5952c204 100644 --- a/resources/lib/artwork.py +++ b/resources/lib/artwork.py @@ -332,7 +332,8 @@ class Artwork(): cacheimage = True # Only for the main backdrop, poster - if imageType in ("fanart", "poster"): + if (utils.window('emby_initialScan') != "true" and + imageType in ("fanart", "poster")): # Delete current entry before updating with the new one self.deleteCachedArtwork(url) diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py index c78f7048..e5cacfab 100644 --- a/resources/lib/librarysync.py +++ b/resources/lib/librarysync.py @@ -216,6 +216,7 @@ class LibrarySync(threading.Thread): message = "Repair sync" else: message = "Initial sync" + utils.window('emby_initialScan', value="true") pDialog = self.progressDialog("%s" % message, forced=True) starttotal = datetime.now() diff --git a/service.py b/service.py index 4b3baa5e..2c97d50e 100644 --- a/service.py +++ b/service.py @@ -69,7 +69,8 @@ class Service(): "emby_online", "emby_serverStatus", "emby_onWake", "emby_syncRunning", "emby_dbCheck", "emby_kodiScan", - "emby_shouldStop", "emby_currUser", "emby_dbScan", "emby_sessionId" + "emby_shouldStop", "emby_currUser", "emby_dbScan", "emby_sessionId", + "emby_initialScan" ] for prop in properties: utils.window(prop, clear=True) From 9d8275488229f2e1351e71b551a02215141461da Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Sun, 27 Dec 2015 23:13:36 -0600 Subject: [PATCH 5/5] Version bump 1.1.68 --- addon.xml | 2 +- changelog.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addon.xml b/addon.xml index 906ad571..ceb52a13 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/changelog.txt b/changelog.txt index ebc301ad..a2eb7220 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +version 1.1.68 +- Minor fixes + version 1.1.67 - Add option to limit items requested at once from server - Fix artwork cache