Merge pull request #240 from luigi311/user_name
Plex: Use username for watch key if existspull/245/head v7.0.1
commit
991355716d
21
src/plex.py
21
src/plex.py
|
|
@ -281,7 +281,9 @@ class Plex:
|
||||||
output = {}
|
output = {}
|
||||||
|
|
||||||
libraries = self.plex.library.sections()
|
libraries = self.plex.library.sections()
|
||||||
logger.debug(f"Plex: All Libraries {[library.title for library in libraries]}")
|
logger.debug(
|
||||||
|
f"Plex: All Libraries {[library.title for library in libraries]}"
|
||||||
|
)
|
||||||
|
|
||||||
for library in libraries:
|
for library in libraries:
|
||||||
library_title = library.title
|
library_title = library.title
|
||||||
|
|
@ -300,8 +302,7 @@ class Plex:
|
||||||
logger.error(f"Plex: Failed to get libraries, Error: {e}")
|
logger.error(f"Plex: Failed to get libraries, Error: {e}")
|
||||||
raise Exception(e)
|
raise Exception(e)
|
||||||
|
|
||||||
def get_user_library_watched(self, user, user_plex, library) -> LibraryData:
|
def get_user_library_watched(self, user_name, user_plex, library) -> LibraryData:
|
||||||
user_name: str = user.username.lower() if user.username else user.title.lower()
|
|
||||||
try:
|
try:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Plex: Generating watched for {user_name} in library {library.title}",
|
f"Plex: Generating watched for {user_name} in library {library.title}",
|
||||||
|
|
@ -388,6 +389,10 @@ class Plex:
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
user_name: str = (
|
||||||
|
user.username.lower() if user.username else user.title.lower()
|
||||||
|
)
|
||||||
|
|
||||||
libraries = user_plex.library.sections()
|
libraries = user_plex.library.sections()
|
||||||
|
|
||||||
for library in libraries:
|
for library in libraries:
|
||||||
|
|
@ -395,15 +400,13 @@ class Plex:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
library_data = self.get_user_library_watched(
|
library_data = self.get_user_library_watched(
|
||||||
user, user_plex, library
|
user_name, user_plex, library
|
||||||
)
|
)
|
||||||
|
|
||||||
if user.title.lower() not in users_watched:
|
if user_name not in users_watched:
|
||||||
users_watched[user.title.lower()] = UserData()
|
users_watched[user_name] = UserData()
|
||||||
|
|
||||||
users_watched[user.title.lower()].libraries[library.title] = (
|
users_watched[user_name].libraries[library.title] = library_data
|
||||||
library_data
|
|
||||||
)
|
|
||||||
|
|
||||||
return users_watched
|
return users_watched
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue