Skip to content

Commit

Permalink
Plex: Cleanup username_title
Browse files Browse the repository at this point in the history
  • Loading branch information
luigi311 committed May 17, 2023
1 parent ffc81da commit 9f61c73
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
12 changes: 6 additions & 6 deletions src/plex.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,7 @@ def get_user_library_watched_show(show):

def get_user_library_watched(user, user_plex, library):
try:
user_name = user.username.lower()
if user_name == "":
user_name = user.title.lower()
user_name = user.username.lower() if user.username else user.title.lower()
user_watched = {}
user_watched[user_name] = {}

Expand Down Expand Up @@ -511,9 +509,11 @@ def update_watched(
user_other = search_mapping(user_mapping, user)

for index, value in enumerate(self.users):
username_title = value.username.lower()
if username_title == "":
username_title = value.title.lower()
username_title = (
value.username.lower()
if value.username
else value.title.lower()
)

if user.lower() == username_title:
user = self.users[index]
Expand Down
9 changes: 4 additions & 5 deletions src/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ def generate_user_list(server):
server_users = []
if server_type == "plex":
for user in server_connection.users:
if user.username:
server_users.append(user.username.lower())
else:
server_users.append(user.title.lower())
server_users.append(
user.username.lower() if user.username else user.title.lower()
)

elif server_type == "jellyfin":
server_users = [key.lower() for key in server_connection.users.keys()]
Expand Down Expand Up @@ -72,7 +71,7 @@ def generate_server_users(server, users):
server_users = []
for plex_user in server[1].users:
username_title = (
plex_user.username if plex_user.username != "" else plex_user.title
plex_user.username if plex_user.username else plex_user.title
)

if (
Expand Down

0 comments on commit 9f61c73

Please sign in to comment.