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

Merge pull request #96 from luigi311/dev 

Jellyfin: Remove isPlayed, Use get for name
pull/109/head
Luigi311 2023-08-16 19:16:35 -06:00 committed by GitHub
parent 971c9e9147 8fab4304a4
commit 237e82eceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/jellyfin.py
View File

@ -14,12 +14,12 @@ from src.watched import (
def get_movie_guids(movie): def get_movie_guids(movie):
if "ProviderIds" in movie: if "ProviderIds" in movie:
logger( logger(
f"Jellyfin: {movie['Name']} {movie['ProviderIds']} {movie['MediaSources']}", f"Jellyfin: {movie.get('Name')} {movie['ProviderIds']} {movie['MediaSources']}",
3, 3,
) )
else: else:
logger( logger(
f"Jellyfin: {movie['Name']} {movie['MediaSources']['Path']}", f"Jellyfin: {movie.get('Name')} {movie['MediaSources']['Path']}",
3, 3,
) )
@ -177,7 +177,7 @@ class Jellyfin:
for movie in watched["Items"]: for movie in watched["Items"]:
if "MediaSources" in movie and movie["MediaSources"] != {}: if "MediaSources" in movie and movie["MediaSources"] != {}:
logger( logger(
f"Jellyfin: Adding {movie['Name']} to {user_name} watched list", f"Jellyfin: Adding {movie.get('Name')} to {user_name} watched list",
3, 3,
) )
@ -198,7 +198,7 @@ class Jellyfin:
continue continue
logger( logger(
f"Jellyfin: Adding {movie['Name']} to {user_name} watched list", f"Jellyfin: Adding {movie.get('Name')} to {user_name} watched list",
3, 3,
) )
@ -236,7 +236,7 @@ class Jellyfin:
seasons_tasks = [] seasons_tasks = []
for show in watched_shows_filtered: for show in watched_shows_filtered:
logger( logger(
f"Jellyfin: Adding {show['Name']} to {user_name} watched list", f"Jellyfin: Adding {show.get('Name')} to {user_name} watched list",
3, 3,
) )
show_guids = { show_guids = {
@ -604,7 +604,7 @@ class Jellyfin:
if movie_status: if movie_status:
jellyfin_video_id = jellyfin_video["Id"] jellyfin_video_id = jellyfin_video["Id"]
if movie_status["completed"]: 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: if not dryrun:
logger(f"Marking {msg}", 0) logger(f"Marking {msg}", 0)
await self.query( await self.query(
@ -616,7 +616,7 @@ class Jellyfin:
logger(f"Dryrun {msg}", 0) logger(f"Dryrun {msg}", 0)
else: else:
# TODO add support for partially watched movies # 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"
if not dryrun: if not dryrun:
pass pass
# logger(f"Marked {msg}", 0) # logger(f"Marked {msg}", 0)
@ -625,7 +625,7 @@ class Jellyfin:
# logger(f"Dryrun {msg}", 0) # logger(f"Dryrun {msg}", 0)
else: else:
logger( 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, 1,
) )
@ -634,7 +634,7 @@ class Jellyfin:
jellyfin_search = await self.query( jellyfin_search = await self.query(
f"/Users/{user_id}/Items" f"/Users/{user_id}/Items"
+ f"?SortBy=SortName&SortOrder=Ascending&Recursive=True&ParentId={library_id}" + 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", "get",
session, session,
) )
@ -691,7 +691,7 @@ class Jellyfin:
if show_found: if show_found:
logger( 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, 1,
) )
jellyfin_show_id = jellyfin_show["Id"] jellyfin_show_id = jellyfin_show["Id"]
@ -771,7 +771,7 @@ class Jellyfin:
jellyfin_episode_id = jellyfin_episode["Id"] jellyfin_episode_id = jellyfin_episode["Id"]
if episode_status["completed"]: if episode_status["completed"]:
msg = ( 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" + f" as watched for {user_name} in {library} for Jellyfin"
) )
if not dryrun: if not dryrun:
@ -786,7 +786,7 @@ class Jellyfin:
else: else:
# TODO add support for partially watched episodes # TODO add support for partially watched episodes
msg = ( 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" + f" as partially watched for {floor(episode_status['time'] / 60_000)} minutes for {user_name} in {library} for Jellyfin"
) )
if not dryrun: if not dryrun:
@ -797,12 +797,12 @@ class Jellyfin:
# logger(f"Dryrun {msg}", 0) # logger(f"Dryrun {msg}", 0)
else: else:
logger( 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, 3,
) )
else: else:
logger( 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, 3,
) )