bel
/
JellyPlex-Watched
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not fail on some errors 

Signed-off-by: Luis Garcia <git@luigi311.com>
pull/277/head
Luis Garcia 2025-05-15 03:38:33 +00:00
parent 3e474a4593
commit 229ab59b44
2 changed files with 264 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/jellyfin_emby.py
View File

@ -469,7 +469,7 @@ class JellyfinEmby:
return users_watched return users_watched
except Exception as e: except Exception as e:
logger.error(f"{self.server_type}: Failed to get watched, Error: {e}") logger.error(f"{self.server_type}: Failed to get watched, Error: {e}")
raise Exception(e) return {}
def update_user_watched( def update_user_watched(
self, self,
@ -681,8 +681,6 @@ class JellyfinEmby:
logger.error( logger.error(
f"{self.server_type}: Error updating watched for {user_name} in library {library_name}, {e}", f"{self.server_type}: Error updating watched for {user_name} in library {library_name}, {e}",
) )
logger.error(traceback.format_exc())
raise Exception(e)
def update_watched( def update_watched(
self, self,
@ -691,84 +689,82 @@ class JellyfinEmby:
library_mapping: dict[str, str] | None = None, library_mapping: dict[str, str] | None = None,
dryrun: bool = False, dryrun: bool = False,
) -> None: ) -> None:
try: for user, user_data in watched_list.items():
for user, user_data in watched_list.items(): user_other = None
user_other = None user_name = None
user_name = None if user_mapping:
if user_mapping: if user in user_mapping.keys():
if user in user_mapping.keys(): user_other = user_mapping[user]
user_other = user_mapping[user] elif user in user_mapping.values():
elif user in user_mapping.values(): user_other = search_mapping(user_mapping, user)
user_other = search_mapping(user_mapping, user)
user_id = None user_id = None
for key in self.users: for key in self.users:
if user.lower() == key.lower(): if user.lower() == key.lower():
user_id = self.users[key] user_id = self.users[key]
user_name = key user_name = key
break break
elif user_other and user_other.lower() == key.lower(): elif user_other and user_other.lower() == key.lower():
user_id = self.users[key] user_id = self.users[key]
user_name = key user_name = key
break break
if not user_id or not user_name: if not user_id or not user_name:
logger.info(f"{user} {user_other} not found in Jellyfin") logger.info(f"{user} {user_other} not found in Jellyfin")
continue continue
jellyfin_libraries = self.query( jellyfin_libraries = self.query(
f"/Users/{user_id}/Views", f"/Users/{user_id}/Views",
"get", "get",
)
if not jellyfin_libraries or not isinstance(jellyfin_libraries, dict):
logger.debug(
f"{self.server_type}: Failed to get libraries for {user_name}"
) )
continue
if not jellyfin_libraries or not isinstance(jellyfin_libraries, dict): jellyfin_libraries = [x for x in jellyfin_libraries.get("Items", [])]
logger.debug(
f"{self.server_type}: Failed to get libraries for {user_name}"
)
continue
jellyfin_libraries = [x for x in jellyfin_libraries.get("Items", [])] for library_name in user_data.libraries:
library_data = user_data.libraries[library_name]
library_other = None
if library_mapping:
if library_name in library_mapping.keys():
library_other = library_mapping[library_name]
elif library_name in library_mapping.values():
library_other = search_mapping(library_mapping, library_name)
for library_name in user_data.libraries: if library_name.lower() not in [
library_data = user_data.libraries[library_name] x["Name"].lower() for x in jellyfin_libraries
library_other = None ]:
if library_mapping: if library_other:
if library_name in library_mapping.keys(): if library_other.lower() in [
library_other = library_mapping[library_name] x["Name"].lower() for x in jellyfin_libraries
elif library_name in library_mapping.values(): ]:
library_other = search_mapping( logger.info(
library_mapping, library_name f"{self.server_type}: Library {library_name} not found, but {library_other} found, using {library_other}",
) )
library_name = library_other
if library_name.lower() not in [
x["Name"].lower() for x in jellyfin_libraries
]:
if library_other:
if library_other.lower() in [
x["Name"].lower() for x in jellyfin_libraries
]:
logger.info(
f"{self.server_type}: Library {library_name} not found, but {library_other} found, using {library_other}",
)
library_name = library_other
else:
logger.info(
f"{self.server_type}: Library {library_name} or {library_other} not found in library list",
)
continue
else: else:
logger.info( logger.info(
f"{self.server_type}: Library {library_name} not found in library list", f"{self.server_type}: Library {library_name} or {library_other} not found in library list",
) )
continue continue
else:
logger.info(
f"{self.server_type}: Library {library_name} not found in library list",
)
continue
library_id = None library_id = None
for jellyfin_library in jellyfin_libraries: for jellyfin_library in jellyfin_libraries:
if jellyfin_library["Name"].lower() == library_name.lower(): if jellyfin_library["Name"].lower() == library_name.lower():
library_id = jellyfin_library["Id"] library_id = jellyfin_library["Id"]
continue continue
if library_id: if library_id:
try:
self.update_user_watched( self.update_user_watched(
user_name, user_name,
user_id, user_id,
@ -777,7 +773,7 @@ class JellyfinEmby:
library_id, library_id,
dryrun, dryrun,
) )
except Exception as e:
except Exception as e: logger.error(
logger.error(f"{self.server_type}: Error updating watched, {e}") f"{self.server_type}: Error updating watched for {user_name} in library {library_name}, {e}",
raise Exception(e) )

380
src/plex.py
View File

@ -92,128 +92,145 @@ def update_user_watched(
library_name: str, library_name: str,
dryrun: bool, dryrun: bool,
) -> None: ) -> None:
try: # If there are no movies or shows to update, exit early.
# If there are no movies or shows to update, exit early. if not library_data.series and not library_data.movies:
if not library_data.series and not library_data.movies: return
return
logger.info( logger.info(f"Plex: Updating watched for {user.title} in library {library_name}")
f"Plex: Updating watched for {user.title} in library {library_name}" library_section = user_plex.library.section(library_name)
if not library_section:
logger.error(
f"Plex: Library {library_name} not found for {user.title}, skipping",
) )
library_section = user_plex.library.section(library_name) return
# Update movies. # Update movies.
if library_data.movies: if library_data.movies:
# Search for Plex movies that are currently marked as unwatched. # Search for Plex movies that are currently marked as unwatched.
for plex_movie in library_section.search(unwatched=True): for plex_movie in library_section.search(unwatched=True):
plex_identifiers = extract_identifiers_from_item(plex_movie) plex_identifiers = extract_identifiers_from_item(plex_movie)
# Check each stored movie for a match. # Check each stored movie for a match.
for stored_movie in library_data.movies: for stored_movie in library_data.movies:
if check_same_identifiers( if check_same_identifiers(plex_identifiers, stored_movie.identifiers):
plex_identifiers, stored_movie.identifiers # If the stored movie is marked as watched (or has enough progress),
): # update the Plex movie accordingly.
# If the stored movie is marked as watched (or has enough progress), if stored_movie.status.completed:
# update the Plex movie accordingly. msg = f"Plex: {plex_movie.title} as watched for {user.title} in {library_name}"
if stored_movie.status.completed: if not dryrun:
msg = f"Plex: {plex_movie.title} as watched for {user.title} in {library_name}" try:
if not dryrun:
plex_movie.markWatched() plex_movie.markWatched()
except Exception as e:
logger.error(
f"Plex: Failed to mark {plex_movie.title} as watched, Error: {e}"
)
continue
logger.success(f"{'[DRYRUN] ' if dryrun else ''}{msg}") logger.success(f"{'[DRYRUN] ' if dryrun else ''}{msg}")
log_marked( log_marked(
"Plex", "Plex",
user_plex.friendlyName, user_plex.friendlyName,
user.title, user.title,
library_name, library_name,
plex_movie.title, plex_movie.title,
None, None,
None, None,
) )
else: else:
msg = f"Plex: {plex_movie.title} as partially watched for {floor(stored_movie.status.time / 60_000)} minutes for {user.title} in {library_name}" msg = f"Plex: {plex_movie.title} as partially watched for {floor(stored_movie.status.time / 60_000)} minutes for {user.title} in {library_name}"
if not dryrun: if not dryrun:
try:
plex_movie.updateTimeline(stored_movie.status.time) plex_movie.updateTimeline(stored_movie.status.time)
except Exception as e:
logger.error(
f"Plex: Failed to update {plex_movie.title} timeline, Error: {e}"
)
continue
logger.success(f"{'[DRYRUN] ' if dryrun else ''}{msg}") logger.success(f"{'[DRYRUN] ' if dryrun else ''}{msg}")
log_marked( log_marked(
"Plex", "Plex",
user_plex.friendlyName, user_plex.friendlyName,
user.title, user.title,
library_name, library_name,
plex_movie.title, plex_movie.title,
duration=stored_movie.status.time, duration=stored_movie.status.time,
) )
# Once matched, no need to check further. # Once matched, no need to check further.
break break
# Update TV Shows (series/episodes). # Update TV Shows (series/episodes).
if library_data.series: if library_data.series:
# For each Plex show in the library section: # For each Plex show in the library section:
plex_shows = library_section.search(unwatched=True) plex_shows = library_section.search(unwatched=True)
for plex_show in plex_shows: for plex_show in plex_shows:
# Extract identifiers from the Plex show. # Extract identifiers from the Plex show.
plex_show_identifiers = extract_identifiers_from_item(plex_show) plex_show_identifiers = extract_identifiers_from_item(plex_show)
# Try to find a matching series in your stored library. # Try to find a matching series in your stored library.
for stored_series in library_data.series: for stored_series in library_data.series:
if check_same_identifiers( if check_same_identifiers(
plex_show_identifiers, stored_series.identifiers plex_show_identifiers, stored_series.identifiers
): ):
logger.trace(f"Found matching show for '{plex_show.title}'") logger.trace(f"Found matching show for '{plex_show.title}'")
# Now update episodes. # Now update episodes.
# Get the list of Plex episodes for this show. # Get the list of Plex episodes for this show.
plex_episodes = plex_show.episodes() plex_episodes = plex_show.episodes()
for plex_episode in plex_episodes: for plex_episode in plex_episodes:
plex_episode_identifiers = extract_identifiers_from_item( plex_episode_identifiers = extract_identifiers_from_item(
plex_episode plex_episode
) )
for stored_ep in stored_series.episodes: for stored_ep in stored_series.episodes:
if check_same_identifiers( if check_same_identifiers(
plex_episode_identifiers, stored_ep.identifiers plex_episode_identifiers, stored_ep.identifiers
): ):
if stored_ep.status.completed: if stored_ep.status.completed:
msg = f"Plex: {plex_show.title} {plex_episode.title} as watched for {user.title} in {library_name}" msg = f"Plex: {plex_show.title} {plex_episode.title} as watched for {user.title} in {library_name}"
if not dryrun: if not dryrun:
try:
plex_episode.markWatched() plex_episode.markWatched()
except Exception as e:
logger.error(
f"Plex: Failed to mark {plex_show.title} {plex_episode.title} as watched, Error: {e}"
)
continue
logger.success( logger.success(
f"{'[DRYRUN] ' if dryrun else ''}{msg}" f"{'[DRYRUN] ' if dryrun else ''}{msg}"
) )
log_marked( log_marked(
"Plex", "Plex",
user_plex.friendlyName, user_plex.friendlyName,
user.title, user.title,
library_name, library_name,
plex_show.title, plex_show.title,
plex_episode.title, plex_episode.title,
) )
else: else:
msg = f"Plex: {plex_show.title} {plex_episode.title} as partially watched for {floor(stored_ep.status.time / 60_000)} minutes for {user.title} in {library_name}" msg = f"Plex: {plex_show.title} {plex_episode.title} as partially watched for {floor(stored_ep.status.time / 60_000)} minutes for {user.title} in {library_name}"
if not dryrun: if not dryrun:
try:
plex_episode.updateTimeline( plex_episode.updateTimeline(
stored_ep.status.time stored_ep.status.time
) )
except Exception as e:
logger.error(
f"Plex: Failed to update {plex_show.title} {plex_episode.title} timeline, Error: {e}"
)
continue
logger.success( logger.success(
f"{'[DRYRUN] ' if dryrun else ''}{msg}" f"{'[DRYRUN] ' if dryrun else ''}{msg}"
) )
log_marked( log_marked(
"Plex", "Plex",
user_plex.friendlyName, user_plex.friendlyName,
user.title, user.title,
library_name, library_name,
plex_show.title, plex_show.title,
plex_episode.title, plex_episode.title,
stored_ep.status.time, stored_ep.status.time,
) )
break # Found a matching episode. break # Found a matching episode.
break # Found a matching show. break # Found a matching show.
except Exception as e:
logger.error(
f"Plex: Failed to update watched for {user.title} in library {library_name}, Error: {e}",
2,
)
raise e
# class plex accept base url and token and username and password but default with none # class plex accept base url and token and username and password but default with none
@ -423,7 +440,7 @@ class Plex:
return users_watched return users_watched
except Exception as e: except Exception as e:
logger.error(f"Plex: Failed to get watched, Error: {e}") logger.error(f"Plex: Failed to get watched, Error: {e}")
raise Exception(e) return {}
def update_watched( def update_watched(
self, self,
@ -432,86 +449,82 @@ class Plex:
library_mapping: dict[str, str] | None = None, library_mapping: dict[str, str] | None = None,
dryrun: bool = False, dryrun: bool = False,
) -> None: ) -> None:
try: for user, user_data in watched_list.items():
for user, user_data in watched_list.items(): user_other = None
user_other = None # If type of user is dict
# If type of user is dict if user_mapping:
if user_mapping: user_other = search_mapping(user_mapping, user)
user_other = search_mapping(user_mapping, user)
for index, value in enumerate(self.users): for index, value in enumerate(self.users):
username_title = ( username_title = (
value.username.lower() value.username.lower() if value.username else value.title.lower()
if value.username )
else value.title.lower()
if user.lower() == username_title:
user = self.users[index]
break
elif user_other and user_other.lower() == username_title:
user = self.users[index]
break
if self.admin_user == user:
user_plex = self.plex
else:
if isinstance(user, str):
logger.debug(
f"Plex: {user} is not a plex object, attempting to get object for user",
) )
user = self.plex.myPlexAccount().user(user)
if user.lower() == username_title: if not isinstance(user, MyPlexUser):
user = self.users[index] logger.error(f"Plex: {user} failed to get PlexUser")
break
elif user_other and user_other.lower() == username_title:
user = self.users[index]
break
if self.admin_user == user:
user_plex = self.plex
else:
if isinstance(user, str):
logger.debug(
f"Plex: {user} is not a plex object, attempting to get object for user",
)
user = self.plex.myPlexAccount().user(user)
if not isinstance(user, MyPlexUser):
logger.error(f"Plex: {user} failed to get PlexUser")
continue
token = user.get_token(self.plex.machineIdentifier)
if token:
user_plex = PlexServer(
self.base_url,
token,
session=self.session,
)
else:
logger.error(
f"Plex: Failed to get token for {user.title}, skipping",
)
continue
if not user_plex:
logger.error(f"Plex: {user} Failed to get PlexServer")
continue continue
for library_name in user_data.libraries: token = user.get_token(self.plex.machineIdentifier)
library_data = user_data.libraries[library_name] if token:
library_other = None user_plex = PlexServer(
if library_mapping: self.base_url,
library_other = search_mapping(library_mapping, library_name) token,
# if library in plex library list session=self.session,
library_list = user_plex.library.sections() )
if library_name.lower() not in [ else:
x.title.lower() for x in library_list logger.error(
]: f"Plex: Failed to get token for {user.title}, skipping",
if library_other: )
if library_other.lower() in [ continue
x.title.lower() for x in library_list
]: if not user_plex:
logger.info( logger.error(f"Plex: {user} Failed to get PlexServer")
f"Plex: Library {library_name} not found, but {library_other} found, using {library_other}", continue
)
library_name = library_other for library_name in user_data.libraries:
else: library_data = user_data.libraries[library_name]
logger.info( library_other = None
f"Plex: Library {library_name} or {library_other} not found in library list", if library_mapping:
) library_other = search_mapping(library_mapping, library_name)
continue # if library in plex library list
library_list = user_plex.library.sections()
if library_name.lower() not in [x.title.lower() for x in library_list]:
if library_other:
if library_other.lower() in [
x.title.lower() for x in library_list
]:
logger.info(
f"Plex: Library {library_name} not found, but {library_other} found, using {library_other}",
)
library_name = library_other
else: else:
logger.info( logger.info(
f"Plex: Library {library_name} not found in library list", f"Plex: Library {library_name} or {library_other} not found in library list",
) )
continue continue
else:
logger.info(
f"Plex: Library {library_name} not found in library list",
)
continue
try:
update_user_watched( update_user_watched(
user, user,
user_plex, user_plex,
@ -519,7 +532,8 @@ class Plex:
library_name, library_name,
dryrun, dryrun,
) )
except Exception as e:
except Exception as e: logger.error(
logger.error(f"Plex: Failed to update watched, Error: {e}") f"Plex: Failed to update watched for {user.title} in {library_name}, Error: {e}",
raise Exception(e) )
continue