Add MARK/DRYRUN logger levels
This commit is contained in:
@@ -23,6 +23,10 @@ def logger(message: str, log_type=0):
|
|||||||
output = f"[DEBUG]: {output}"
|
output = f"[DEBUG]: {output}"
|
||||||
elif log_type == 4:
|
elif log_type == 4:
|
||||||
output = f"[WARNING]: {output}"
|
output = f"[WARNING]: {output}"
|
||||||
|
elif log_type == 5:
|
||||||
|
output = f"[MARK]: {output}"
|
||||||
|
elif log_type == 6:
|
||||||
|
output = f"[DRYRUN]: {output}"
|
||||||
else:
|
else:
|
||||||
output = None
|
output = None
|
||||||
|
|
||||||
|
|||||||
@@ -637,16 +637,16 @@ 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.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:
|
if not dryrun:
|
||||||
logger(f"Marking {msg}", 0)
|
logger(msg, 5)
|
||||||
await self.query(
|
await self.query(
|
||||||
f"/Users/{user_id}/PlayedItems/{jellyfin_video_id}",
|
f"/Users/{user_id}/PlayedItems/{jellyfin_video_id}",
|
||||||
"post",
|
"post",
|
||||||
session,
|
session,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
logger(f"Dryrun {msg}", 0)
|
logger(msg, 6)
|
||||||
|
|
||||||
log_marked(
|
log_marked(
|
||||||
user_name,
|
user_name,
|
||||||
@@ -655,20 +655,21 @@ class Jellyfin:
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
# TODO add support for partially watched movies
|
# 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:
|
if not dryrun:
|
||||||
pass
|
pass
|
||||||
# logger(f"Marked {msg}", 0)
|
# logger(msg, 5)
|
||||||
else:
|
else:
|
||||||
pass
|
pass
|
||||||
# logger(f"Dryrun {msg}", 0)
|
# logger(msg, 6)
|
||||||
|
|
||||||
log_marked(
|
log_marked(
|
||||||
user_name,
|
user_name,
|
||||||
library,
|
library,
|
||||||
jellyfin_video.get("Name"),
|
jellyfin_video.get("Name"),
|
||||||
duration=floor(movie_status["time"] / 60_000),
|
duration=floor(movie_status["time"] / 60_000),
|
||||||
)
|
)"""
|
||||||
else:
|
else:
|
||||||
logger(
|
logger(
|
||||||
f"Jellyfin: Skipping movie {jellyfin_video.get('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}",
|
||||||
@@ -817,18 +818,18 @@ 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.get('Name')}"
|
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} for Jellyfin"
|
+ f" as watched for {user_name} in {library}"
|
||||||
)
|
)
|
||||||
if not dryrun:
|
if not dryrun:
|
||||||
logger(f"Marked {msg}", 0)
|
logger(msg, 5)
|
||||||
await self.query(
|
await self.query(
|
||||||
f"/Users/{user_id}/PlayedItems/{jellyfin_episode_id}",
|
f"/Users/{user_id}/PlayedItems/{jellyfin_episode_id}",
|
||||||
"post",
|
"post",
|
||||||
session,
|
session,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
logger(f"Dryrun {msg}", 0)
|
logger(msg, 6)
|
||||||
|
|
||||||
log_marked(
|
log_marked(
|
||||||
user_name,
|
user_name,
|
||||||
@@ -839,8 +840,8 @@ 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.get('Name')}"
|
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} for Jellyfin"
|
+ f" as partially watched for {floor(episode_status['time'] / 60_000)} minutes for {user_name} in {library}"
|
||||||
)
|
)
|
||||||
"""
|
"""
|
||||||
if not dryrun:
|
if not dryrun:
|
||||||
|
|||||||
24
src/plex.py
24
src/plex.py
@@ -296,21 +296,21 @@ def update_user_watched(user, user_plex, library, videos, dryrun):
|
|||||||
)
|
)
|
||||||
if video_status:
|
if video_status:
|
||||||
if video_status["completed"]:
|
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:
|
if not dryrun:
|
||||||
logger(f"Marked {msg}", 0)
|
logger(msg, 5)
|
||||||
movies_search.markWatched()
|
movies_search.markWatched()
|
||||||
else:
|
else:
|
||||||
logger(f"Dryrun {msg}", 0)
|
logger(msg, 6)
|
||||||
|
|
||||||
log_marked(user.title, library, movies_search.title, None, None)
|
log_marked(user.title, library, movies_search.title, None, None)
|
||||||
elif video_status["time"] > 60_000:
|
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:
|
if not dryrun:
|
||||||
logger(f"Marked {msg}", 0)
|
logger(msg, 5)
|
||||||
movies_search.updateProgress(video_status["time"])
|
movies_search.updateProgress(video_status["time"])
|
||||||
else:
|
else:
|
||||||
logger(f"Dryrun {msg}", 0)
|
logger(msg, 6)
|
||||||
|
|
||||||
log_marked(
|
log_marked(
|
||||||
user.title,
|
user.title,
|
||||||
@@ -336,12 +336,12 @@ def update_user_watched(user, user_plex, library, videos, dryrun):
|
|||||||
)
|
)
|
||||||
if video_status:
|
if video_status:
|
||||||
if video_status["completed"]:
|
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:
|
if not dryrun:
|
||||||
logger(f"Marked {msg}", 0)
|
logger(msg, 5)
|
||||||
episode_search.markWatched()
|
episode_search.markWatched()
|
||||||
else:
|
else:
|
||||||
logger(f"Dryrun {msg}", 0)
|
logger(msg, 6)
|
||||||
|
|
||||||
log_marked(
|
log_marked(
|
||||||
user.title,
|
user.title,
|
||||||
@@ -350,12 +350,12 @@ def update_user_watched(user, user_plex, library, videos, dryrun):
|
|||||||
episode_search.title,
|
episode_search.title,
|
||||||
)
|
)
|
||||||
else:
|
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:
|
if not dryrun:
|
||||||
logger(f"Marked {msg}", 0)
|
logger(msg, 5)
|
||||||
episode_search.updateProgress(video_status["time"])
|
episode_search.updateProgress(video_status["time"])
|
||||||
else:
|
else:
|
||||||
logger(f"Dryrun {msg}", 0)
|
logger(msg, 6)
|
||||||
|
|
||||||
log_marked(
|
log_marked(
|
||||||
user.title,
|
user.title,
|
||||||
|
|||||||
Reference in New Issue
Block a user