From 96eff65c3ef12823cc367ee2b680b43d0a863e73 Mon Sep 17 00:00:00 2001 From: Luigi311 Date: Sat, 25 Feb 2023 15:03:27 -0700 Subject: [PATCH] Do not error if failed to get library watched --- src/jellyfin.py | 2 +- src/plex.py | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/jellyfin.py b/src/jellyfin.py index 20df2c4..c300714 100644 --- a/src/jellyfin.py +++ b/src/jellyfin.py @@ -309,7 +309,7 @@ class Jellyfin: f"Jellyfin: Failed to get watched for {user_name} in library {library_title}, Error: {e}", 2, ) - raise Exception(e) + return {} async def get_users_watched( self, diff --git a/src/plex.py b/src/plex.py index 7b1d036..e1f1fc3 100644 --- a/src/plex.py +++ b/src/plex.py @@ -80,20 +80,19 @@ def get_user_library_watched(user, user_plex, library): # Get all watched episodes for show episode_guids = {} for episode in show.watched(): - if episode.viewCount > 0: - episode_guids_temp = {} - for guid in episode.guids: - # Extract after :// from guid.id - m = re.match(r"(.*)://(.*)", guid.id) - guid_source, guid_id = m.group(1).lower(), m.group(2) - episode_guids_temp[guid_source] = guid_id + episode_guids_temp = {} + for guid in episode.guids: + # Extract after :// from guid.id + m = re.match(r"(.*)://(.*)", guid.id) + guid_source, guid_id = m.group(1).lower(), m.group(2) + episode_guids_temp[guid_source] = guid_id - episode_guids_temp["locations"] = tuple( - [x.split("/")[-1] for x in episode.locations] - ) - if episode.parentTitle not in episode_guids: - episode_guids[episode.parentTitle] = [] - episode_guids[episode.parentTitle].append(episode_guids_temp) + episode_guids_temp["locations"] = tuple( + [x.split("/")[-1] for x in episode.locations] + ) + if episode.parentTitle not in episode_guids: + episode_guids[episode.parentTitle] = [] + episode_guids[episode.parentTitle].append(episode_guids_temp) if episode_guids: # append show, season, episode @@ -116,7 +115,7 @@ def get_user_library_watched(user, user_plex, library): f"Plex: Failed to get watched for {user_name} in library {library.title}, Error: {e}", 2, ) - raise Exception(e) + return {} def update_user_watched(user, user_plex, library, videos, dryrun):