Merge remote-tracking branch 'MediaBrowser/master' into develop

addon.xml

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

changelog.txt

@@ -1,3 +1,14 @@
+version 2.2.5
+- Add generate a new device Id option, found in the add-on settings > advanced.
+- Offer to delete cached thumbnails upon database reset.
+- Breaking fix for views. You will notice duplicates in your video nodes. When you have a moment to spare, run the refresh playlists/nodes action found by launching the emby add-on (this is not reversible). Your homescreen shortcuts actions will need to be redirected to the new playlists/nodes. 
+- Fix pictures, the shortcut should now appear under photo add-ons > emby.
+- Fix view shortcuts to follow emby ordering. This changes the Emby.nodes.X ordering (automatically created shortcuts and via launching the emby add-on). This does not change the video nodes ordering.
+- Fix ssl client certificate verification
+- Fix resume
+- Prevent artwork deletion from crashing the add-on
+- Fix to import virtual season artwork
+
 version 2.2.4
 - Fix external subs being appended to direct play (via add-on playback)
 - First attempt at keeping Kodi awake during the initial sync

resources/lib/librarysync.py

@@ -1161,6 +1161,8 @@ class LibrarySync(Thread):
                                    "until the database is reset."))
                     else:
                         utils.reset()
+                    break
+
                 window('emby_dbCheck', value="true")
 
             if not startupComplete:

resources/lib/read_embyserver.py

@@ -356,6 +356,32 @@ class Read_EmbyServer():
         
         return views
 
+    def verifyView(self, parentid, itemid):
+
+        belongs = False
+
+        url = "{server}/emby/Users/{UserId}/Items?format=json"
+        params = {
+
+            'ParentId': parentid,
+            'CollapseBoxSetItems': False,
+            'IsVirtualUnaired': False,
+            'IsMissing': False,
+            'Recursive': True,
+            'Ids': itemid
+        }
+        result = self.doUtils(url, parameters=params)
+        try:
+            total = result['TotalRecordCount']
+        except TypeError:
+            # Something happened to the connection
+            pass
+        else:
+            if total:
+                belongs = True
+
+        return belongs
+
     def getMovies(self, parentId, basic=False, dialog=None):
 
         items = self.getSection(parentId, "Movie", basic=basic, dialog=dialog)