Movie sync working.

resources/lib/PlexAPI.py

@@ -1281,15 +1281,23 @@ class PlexAPI():
         try:
             result = jsondata['_children']
         except KeyError:
+            self.logMsg("Error retrieving all movies for section %s" % viewId, 1)
             pass
         return result
 
     def GetPlexMetadata(self, key):
         """
         Returns raw API metadata for key.
+
+        Can be called with either Plex key '/library/metadata/xxxx'metadata
+        OR with the digits 'xxxx' only.
         """
         result = []
-        url = "{server}" + key
+        key = str(key)
+        if '/library/metadata/' in key:
+            url = "{server}" + key
+        else:
+            url = "{server}/library/metadata/" + key
         jsondata = self.doUtils.downloadUrl(url)
         try:
             result = jsondata['_children'][0]
@@ -1339,23 +1347,28 @@ class API():
 
     def getChecksum(self):
         """
+        Returns a string, not int!
         Maybe get rid of viewOffset = (resume point)?!?
         """
         item = self.item
-        checksum = "%s%s%s%s%s" % (
+        # Include a letter to prohibit saving as an int!
-            item['key'],
+        checksum = "K%s%s%s%s%s" % (
+            self.getKey(),
             item['updatedAt'],
             item.get('viewCount', ""),
             item.get('lastViewedAt', ""),
             item.get('viewOffset', "")
         )
-        return checksum
+        return str(checksum)
 
     def getKey(self):
+        """
+        Returns the Plex unique movie id as a str, not int
+        """
         item = self.item
         key_regex = re.compile(r'/(\d+)$')
         key = key_regex.findall(item['key'])[0]
-        return int(key)
+        return str(key)
 
     def getDateCreated(self):
         item = self.item

resources/lib/itemtypes.py

@@ -313,7 +313,7 @@ class Movies(Items):
         plot = item.get('summary', None)
         shortplot = None
         tagline = item.get('tagline', None)
-        votecount = 0
+        votecount = None
         rating = item.get('audienceRating', None)
         year = item.get('year', None)
         imdb = API.getProvider('Imdb')

resources/lib/librarysync.py

@@ -466,120 +466,102 @@ class LibrarySync(threading.Thread):
 
 
     def PlexMovies(self, embycursor, kodicursor, pdialog, compare=False):
-        # Get movies from emby
+        plx = PlexAPI.PlexAPI()
+        # Get movies from Plex server
         emby = self.emby
         emby_db = embydb.Embydb_Functions(embycursor)
         movies = itemtypes.Movies(embycursor, kodicursor)
 
-        views = self.plx.GetPlexCollections('movies')
+        views = plx.GetPlexCollections('movie')
-        self.logMsg("Media folders: %s" % views, 1)
+        self.logMsg("Movie folders found: %s" % views, 1)
 
         if compare:
             # Pull the list of movies and boxsets in Kodi
             try:
-                all_kodimovies = dict(emby_db.getChecksum('Movie'))
+                all_kodimoviesId = dict(emby_db.getChecksum('Movie'))
             except ValueError:
-                all_kodimovies = {}
+                all_kodimoviesId = {}
-
+            self.logMsg("all_kodimoviesId: %s " % (all_kodimoviesId), 1)
-            try:
+        all_plexmoviesIds = []
-                all_kodisets = dict(emby_db.getChecksum('BoxSet'))
+        updatelist = []
-            except ValueError:
+        plexmovies = []
-                all_kodisets = {}
-
-            all_embymoviesIds = set()
-            all_embyboxsetsIds = set()
-            updatelist = []
 
         ##### PROCESS MOVIES #####
         for view in views:
-            
             if self.shouldStop():
                 return False
-
             # Get items per view
             viewId = view['id']
             viewName = view['name']
-
             if pdialog:
                 pdialog.update(
-                        heading=self.addonName,
+                    heading=self.addonName,
-                        message="Gathering movies from view: %s..." % viewName)
+                    message="Gathering movies from view: %s..." % viewName
+                )
+            all_plexmovies = plx.GetPlexSectionResults(viewId)
 
             if compare:
                 # Manual sync
                 if pdialog:
                     pdialog.update(
-                            heading=self.addonName,
+                        heading=self.addonName,
-                            message="Comparing movies from view: %s..." % viewName)
+                        message="Comparing movies from view: %s..." % viewName
-
+                    )
-                all_embymovies = self.plx.GetPlexSectionResults(viewId)
+                for plexmovie in all_plexmovies[0:10]:
-                embymovies = []
-                for embymovie in all_embymovies:
-
                     if self.shouldStop():
                         return False
-
+                    API = PlexAPI.API(plexmovie)
-                    API = PlexAPI.API(embymovie)
+                    plex_checksum = API.getChecksum()
                     itemid = API.getKey()
-                    all_embymoviesIds.add(itemid)
+                    kodi_checksum = all_kodimoviesId.get(itemid)
-
+                    all_plexmoviesIds.append(plex_checksum)
-                    if all_kodimovies.get(itemid) != API.getChecksum():
+                    if kodi_checksum != plex_checksum:
+                        self.logMsg("Kodimovie unequal to Embymovie: %s %s" % (kodi_checksum, plex_checksum), 2)
                         # Only update if movie is not in Kodi or checksum is different
                         updatelist.append(itemid)
-                        embymovies.append(embymovie)
-
-                self.logMsg("Movies to update for %s: %s" % (viewName, updatelist), 1)
-                total = len(updatelist)
-                del updatelist[:]
             else:
-                # Initial or repair sync
+                # Initial or repair sync: get all Plex movies
-                embymovies = self.plx.GetPlexSectionResults(viewId)
+                for plexmovie in all_plexmovies[0:10]:
-                total = len(embymovies)
+                    API = PlexAPI.API(plexmovie)
+                    itemid = API.getKey()
+                    plex_checksum = API.getChecksum()
+                    all_plexmoviesIds.append(plex_checksum)
+                    updatelist.append(itemid)
+            self.logMsg("Movies to update for %s: %s" % (viewName, updatelist), 1)
+            # Get individual metadata for all movies that we need to sync
+            # This is possibly a huge list!
+            for itemid in updatelist:
+                plexmovie = plx.GetPlexMetadata(itemid)
+                plexmovies.append(plexmovie)
 
+            total = len(plexmovies)
             if pdialog:
                 pdialog.update(heading="Processing %s / %s items" % (viewName, total))
 
             count = 0
-            # DELETE ME WHEN DONE TESTING!!
+            for plexmovie in plexmovies:
-            embymovies = embymovies[0:10]
-            for embymovie in embymovies:
                 # Process individual movies
                 if self.shouldStop():
                     return False
-                
+                title = plexmovie['title']
-                title = embymovie['title']
                 if pdialog:
                     percentage = int((float(count) / float(total))*100)
                     pdialog.update(percentage, message=title)
                     count += 1
-                detailed = self.plx.GetPlexMetadata(embymovie['key'])
+                movies.add_update(plexmovie, viewName, viewId)
-                movies.add_update(detailed, viewName, viewId)
         else:
             self.logMsg("Movies finished.", 2)
 
         ##### PROCESS DELETES #####
         if compare:
-            self.logMsg("all_kodimovies: %s" % all_kodimovies, 1)
-            self.logMsg("all_embymovies: %s" % all_embymoviesIds, 1)
             # Manual sync, process deletes
-            for kodimovie in all_kodimovies:
+            for kodimovie, checksum in all_kodimoviesId.items():
-                if kodimovie not in all_embymoviesIds:
+                if checksum not in all_plexmoviesIds:
                     movies.remove(kodimovie)
             else:
                 self.logMsg("Movies compare finished.", 1)
-
-            for boxset in all_kodisets:
-                if boxset not in all_embyboxsetsIds:
-                    movies.remove(boxset)
-            else:
-                self.logMsg("Boxsets compare finished.", 1)
-
         return True
 
-
-
-
-
     def movies(self, embycursor, kodicursor, pdialog, compare=False):
         # Get movies from emby
         emby = self.emby

resources/lib/websocket_client.py

@@ -288,8 +288,8 @@ class WebSocket_Client(threading.Thread):
         else:
             server = server.replace('http', "ws")
             #EDIT: realized the ws url is at: ws://server.local:32400/:/websockets/notifications
-
+        websocket_url = ""
-        websocket_url = "%s/:/websockets/notifications/?X-Plex-Token=%s" % (server, token)
+        # websocket_url = "%s/:/websockets/notifications/?X-Plex-Token=%s" % (server, token)
         self.logMsg("websocket url: %s" % websocket_url, 1)
 
         self.client = websocket.WebSocketApp(websocket_url,

resources/settings.xml

@@ -62,7 +62,7 @@
 	</category>
 	
 	<category label="30022">
-		<setting id="logLevel" type="enum" label="30004" values="None|Info|Debug" default="1" />
+		<setting id="logLevel" type="enum" label="30004" values="None|Info|Debug" default="2" />
         <setting id="connectMsg" type="bool" label="30249" default="true" />
         <setting id="restartMsg" type="bool" label="Enable server message when it's restarting" default="false" />
         <setting id="newContent" type="bool" label="Enable new content notification" default="false" />