github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add user_thumb to get_history response

Browse source
This commit is contained in:
JonnyWong16 2022-11-05 20:03:48 +00:00 • committed by GitHub
parent 571bbb2db1
commit 5975b59c93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
plexpy/datafactory.py
View file

@ -34,6 +34,7 @@ if plexpy.PYTHON2:
import logger import logger
import pmsconnect import pmsconnect
import session import session
import users
else: else:
from plexpy import libraries from plexpy import libraries
from plexpy import common from plexpy import common
@ -43,6 +44,7 @@ else:
from plexpy import logger from plexpy import logger
from plexpy import pmsconnect from plexpy import pmsconnect
from plexpy import session from plexpy import session
from plexpy import users
# Temporarily store update_metadata row ids in memory to prevent rating_key collisions # Temporarily store update_metadata row ids in memory to prevent rating_key collisions
_UPDATE_METADATA_IDS = { _UPDATE_METADATA_IDS = {
@ -103,6 +105,8 @@ class DataFactory(object):
'session_history.user', 'session_history.user',
'(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \ '(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \
THEN users.username ELSE users.friendly_name END) AS friendly_name', THEN users.username ELSE users.friendly_name END) AS friendly_name',
'users.thumb AS user_thumb',
'users.custom_avatar_url AS custom_thumb',
'platform', 'platform',
'product', 'product',
'player', 'player',
@ -161,6 +165,8 @@ class DataFactory(object):
'user', 'user',
'(CASE WHEN friendly_name IS NULL OR TRIM(friendly_name) = "" \ '(CASE WHEN friendly_name IS NULL OR TRIM(friendly_name) = "" \
THEN user ELSE friendly_name END) AS friendly_name', THEN user ELSE friendly_name END) AS friendly_name',
'NULL AS user_thumb',
'NULL AS custom_thumb',
'platform', 'platform',
'product', 'product',
'player', 'player',
@ -244,7 +250,18 @@ class DataFactory(object):
} }
rows = [] rows = []
users_lookup = {}
for item in history: for item in history:
if item['state']:
# Get user thumb from database for current activity
if not users_lookup:
# Cache user lookup
users_lookup = {u['user_id']: u['thumb'] for u in users.Users().get_users()}
item['user_thumb'] = users_lookup.get(item['user_id'])
filter_duration += int(item['duration']) filter_duration += int(item['duration'])
if item['media_type'] == 'episode' and item['parent_thumb']: if item['media_type'] == 'episode' and item['parent_thumb']:
@ -267,6 +284,13 @@ class DataFactory(object):
# Rename Mystery platform names # Rename Mystery platform names
platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']) platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']:
user_thumb = item['custom_thumb']
elif item['user_thumb']:
user_thumb = item['user_thumb']
else:
user_thumb = common.DEFAULT_USER_THUMB
row = {'reference_id': item['reference_id'], row = {'reference_id': item['reference_id'],
'row_id': item['row_id'], 'row_id': item['row_id'],
'id': item['row_id'], 'id': item['row_id'],
@ -278,6 +302,7 @@ class DataFactory(object):
'user_id': item['user_id'], 'user_id': item['user_id'],
'user': item['user'], 'user': item['user'],
'friendly_name': item['friendly_name'], 'friendly_name': item['friendly_name'],
'user_thumb': user_thumb,
'platform': platform, 'platform': platform,
'product': item['product'], 'product': item['product'],
'player': item['player'], 'player': item['player'],