Fixes to None stat checking

brikim · brikim · commit 1fcac700eb42 · 2025-03-11T17:36:24.000-05:00
diff --git a/api/emby.py b/api/emby.py
@@ -127,11 +127,12 @@ def search_item(self, id: str) -> Any:
                 self.logger.warning(
                     f"{self.log_header} search_item returned no results {utils.get_tag("item", id)}"
                 )
-                return None
         except Exception as e:
             self.logger.error(
                 f"{self.log_header} search_item {utils.get_tag("item", id)} {utils.get_tag("error", e)}"
             )
+        
+        return None
     
     def get_item_id_from_path(self, path) -> str:
         try:
@@ -298,21 +299,23 @@ def create_playlist(
     def get_playlist_items(self, playlist_id: str) -> EmbyPlaylist:
         try:
             playlist = self.search_item(playlist_id)
-            r = requests.get(
-                self.__get_api_url() + "/Playlists/" + playlist_id + "/Items?api_key=" + self.api_key)
-            response = r.json()
+            if playlist is not None:
+                r = requests.get(
+                    self.__get_api_url() + "/Playlists/" + playlist_id + "/Items?api_key=" + self.api_key)
+                response = r.json()
 
-            emby_playlist = EmbyPlaylist(playlist["Name"], playlist_id)
-            for item in response["Items"]:
-                emby_playlist.items.append(
-                    EmbyPlaylistItem(
-                        item["Name"],
-                        item["Id"],
-                        item["PlaylistItemId"]
+                emby_playlist = EmbyPlaylist(playlist["Name"], playlist_id)
+                for item in response["Items"]:
+                    emby_playlist.items.append(
+                        EmbyPlaylistItem(
+                            item["Name"],
+                            item["Id"],
+                            item["PlaylistItemId"]
+                        )
                     )
-                )
 
-            return emby_playlist
+                return emby_playlist
+            
         except Exception as e:
             self.logger.error(
                 f"{self.log_header} get_playlist_items {utils.get_tag("playlist_id", playlist_id)} {utils.get_tag("error", e)}"
diff --git a/app.py b/app.py
@@ -2,7 +2,7 @@
 Media Utilities
 """
 
-version = "v2.3.1"
+version = "v2.3.2"
 
 import sys
 import os
diff --git a/service/DeleteWatched.py b/service/DeleteWatched.py
@@ -211,7 +211,9 @@ def __find_emby_watched_media(self, lib: LibraryInfo, user_list: List[UserInfo])
                                 item_id = item["EpisodeId"]
                             else:
                                 item_id = item["NowPlayingItemId"]
-                            if self.emby_api.get_watched_status(user.emby_user_id, item_id):
+                            
+                            emby_watched_status = self.emby_api.get_watched_status(user.emby_user_id, item_id)
+                            if emby_watched_status is not None and emby_watched_status:
                                 item_hours_since_play = self.hours_since_play(
                                     True, 
                                     datetime.fromisoformat(item["ActivityDateInserted"])
diff --git a/service/PlaylistSync.py b/service/PlaylistSync.py
@@ -163,51 +163,52 @@ def __emby_update_playlist(
         # Get the latest playlist
         edited_emby_playlist:EmbyPlaylist = self.emby_api.get_playlist_items(original_emby_playlist.id)
         
-        # Should be the correct length before this call but make sure
-        if len(edited_emby_playlist.items) == len(emby_item_ids):
-            playlist_changed = False
-            playlist_index = 0
-            for item_id in emby_item_ids:
-                if item_id != edited_emby_playlist.items[playlist_index].id:
-                    playlist_changed = True
-                    break
-                playlist_index += 1
-
-            if playlist_changed:
-                # The order changed now iterate through the correct item order and find the playlist id to use in moving items
-                current_index = 0
-                for correct_item_id in emby_item_ids:
-                    for current_playlist_item in edited_emby_playlist.items:
-                        if correct_item_id == current_playlist_item.id:
-                            if not self.emby_api.set_move_playlist_item_to_index(
-                                edited_emby_playlist.id,
-                                current_playlist_item.playlist_item_id,
-                                current_index
-                            ):
-                                playlist_tag = utils.get_tag("playlist", original_emby_playlist.name)
-                                item_tag = utils.get_tag("item", current_playlist_item.playlist_item_id)
-                                index_tag = utils.get_tag("index", current_index)
-                                self.log_warning(
-                                    f"{utils.get_formatted_emby()} failed {playlist_tag} moving {item_tag} to {index_tag}"
-                                )
-                            current_index += 1
-                            break
-                
-                if playlist_changed or add_delete_info.added_items > 0 or add_delete_info.deleted_items > 0:
-                    collection_tag = utils.get_tag("collection", original_emby_playlist.name)
-                    added_tag = utils.get_tag("added", add_delete_info.added_items)
-                    deleted_tag = utils.get_tag("deleted", add_delete_info.deleted_items)
-                    reordered_tag = utils.get_tag("reordered", playlist_changed)
-                    self.log_info(
-                        f"Syncing {utils.get_formatted_plex()} {collection_tag} to {utils.get_formatted_emby()} {added_tag} {deleted_tag} {reordered_tag}"
-                    )
-        else:
-            collection_tag = utils.get_tag("collection", original_emby_playlist.name)
-            length_tag = utils.get_tag("length", len(emby_item_ids))
-            reported_length_tag = utils.get_tag("reported_length", len(edited_emby_playlist.items))
-            self.log_warning(
-                f"{utils.get_emby_ansi_code()} sync {utils.get_plex_ansi_code()} {collection_tag} playlist update failed. Playlist length should be {length_tag} {reported_length_tag}!"
-            )
+        if edited_emby_playlist is not None:
+            # Should be the correct length before this call but make sure
+            if len(edited_emby_playlist.items) == len(emby_item_ids):
+                playlist_changed = False
+                playlist_index = 0
+                for item_id in emby_item_ids:
+                    if item_id != edited_emby_playlist.items[playlist_index].id:
+                        playlist_changed = True
+                        break
+                    playlist_index += 1
+    
+                if playlist_changed:
+                    # The order changed now iterate through the correct item order and find the playlist id to use in moving items
+                    current_index = 0
+                    for correct_item_id in emby_item_ids:
+                        for current_playlist_item in edited_emby_playlist.items:
+                            if correct_item_id == current_playlist_item.id:
+                                if not self.emby_api.set_move_playlist_item_to_index(
+                                    edited_emby_playlist.id,
+                                    current_playlist_item.playlist_item_id,
+                                    current_index
+                                ):
+                                    playlist_tag = utils.get_tag("playlist", original_emby_playlist.name)
+                                    item_tag = utils.get_tag("item", current_playlist_item.playlist_item_id)
+                                    index_tag = utils.get_tag("index", current_index)
+                                    self.log_warning(
+                                        f"{utils.get_formatted_emby()} failed {playlist_tag} moving {item_tag} to {index_tag}"
+                                    )
+                                current_index += 1
+                                break
+                            
+                    if playlist_changed or add_delete_info.added_items > 0 or add_delete_info.deleted_items > 0:
+                        collection_tag = utils.get_tag("collection", original_emby_playlist.name)
+                        added_tag = utils.get_tag("added", add_delete_info.added_items)
+                        deleted_tag = utils.get_tag("deleted", add_delete_info.deleted_items)
+                        reordered_tag = utils.get_tag("reordered", playlist_changed)
+                        self.log_info(
+                            f"Syncing {utils.get_formatted_plex()} {collection_tag} to {utils.get_formatted_emby()} {added_tag} {deleted_tag} {reordered_tag}"
+                        )
+            else:
+                collection_tag = utils.get_tag("collection", original_emby_playlist.name)
+                length_tag = utils.get_tag("length", len(emby_item_ids))
+                reported_length_tag = utils.get_tag("reported_length", len(edited_emby_playlist.items))
+                self.log_warning(
+                    f"{utils.get_emby_ansi_code()} sync {utils.get_plex_ansi_code()} {collection_tag} playlist update failed. Playlist length should be {length_tag} {reported_length_tag}!"
+                )
     
     def __sync_emby_playlist_with_plex_collection(self, plex_collection: PlexCollection):
         emby_item_ids: list[str] = []
@@ -232,7 +233,7 @@ def __sync_emby_playlist_with_plex_collection(self, plex_collection: PlexCollect
             )
         else:
             emby_playlist:EmbyPlaylist = self.emby_api.get_playlist_items(emby_playlist_id)
-            if emby_playlist:
+            if emby_playlist is not None:
                 self.__emby_update_playlist(emby_item_ids, emby_playlist)
                 
                 # Give emby time to process
@@ -263,7 +264,7 @@ def __sync_playlists(self):
                     self.log_warning(self.emby_api.get_connection_error_log())
     
     def init_scheduler_jobs(self):
-        if self.cron:
+        if self.cron is not None:
             self.log_service_enabled()
             self.scheduler.add_job(
                 self.__sync_playlists,
diff --git a/service/SyncWatched.py b/service/SyncWatched.py
@@ -141,7 +141,7 @@ def __get_user_data(self) -> List[UserInfo]:
                         plex_user_id = plex_user_info["user_id"]
                         if (
                             "friendly_name" in plex_user_info 
-                            and plex_user_info["friendly_name"]
+                            and plex_user_info["friendly_name"] is not None
                             and plex_user_info["friendly_name"] != ""
                         ):
                             plex_friendly_name = plex_user_info["friendly_name"]
@@ -294,7 +294,11 @@ def __set_plex_show_watched(
                         plex_episode_location = self.__get_plex_path(
                             emby_episode_item["Path"]
                         )
-                        if episode and not episode.isWatched and episode.locations[0] == plex_episode_location:
+                        if (
+                            episode is not None 
+                            and not episode.isWatched 
+                            and episode.locations[0] == plex_episode_location
+                        ):
                             episode.markWatched()
                             
                             show_title = episode.grandparentTitle + " - " + episode.title
@@ -344,11 +348,14 @@ def __sync_plex_with_emby_watch_status(
             )
         )
         if hours_since_play < 24:
-            if (jellystat_item["SeriesName"]
-                and self.emby_api.get_watched_status(
-                    user.emby_user_id,
-                    jellystat_item["EpisodeId"]
-                )
+            emby_watched_status = self.emby_api.get_watched_status(
+                user.emby_user_id,
+                jellystat_item["EpisodeId"]
+            )
+            if (
+                jellystat_item["SeriesName"] is not None
+                and emby_watched_status is not None 
+                and emby_watched_status
             ):
                 emby_series_item = self.emby_api.search_item(
                     jellystat_item["NowPlayingItemId"]
@@ -357,24 +364,26 @@ def __sync_plex_with_emby_watch_status(
                     jellystat_item["EpisodeId"]
                 )
                 
-                if emby_series_item and emby_episode_item:
+                if emby_series_item is not None and emby_episode_item is not None:
                     self.__set_plex_show_watched(
                         emby_series_item["Path"],
                         emby_episode_item,
                         user
                     )
             else:
-                # Check that the item has been marked as watched by emby
-                if self.emby_api.get_watched_status(
+                emby_watched_status = self.emby_api.get_watched_status(
                     user.emby_user_id,
                     jellystat_item["NowPlayingItemId"]
-                ):
+                )
+                
+                # Check that the item has been marked as watched by emby
+                if emby_watched_status is not None and emby_watched_status:
                     emby_item = self.emby_api.search_item(
                         jellystat_item["NowPlayingItemId"]
                     )
                     
                     if (
-                        emby_item 
+                        emby_item is not None
                         and emby_item["Type"] == self.emby_api.get_media_type_movie_name()
                     ):
                         self.__set_plex_movie_watched(emby_item, user)
@@ -416,7 +425,7 @@ def __sync_watch_status(self):
         
     def init_scheduler_jobs(self):
         if len(self.config_user_list) > 0:
-            if self.cron:
+            if self.cron is not None:
                 self.log_service_enabled()
                 
                 self.scheduler.add_job(
