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

fix sql query build

Browse source
This commit is contained in:
herby2212 2023-02-25 00:03:30 +01:00
commit 897326e8e0
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plexpy/datafactory.py
View file

@ -1156,17 +1156,16 @@ class DataFactory(object):
group_by = 'session_history.reference_id' if grouping else 'session_history.id' group_by = 'session_history.reference_id' if grouping else 'session_history.id'
_rating_keys = [] rating_keys = []
if media_type == 'collection': if media_type == 'collection':
pms_connect = pmsconnect.PmsConnect() pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_item_children(rating_key=rating_key) result = pms_connect.get_item_children(rating_key=rating_key)
for child in result['children_list']: for child in result['children_list']:
_rating_keys.append(child['rating_key']) rating_keys.append(child['rating_key'])
else: else:
_rating_keys.append(rating_key) rating_keys.append(rating_key)
rating_keys = ','.join(_rating_keys)
rating_keys_arg = ','.join(['?'] * len(rating_keys)) rating_keys_arg = ','.join(['?'] * len(rating_keys))
for days in query_days: for days in query_days:
@ -1180,13 +1179,14 @@ class DataFactory(object):
'COUNT(DISTINCT %s) AS total_plays, section_id ' \ 'COUNT(DISTINCT %s) AS total_plays, section_id ' \
'FROM session_history ' \ 'FROM session_history ' \
'JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ 'JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \
'WHERE stopped >= ? ' \ 'WHERE stopped >= %s ' \
'AND (session_history.grandparent_rating_key IN (%s) ' \ 'AND (session_history.grandparent_rating_key IN (%s) ' \
'OR session_history.parent_rating_key IN (%s) ' \ 'OR session_history.parent_rating_key IN (%s) ' \
'OR session_history.rating_key IN (%s))' % ( 'OR session_history.rating_key IN (%s))' % (
group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg group_by, timestamp_query, rating_keys_arg, rating_keys_arg, rating_keys_arg
) )
result = monitor_db.select(query, args=[timestamp_query, rating_keys, rating_keys, rating_keys])
result = monitor_db.select(query, args=rating_keys*3)
else: else:
result = [] result = []
else: else:
@ -1201,7 +1201,8 @@ class DataFactory(object):
'OR session_history.rating_key IN (%s))' % ( 'OR session_history.rating_key IN (%s))' % (
group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg
) )
result = monitor_db.select(query, args=[rating_keys, rating_keys, rating_keys])
result = monitor_db.select(query, args=rating_keys*3)
else: else:
result = [] result = []
except Exception as e: except Exception as e:
@ -1242,17 +1243,16 @@ class DataFactory(object):
group_by = 'session_history.reference_id' if grouping else 'session_history.id' group_by = 'session_history.reference_id' if grouping else 'session_history.id'
_rating_keys = [] rating_keys = []
if media_type == 'collection': if media_type == 'collection':
pms_connect = pmsconnect.PmsConnect() pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_item_children(rating_key=rating_key) result = pms_connect.get_item_children(rating_key=rating_key)
for child in result['children_list']: for child in result['children_list']:
_rating_keys.append(child['rating_key']) rating_keys.append(child['rating_key'])
else: else:
_rating_keys.append(rating_key) rating_keys.append(rating_key)
rating_keys = ','.join(_rating_keys)
rating_keys_arg = ','.join(['?'] * len(rating_keys)) rating_keys_arg = ','.join(['?'] * len(rating_keys))
try: try:
@ -1273,7 +1273,8 @@ class DataFactory(object):
'ORDER BY total_plays DESC, total_time DESC' % ( 'ORDER BY total_plays DESC, total_time DESC' % (
group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg
) )
result = monitor_db.select(query, args=[rating_keys, rating_keys, rating_keys])
result = monitor_db.select(query, args=rating_keys*3)
else: else:
result = [] result = []
except Exception as e: except Exception as e: