Cleanup. Add debug variable
This commit is contained in:
@@ -5,11 +5,12 @@ load_dotenv(override=True)
|
||||
logfile = os.getenv("LOGFILE","log.log")
|
||||
|
||||
def logger(message, log_type=0):
|
||||
|
||||
debug = str_to_bool(os.getenv("DEBUG", "True"))
|
||||
|
||||
output = str(message)
|
||||
if log_type == 0:
|
||||
pass
|
||||
elif log_type == 1:
|
||||
elif log_type == 1 and debug:
|
||||
output = f"[INFO]: {output}"
|
||||
elif log_type == 2:
|
||||
output = f"[ERROR]: {output}"
|
||||
|
||||
@@ -130,18 +130,19 @@ class Jellyfin():
|
||||
|
||||
return users_watched
|
||||
|
||||
def update_watched(self, watched_list, user_mapping, dryrun=False):
|
||||
def update_watched(self, watched_list, user_mapping=None, dryrun=False):
|
||||
for user, libraries in watched_list.items():
|
||||
other = None
|
||||
if user in user_mapping.keys():
|
||||
other = user_mapping[user]
|
||||
if user_mapping:
|
||||
other = None
|
||||
|
||||
if user in user_mapping.keys():
|
||||
other = user_mapping[user]
|
||||
elif user in user_mapping.values():
|
||||
other = search_mapping(user_mapping, user)
|
||||
|
||||
elif user in user_mapping.values():
|
||||
other = search_mapping(user_mapping, user)
|
||||
|
||||
if other:
|
||||
logger(f"Swapping user {user} with {other}", 1)
|
||||
user = other
|
||||
if other:
|
||||
logger(f"Swapping user {user} with {other}", 1)
|
||||
user = other
|
||||
|
||||
user_id = None
|
||||
for key, value in self.users.items():
|
||||
@@ -175,7 +176,7 @@ class Jellyfin():
|
||||
for video in videos:
|
||||
for key, value in jellyfin_video["ProviderIds"].items():
|
||||
if key.lower() in video.keys() and value.lower() == video[key.lower()].lower():
|
||||
msg = f"{jellyfin_video['Name']} as watched for {user}"
|
||||
msg = f"{jellyfin_video['Name']} as watched for {user} in Jellyfin"
|
||||
if not dryrun:
|
||||
logger(f"Marking {msg}", 0)
|
||||
self.query(f"/Users/{user_id}/PlayedItems/{jellyfin_video_id}", "post")
|
||||
|
||||
24
src/plex.py
24
src/plex.py
@@ -119,25 +119,25 @@ class Plex:
|
||||
|
||||
return users_watched
|
||||
|
||||
def update_watched(self, watched_list, user_mapping, dryrun=False):
|
||||
def update_watched(self, watched_list, user_mapping=None, dryrun=False):
|
||||
for user, libraries in watched_list.items():
|
||||
other = None
|
||||
if user in user_mapping.keys():
|
||||
other = user_mapping[user]
|
||||
if user_mapping:
|
||||
other = None
|
||||
|
||||
if user in user_mapping.keys():
|
||||
other = user_mapping[user]
|
||||
elif user in user_mapping.values():
|
||||
other = search_mapping(user_mapping, user)
|
||||
|
||||
elif user in user_mapping.values():
|
||||
other = search_mapping(user_mapping, user)
|
||||
|
||||
if other:
|
||||
logger(f"Swapping user {user} with {other}", 1)
|
||||
user = other
|
||||
if other:
|
||||
logger(f"Swapping user {user} with {other}", 1)
|
||||
user = other
|
||||
|
||||
for index, value in enumerate(self.users):
|
||||
if user.lower() == value.title.lower():
|
||||
user = self.users[index]
|
||||
break
|
||||
|
||||
print(user)
|
||||
if self.admin_user == user:
|
||||
user_plex = self.plex
|
||||
else:
|
||||
@@ -156,7 +156,7 @@ class Plex:
|
||||
for video_keys, video_id in video.items():
|
||||
if video_keys == guid_source and video_id == guid_id:
|
||||
if movies_search.viewCount == 0:
|
||||
msg = f"{movies_search.title} watched"
|
||||
msg = f"{movies_search.title} as watched for {user.title} in Plex"
|
||||
if not dryrun:
|
||||
logger(f"Marked {msg}", 0)
|
||||
movies_search.markWatched()
|
||||
|
||||
Reference in New Issue
Block a user