Mirrors/python-plexapi
2
0
Fork 0
mirror of https://github.com/pkkid/python-plexapi synced 2024-09-20 22:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move libtype to validate functions

Browse source
This commit is contained in:
JonnyWong16 2021-03-11 17:43:16 -08:00
parent 2c8c5277b5
commit 86072c2cfb
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plexapi/library.py
View file

@ -743,7 +743,7 @@ class LibrarySection(PlexObject):
if not match:
raise BadRequest('Invalid filter field: %s' % field)
_libtype, field, operator = match.groups()
libtype = _libtype or libtype
libtype = _libtype or libtype or self.TYPE
try:
filterField = next(f for f in self.listFields(libtype) if f.key.endswith(field))
@ -831,10 +831,11 @@ class LibrarySection(PlexObject):
""" Validates a filter sort field is available for the library.
Returns the validated sort field.
"""
match = re.match(r'([a-zA-Z\.]+):?([a-zA-Z]*)', sort)
match = re.match(r'(?:([a-zA-Z]*)\.)?([a-zA-Z]+):?([a-zA-Z]*)', sort)
if not match:
raise BadRequest('Invalid filter sort: %s' % sort)
sortField, sortDir = match.groups()
_libtype, sortField, sortDir = match.groups()
libtype = _libtype or libtype or self.TYPE
try:
filterSort = next(f for f in self.listSorts(libtype) if f.key.endswith(sortField))
@ -895,7 +896,6 @@ class LibrarySection(PlexObject):
:exc:`~plexapi.exceptions.BadRequest`: When the sort or filter is invalid.
:exc:`~plexapi.exceptions.NotFound`: When applying an unknown sort or filter.
"""
libtype = libtype or self.TYPE
# cleanup the core arguments
args = {}
filter_args = []