Skip to content

Commit

Permalink
Jellyfin: Remove isPlayed, Use get for name
Browse files Browse the repository at this point in the history 
Signed-off-by: Luigi311 <[email protected]>
  • Loading branch information
@luigi311
luigi311 committed Aug 17, 2023
1 parent 19f77c8 commit 8fab430
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions src/jellyfin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
def get_movie_guids(movie):
if "ProviderIds" in movie:
logger(
f"Jellyfin: {movie['Name']} {movie['ProviderIds']} {movie['MediaSources']}",
f"Jellyfin: {movie.get('Name')} {movie['ProviderIds']} {movie['MediaSources']}",
3,
)
else:
logger(
f"Jellyfin: {movie['Name']} {movie['MediaSources']['Path']}",
f"Jellyfin: {movie.get('Name')} {movie['MediaSources']['Path']}",
3,
)

Expand Down Expand Up @@ -177,7 +177,7 @@ async def get_user_library_watched(
for movie in watched["Items"]:
if "MediaSources" in movie and movie["MediaSources"] != {}:
logger(
f"Jellyfin: Adding {movie['Name']} to {user_name} watched list",
f"Jellyfin: Adding {movie.get('Name')} to {user_name} watched list",
3,
)

Expand All @@ -198,7 +198,7 @@ async def get_user_library_watched(
continue

logger(
f"Jellyfin: Adding {movie['Name']} to {user_name} watched list",
f"Jellyfin: Adding {movie.get('Name')} to {user_name} watched list",
3,
)

Expand Down Expand Up @@ -236,7 +236,7 @@ async def get_user_library_watched(
seasons_tasks = []
for show in watched_shows_filtered:
logger(
f"Jellyfin: Adding {show['Name']} to {user_name} watched list",
f"Jellyfin: Adding {show.get('Name')} to {user_name} watched list",
3,
)
show_guids = {
Expand Down Expand Up @@ -604,7 +604,7 @@ async def update_user_watched(
if movie_status:
jellyfin_video_id = jellyfin_video["Id"]
if movie_status["completed"]:
msg = f"{jellyfin_video['Name']} as watched for {user_name} in {library} for Jellyfin"
msg = f"{jellyfin_video.get('Name')} as watched for {user_name} in {library} for Jellyfin"
if not dryrun:
logger(f"Marking {msg}", 0)
await self.query(
Expand All @@ -616,7 +616,7 @@ async def update_user_watched(
logger(f"Dryrun {msg}", 0)
else:
# TODO add support for partially watched movies
msg = f"{jellyfin_video['Name']} as partially watched for {floor(movie_status['time'] / 60_000)} minutes for {user_name} in {library} for Jellyfin"
msg = f"{jellyfin_video.get('Name')} as partially watched for {floor(movie_status['time'] / 60_000)} minutes for {user_name} in {library} for Jellyfin"

Check warning

Code scanning / CodeQL

Variable defined multiple times Warning

This assignment to 'msg' is unnecessary as it is
redefined
Loading
before this value is used.
if not dryrun:
pass
# logger(f"Marked {msg}", 0)
Expand All @@ -625,7 +625,7 @@ async def update_user_watched(
# logger(f"Dryrun {msg}", 0)
else:
logger(
f"Jellyfin: Skipping movie {jellyfin_video['Name']} as it is not in mark list for {user_name}",
f"Jellyfin: Skipping movie {jellyfin_video.get('Name')} as it is not in mark list for {user_name}",
1,
)

Expand All @@ -634,7 +634,7 @@ async def update_user_watched(
jellyfin_search = await self.query(
f"/Users/{user_id}/Items"
+ f"?SortBy=SortName&SortOrder=Ascending&Recursive=True&ParentId={library_id}"
+ "&isPlayed=false&Fields=ItemCounts,ProviderIds,Path&IncludeItemTypes=Series",
+ "&Fields=ItemCounts,ProviderIds,Path&IncludeItemTypes=Series",
"get",
session,
)
Expand Down Expand Up @@ -691,7 +691,7 @@ async def update_user_watched(

if show_found:
logger(
f"Jellyfin: Updating watched for {user_name} in library {library} for show {jellyfin_show['Name']}",
f"Jellyfin: Updating watched for {user_name} in library {library} for show {jellyfin_show.get('Name')}",
1,
)
jellyfin_show_id = jellyfin_show["Id"]
Expand Down Expand Up @@ -771,7 +771,7 @@ async def update_user_watched(
jellyfin_episode_id = jellyfin_episode["Id"]
if episode_status["completed"]:
msg = (
f"{jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode['Name']}"
f"{jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}"
+ f" as watched for {user_name} in {library} for Jellyfin"
)
if not dryrun:
Expand All @@ -786,7 +786,7 @@ async def update_user_watched(
else:
# TODO add support for partially watched episodes
msg = (
f"{jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode['Name']}"
f"{jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}"
+ f" as partially watched for {floor(episode_status['time'] / 60_000)} minutes for {user_name} in {library} for Jellyfin"
)
if not dryrun:
Expand All @@ -797,12 +797,12 @@ async def update_user_watched(
# logger(f"Dryrun {msg}", 0)
else:
logger(
f"Jellyfin: Skipping episode {jellyfin_episode['Name']} as it is not in mark list for {user_name}",
f"Jellyfin: Skipping episode {jellyfin_episode.get('Name')} as it is not in mark list for {user_name}",
3,
)
else:
logger(
f"Jellyfin: Skipping show {jellyfin_show['Name']} as it is not in mark list for {user_name}",
f"Jellyfin: Skipping show {jellyfin_show.get('Name')} as it is not in mark list for {user_name}",
3,
)

Expand Down

0 comments on commit 8fab430

Please sign in to comment.