anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix filtering history using guid

Browse Source
This commit is contained in:
JonnyWong16
2020-02-20 12:10:51 -08:00
parent 31a6c627af
commit 10a7f540ad
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plexpy/datatables.py
View File

@@ -142,6 +142,9 @@ class DataTables(object):
for w_ in w[1]:
if w_ == None:
c_where += w[0] + ' IS NULL OR '
elif str(w_).startswith('LIKE '):
c_where += w[0] + ' LIKE ? OR '
args.append(w_[5:])
else:
c_where += w[0] + ' = ? OR '
args.append(w_)
@@ -149,6 +152,9 @@ class DataTables(object):
else:
if w[1] == None:
c_where += w[0] + ' IS NULL AND '
elif str(w[1]).startswith('LIKE '):
c_where += w[0] + ' LIKE ? AND '
args.append(w[1][5:])
else:
c_where += w[0] + ' = ? AND '
args.append(w[1])

4
plexpy/webserve.py
View File

@@ -1720,8 +1720,8 @@ class WebInterface(object):
year = kwargs.get('year', '')
custom_where.append(['session_history_metadata.year', year])
if 'guid' in kwargs:
guid = kwargs.get('guid', '').split('?')[0] + '%' # SQLite LIKE wildcard
custom_where.append(['session_history_metadata.guid', guid])
guid = kwargs.get('guid', '').split('?')[0]
custom_where.append(['session_history_metadata.guid', 'LIKE ' + guid + '%']) # SQLite LIKE wildcard
data_factory = datafactory.DataFactory()
history = data_factory.get_datatables_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping)