Merge remote-tracking branch 'MediaBrowser/master'

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.plexkodiconnect"
         name="PlexKodiConnect" 
-        version="1.1.67"
+        version="1.1.68"
         provider-name="tomkat83">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

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

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)
                     

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()
@@ -934,17 +935,14 @@ class LibrarySync(threading.Thread):
 
                         # Process individual episode
                         if self.shouldStop():
-                            return False
+                            return False                          
-
-                        if pdialog:
-                            percentage = int((float(count) / float(total))*100)
-                            pdialog.update(percentage, message=title)
-                            count += 1
 
                         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)
@@ -1318,7 +1316,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

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

service.py

@@ -71,7 +71,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)