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

No need to sanitize same items more than once.

Browse source
This commit is contained in:
Tim 2015-12-06 18:45:02 +02:00
parent 37b92f3d88
commit 560acf62fe
3 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plexpy/datafactory.py
View file

@ -108,9 +108,6 @@ 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"])
# Sanitize player name
player = helpers.sanitize(item["player"])
row = {"reference_id": item["reference_id"], row = {"reference_id": item["reference_id"],
"id": item["id"], "id": item["id"],
"date": item["date"], "date": item["date"],
@ -122,7 +119,7 @@ class DataFactory(object):
"user": item["user"], "user": item["user"],
"friendly_name": item["friendly_name"], "friendly_name": item["friendly_name"],
"platform": platform, "platform": platform,
"player": player, "player": item['player'],
"ip_address": item["ip_address"], "ip_address": item["ip_address"],
"media_type": item["media_type"], "media_type": item["media_type"],
"rating_key": item["rating_key"], "rating_key": item["rating_key"],
@ -575,9 +572,6 @@ class DataFactory(object):
else: else:
thumb = item['grandparent_thumb'] thumb = item['grandparent_thumb']
# Sanitize player name
player = helpers.sanitize(item["player"])
row = {'row_id': item['id'], row = {'row_id': item['id'],
'user': item['user'], 'user': item['user'],
'friendly_name': item['friendly_name'], 'friendly_name': item['friendly_name'],
@ -588,7 +582,7 @@ class DataFactory(object):
'thumb': thumb, 'thumb': thumb,
'grandparent_thumb': item['grandparent_thumb'], 'grandparent_thumb': item['grandparent_thumb'],
'last_watch': item['last_watch'], 'last_watch': item['last_watch'],
'player': player, 'player': item['player']
} }
last_watched.append(row) last_watched.append(row)

10
plexpy/users.py
View file

@ -89,16 +89,13 @@ class Users(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"])
# Sanitize player name
player = helpers.sanitize(item["player"])
row = {"id": item['id'], row = {"id": item['id'],
"plays": item['plays'], "plays": item['plays'],
"last_seen": item['last_seen'], "last_seen": item['last_seen'],
"friendly_name": item['friendly_name'], "friendly_name": item['friendly_name'],
"ip_address": item['ip_address'], "ip_address": item['ip_address'],
"platform": platform, "platform": platform,
"player": player, "player": item["player"],
"last_watched": item['last_watched'], "last_watched": item['last_watched'],
"thumb": thumb, "thumb": thumb,
"media_type": item['media_type'], "media_type": item['media_type'],
@ -183,15 +180,12 @@ class Users(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"])
# Sanitize player name
player = helpers.sanitize(item["player"])
row = {"id": item['id'], row = {"id": item['id'],
"last_seen": item['last_seen'], "last_seen": item['last_seen'],
"ip_address": item['ip_address'], "ip_address": item['ip_address'],
"play_count": item['play_count'], "play_count": item['play_count'],
"platform": platform, "platform": platform,
"player": player, "player": item['player'],
"last_watched": item['last_watched'], "last_watched": item['last_watched'],
"thumb": thumb, "thumb": thumb,
"media_type": item['media_type'], "media_type": item['media_type'],

2
plexpy/webserve.py
View file

@ -735,8 +735,6 @@ class WebInterface(object):
if not session['ip_address']: if not session['ip_address']:
ip_address = data_factory.get_session_ip(session['session_key']) ip_address = data_factory.get_session_ip(session['session_key'])
session['ip_address'] = ip_address session['ip_address'] = ip_address
# Sanitize player name
session['player'] = helpers.sanitize(session['player'])
except: except:
return serve_template(templatename="current_activity.html", data=None) return serve_template(templatename="current_activity.html", data=None)