github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-14 10:36:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	plexpy/version.py
This commit is contained in:
JonnyWong16 2020-05-02 14:05:41 -07:00
commit 95bdc000ca
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/datafactory.py
View file

@ -882,7 +882,7 @@ class DataFactory(object):
'custom_thumb_url AS custom_thumb, art AS library_art, custom_art_url AS custom_art, ' \
'count, parent_count, child_count ' \
'FROM library_sections ' \
'WHERE section_id IN (%s) ' \
'WHERE section_id IN (%s) AND deleted_section = 0 ' \
'ORDER BY section_type, count DESC, parent_count DESC, child_count DESC ' % ','.join(library_cards)
result = monitor_db.select(query)
except Exception as e:

2
plexpy/version.py
View file

@ -18,4 +18,4 @@
from __future__ import unicode_literals
PLEXPY_BRANCH = "python3"
PLEXPY_RELEASE_VERSION = "v2.2.3-beta"
PLEXPY_RELEASE_VERSION = "v2.2.3"