bel/JellyPlex-Watched
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54 from luigi311/dev

Browse Source 
Fix variable overwrites, Fix errors when plex user has no access
This commit is contained in:
Luigi311
2023-03-22 11:29:36 -06:00
committed by GitHub
parent fd64088bde 962b1149ad
commit c69d59858d
3 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@@ -18,6 +18,11 @@ ENV PLEX_SERVERNAME ''
ENV JELLYFIN_BASEURL '' ENV JELLYFIN_BASEURL ''
ENV JELLYFIN_TOKEN '' ENV JELLYFIN_TOKEN ''
ENV SYNC_FROM_PLEX_TO_JELLYFIN 'True'
ENV SYNC_FROM_JELLYFIN_TO_PLEX 'True'
ENV SYNC_FROM_PLEX_TO_PLEX 'True'
ENV SYNC_FROM_JELLYFIN_TO_JELLYFIN 'True'
ENV BLACKLIST_LIBRARY '' ENV BLACKLIST_LIBRARY ''
ENV WHITELIST_LIBRARY '' ENV WHITELIST_LIBRARY ''
ENV BLACKLIST_LIBRARY_TYPE '' ENV BLACKLIST_LIBRARY_TYPE ''

4
src/jellyfin.py
View File

@@ -460,8 +460,8 @@ class Jellyfin:
watched = await asyncio.gather(*watched, return_exceptions=True) watched = await asyncio.gather(*watched, return_exceptions=True)
for user_watched in watched: for user_watched in watched:
user_watched_temp = combine_watched_dicts(user_watched) user_watched_combine = combine_watched_dicts(user_watched)
for user, user_watched_temp in user_watched_temp.items(): for user, user_watched_temp in user_watched_combine.items():
if user not in users_watched: if user not in users_watched:
users_watched[user] = {} users_watched[user] = {}
users_watched[user].update(user_watched_temp) users_watched[user].update(user_watched_temp)

35
src/plex.py
View File

@@ -307,10 +307,19 @@ class Plex:
if self.admin_user == user: if self.admin_user == user:
user_plex = self.plex user_plex = self.plex
else: else:
user_plex = self.login( token = user.get_token(self.plex.machineIdentifier)
self.plex._baseurl, if token:
user.get_token(self.plex.machineIdentifier), user_plex = self.login(
) self.plex._baseurl,
token,
)
else:
logger(
f"Plex: Failed to get token for {user.title}, skipping",
2,
)
users_watched[user.title] = {}
continue
libraries = user_plex.library.sections() libraries = user_plex.library.sections()
@@ -380,11 +389,19 @@ class Plex:
) )
user = self.plex.myPlexAccount().user(user) user = self.plex.myPlexAccount().user(user)
user_plex = PlexServer( token = user.get_token(self.plex.machineIdentifier)
self.plex._baseurl, if token:
user.get_token(self.plex.machineIdentifier), user_plex = PlexServer(
session=self.session, self.plex._baseurl,
) token,
session=self.session,
)
else:
logger(
f"Plex: Failed to get token for {user.title}, skipping",
2,
)
continue
for library, videos in libraries.items(): for library, videos in libraries.items():
library_other = None library_other = None