diff --git a/src/functions.py b/src/functions.py index 588d5e1..94169b2 100644 --- a/src/functions.py +++ b/src/functions.py @@ -23,6 +23,10 @@ def logger(message: str, log_type=0): output = f"[DEBUG]: {output}" elif log_type == 4: output = f"[WARNING]: {output}" + elif log_type == 5: + output = f"[MARK]: {output}" + elif log_type == 6: + output = f"[DRYRUN]: {output}" else: output = None diff --git a/src/jellyfin.py b/src/jellyfin.py index c3f26a9..7d750f9 100644 --- a/src/jellyfin.py +++ b/src/jellyfin.py @@ -637,16 +637,16 @@ class Jellyfin: if movie_status: jellyfin_video_id = jellyfin_video["Id"] if movie_status["completed"]: - msg = f"{jellyfin_video.get('Name')} as watched for {user_name} in {library} for Jellyfin" + msg = f"Jellyfin: {jellyfin_video.get('Name')} as watched for {user_name} in {library}" if not dryrun: - logger(f"Marking {msg}", 0) + logger(msg, 5) await self.query( f"/Users/{user_id}/PlayedItems/{jellyfin_video_id}", "post", session, ) else: - logger(f"Dryrun {msg}", 0) + logger(msg, 6) log_marked( user_name, @@ -655,20 +655,21 @@ class Jellyfin: ) else: # TODO add support for partially watched movies - msg = f"{jellyfin_video.get('Name')} as partially watched for {floor(movie_status['time'] / 60_000)} minutes for {user_name} in {library} for Jellyfin" + msg = f"Jellyfin: {jellyfin_video.get('Name')} as partially watched for {floor(movie_status['time'] / 60_000)} minutes for {user_name} in {library}" + """ if not dryrun: pass - # logger(f"Marked {msg}", 0) + # logger(msg, 5) else: pass - # logger(f"Dryrun {msg}", 0) + # logger(msg, 6) log_marked( user_name, library, jellyfin_video.get("Name"), duration=floor(movie_status["time"] / 60_000), - ) + )""" else: logger( f"Jellyfin: Skipping movie {jellyfin_video.get('Name')} as it is not in mark list for {user_name}", @@ -817,18 +818,18 @@ class Jellyfin: 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.get('Name')}" - + f" as watched for {user_name} in {library} for Jellyfin" + f"Jellyfin: {jellyfin_episode['SeriesName']} {jellyfin_episode['SeasonName']} Episode {jellyfin_episode.get('IndexNumber')} {jellyfin_episode.get('Name')}" + + f" as watched for {user_name} in {library}" ) if not dryrun: - logger(f"Marked {msg}", 0) + logger(msg, 5) await self.query( f"/Users/{user_id}/PlayedItems/{jellyfin_episode_id}", "post", session, ) else: - logger(f"Dryrun {msg}", 0) + logger(msg, 6) log_marked( user_name, @@ -839,8 +840,8 @@ class Jellyfin: else: # TODO add support for partially watched episodes msg = ( - 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"Jellyfin: {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}" ) """ if not dryrun: diff --git a/src/plex.py b/src/plex.py index c9cc9ae..87b2b3a 100644 --- a/src/plex.py +++ b/src/plex.py @@ -296,21 +296,21 @@ def update_user_watched(user, user_plex, library, videos, dryrun): ) if video_status: if video_status["completed"]: - msg = f"{movies_search.title} as watched for {user.title} in {library} for Plex" + msg = f"Plex: {movies_search.title} as watched for {user.title} in {library}" if not dryrun: - logger(f"Marked {msg}", 0) + logger(msg, 5) movies_search.markWatched() else: - logger(f"Dryrun {msg}", 0) + logger(msg, 6) log_marked(user.title, library, movies_search.title, None, None) elif video_status["time"] > 60_000: - msg = f"{movies_search.title} as partially watched for {floor(video_status['time'] / 60_000)} minutes for {user.title} in {library} for Plex" + msg = f"Plex: {movies_search.title} as partially watched for {floor(video_status['time'] / 60_000)} minutes for {user.title} in {library}" if not dryrun: - logger(f"Marked {msg}", 0) + logger(msg, 5) movies_search.updateProgress(video_status["time"]) else: - logger(f"Dryrun {msg}", 0) + logger(msg, 6) log_marked( user.title, @@ -336,12 +336,12 @@ def update_user_watched(user, user_plex, library, videos, dryrun): ) if video_status: if video_status["completed"]: - msg = f"{show_search.title} {episode_search.title} as watched for {user.title} in {library} for Plex" + msg = f"Plex: {show_search.title} {episode_search.title} as watched for {user.title} in {library}" if not dryrun: - logger(f"Marked {msg}", 0) + logger(msg, 5) episode_search.markWatched() else: - logger(f"Dryrun {msg}", 0) + logger(msg, 6) log_marked( user.title, @@ -350,12 +350,12 @@ def update_user_watched(user, user_plex, library, videos, dryrun): episode_search.title, ) else: - msg = f"{show_search.title} {episode_search.title} as partially watched for {floor(video_status['time'] / 60_000)} minutes for {user.title} in {library} for Plex" + msg = f"Plex: {show_search.title} {episode_search.title} as partially watched for {floor(video_status['time'] / 60_000)} minutes for {user.title} in {library}" if not dryrun: - logger(f"Marked {msg}", 0) + logger(msg, 5) episode_search.updateProgress(video_status["time"]) else: - logger(f"Dryrun {msg}", 0) + logger(msg, 6) log_marked( user.title,