Skip to content

Fix for accessing Account of non Plex Pass account #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2021
Merged

Fix for accessing Account of non Plex Pass account #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7678e0c
add iter on a specific root tag in listAttrs
blacktwin Jun 14, 2021
54ce61b
use rtag for roles and entitlements
blacktwin Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion plexapi/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,12 @@ def firstAttr(self, *attrs):
if value is not None:
return value

def listAttrs(self, data, attr, **kwargs):
def listAttrs(self, data, attr, rtag=None, **kwargs):
""" Return a list of values from matching attribute. """
results = []
# rtag to iter on a specific root tag
if rtag:
data = next(data.iter(rtag), [])
for elem in data:
kwargs['%s__exists' % attr] = True
if self._checkAttrs(elem, **kwargs):
Expand Down
6 changes: 2 additions & 4 deletions plexapi/myplex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,9 @@ def _loadData(self, data):
self.subscriptionPlan = subscription.attrib.get('plan')
self.subscriptionFeatures = self.listAttrs(subscription, 'id', etag='feature')

roles = data.find('roles')
self.roles = self.listAttrs(roles, 'id', etag='role')
self.roles = self.listAttrs(data, 'id', rtag='roles', etag='role')

entitlements = data.find('entitlements')
self.entitlements = self.listAttrs(entitlements, 'id', etag='entitlement')
self.entitlements = self.listAttrs(data, 'id', rtag='entitlements', etag='entitlement')

# TODO: Fetch missing MyPlexAccount attributes
self.profile_settings = None
Expand Down