d_mcknight/Varken
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enhance platform overrides

Browse source
This commit is contained in:
samwiseg0 2019-09-20 13:13:16 -04:00
parent 1dd6e494cc
commit e4bcc0d903
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
varken/tautulli.py
View file

@ -114,10 +114,18 @@ class TautulliAPI(object):
elif player_state == 'buffering': elif player_state == 'buffering':
player_state = 3 player_state = 3
# Platform Version Overrides
product_version = session.product_version product_version = session.product_version
if session.platform == 'Roku': if session.platform in ('Roku', 'osx', 'windows'):
product_version = session.product_version.split('-')[0] product_version = session.product_version.split('-')[0]
# Platform Overrides
platform_name = session.platform
if platform_name in 'osx':
platform_name = 'Plex Mac OS'
if platform_name in 'windows':
platform_name = 'Plex Windows'
hash_id = hashit(f'{session.session_id}{session.session_key}{session.username}{session.full_title}') hash_id = hashit(f'{session.session_id}{session.session_key}{session.username}{session.full_title}')
influx_payload.append( influx_payload.append(
{ {
@ -128,7 +136,7 @@ class TautulliAPI(object):
"friendly_name": session.friendly_name, "friendly_name": session.friendly_name,
"username": session.username, "username": session.username,
"title": session.full_title, "title": session.full_title,
"platform": session.platform, "platform": platform_name,
"product_version": product_version, "product_version": product_version,
"quality": quality, "quality": quality,
"video_decision": video_decision.title(), "video_decision": video_decision.title(),
@ -147,7 +155,7 @@ class TautulliAPI(object):
"latitude": latitude, "latitude": latitude,
"longitude": longitude, "longitude": longitude,
"player_state": player_state, "player_state": player_state,
"device_type": session.platform, "device_type": platform_name,
"relayed": session.relayed, "relayed": session.relayed,
"secure": session.secure, "secure": session.secure,
"server": self.server.id "server": self.server.id
@ -300,9 +308,23 @@ class TautulliAPI(object):
quality = session.container.upper() quality = session.container.upper()
elif quality in ('SD', 'sd', '4k'): elif quality in ('SD', 'sd', '4k'):
quality = session.stream_video_resolution.upper() quality = session.stream_video_resolution.upper()
elif session.stream_video_full_resolution:
quality = session.stream_video_full_resolution
else: else:
quality = session.stream_video_resolution + 'p' quality = session.stream_video_resolution + 'p'
# Platform Version Overrides
product_version = session.product_version
if session.platform in ('Roku', 'osx', 'windows'):
product_version = session.product_version.split('-')[0]
# Platform Overrides
platform_name = session.platform
if platform_name in 'osx':
platform_name = 'Plex Mac OS'
if platform_name in 'windows':
platform_name = 'Plex Windows'
player_state = 100 player_state = 100
hash_id = hashit(f'{session.id}{session.session_key}{session.user}{session.full_title}') hash_id = hashit(f'{session.id}{session.session_key}{session.user}{session.full_title}')
@ -315,7 +337,7 @@ class TautulliAPI(object):
"friendly_name": session.friendly_name, "friendly_name": session.friendly_name,
"username": session.user, "username": session.user,
"title": session.full_title, "title": session.full_title,
"platform": session.platform, "platform": platform_name,
"quality": quality, "quality": quality,
"video_decision": video_decision.title(), "video_decision": video_decision.title(),
"transcode_decision": decision.title(), "transcode_decision": decision.title(),
@ -332,7 +354,7 @@ class TautulliAPI(object):
"latitude": latitude, "latitude": latitude,
"longitude": longitude, "longitude": longitude,
"player_state": player_state, "player_state": player_state,
"device_type": session.platform, "device_type": platform_name,
"relayed": session.relayed, "relayed": session.relayed,
"secure": session.secure, "secure": session.secure,
"server": self.server.id "server": self.server.id