Plex: Cleanup username_title
parent
ffc81dad69
commit
9f61c7338d
12
src/plex.py
12
src/plex.py
|
|
@ -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] = {}
|
||||
|
||||
|
|
@ -511,9 +509,11 @@ class Plex:
|
|||
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]
|
||||
|
|
|
|||
|
|
@ -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()]
|
||||
|
|
@ -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 (
|
||||
|
|
|
|||
Loading…
Reference in New Issue