diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index aca120cf..b7bfa25c 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -72,7 +72,7 @@ DOCUMENTATION :: END data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
- % if data['channel_stream'] == '0': + % if data['channel_stream'] == 0:
% else: % if (data['art'] and data['art'].startswith('http')) or (data['thumb'] and data['thumb'].startswith('http')): @@ -86,7 +86,7 @@ DOCUMENTATION :: END % if data['media_type'] == 'track':
% endif - % if data['channel_stream'] == '0': + % if data['channel_stream'] == 0: % if data['media_type'] == 'movie':
@@ -158,7 +158,7 @@ DOCUMENTATION :: END % endif
- % if data['optimized_version'] == '1': + % if data['optimized_version'] == 1:
  • Optimized
    @@ -177,7 +177,7 @@ DOCUMENTATION :: END
    % if data['transcode_decision'] == 'transcode': Transcode - % if data['transcode_throttled'] == '1': + % if data['transcode_throttled'] == 1: (Throttled) % else: (Speed: ${data['transcode_speed']}) @@ -185,7 +185,7 @@ DOCUMENTATION :: END % elif data['transcode_decision'] == 'copy': Direct Stream % else: - Direct Play ${'(Synced)' if data['synced_version'] == '1' else ''} + Direct Play ${'(Synced)' if data['synced_version'] == 1 else ''} % endif
    • @@ -207,9 +207,9 @@ DOCUMENTATION :: END % if data.get('stream_video_decision') == 'transcode': <% hw_d = hw_e = '' - if data['transcode_hw_requested'] == '1' and data['transcode_hw_full_pipeline'] == '0': + if data['transcode_hw_requested'] == 1 and data['transcode_hw_full_pipeline'] == 0: hw_d = ' (HW)' - elif data['transcode_hw_requested'] == '1' and data['transcode_hw_full_pipeline'] == '1': + elif data['transcode_hw_requested'] == 1 and data['transcode_hw_full_pipeline'] == 1: hw_d = hw_e = ' (HW)' %> Transcode (${data['video_codec'].upper()}${hw_d} ${plexpy.common.VIDEO_RESOLUTION_OVERRIDES.get(data['video_resolution'], data['video_resolution'])} → ${data['stream_video_codec'].upper()}${hw_e} ${plexpy.common.VIDEO_RESOLUTION_OVERRIDES.get(data['stream_video_resolution'], data['stream_video_resolution'])}) @@ -242,7 +242,7 @@ DOCUMENTATION :: END
  • Subtitle
    - % if data['subtitles'] == '1': + % if data['subtitles'] == 1: % if data['stream_subtitle_decision'] == 'transcode': Transcode (${data['subtitle_codec'].upper()} → ${data['stream_subtitle_codec'].upper()}) % elif data['stream_subtitle_decision'] == 'copy': @@ -264,7 +264,7 @@ DOCUMENTATION :: END
    Location
    % if data['ip_address'] != 'N/A': - ${'LAN' if data['local'] == '1' else 'WAN'}: ${data['ip_address']} + ${'LAN' if data['local'] == 1 else 'WAN'}: ${data['ip_address']} @@ -294,7 +294,7 @@ DOCUMENTATION :: END %> ${bw} - % elif data['synced_version'] == '1' or data['channel_stream'] == '1': + % elif data['synced_version'] == 1 or data['channel_stream'] == 1: None % else: Unknown @@ -358,7 +358,7 @@ DOCUMENTATION :: END % endif
    - % if data['channel_stream'] == '0': + % if data['channel_stream'] == 0: % if data['media_type'] == 'movie': ${data['title']} % elif data['media_type'] == 'episode': @@ -383,7 +383,7 @@ DOCUMENTATION :: END
    - % if data['channel_stream'] == '0': + % if data['channel_stream'] == 0:
    % if data['media_type'] == 'movie':   @@ -403,7 +403,7 @@ DOCUMENTATION :: END
    % endif
    - % if data['channel_stream'] == '0': + % if data['channel_stream'] == 0: % if data['media_type'] == 'movie': ${data['year']} % elif data['media_type'] == 'episode': diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 90ebec3b..a76e48b1 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -298,7 +298,7 @@ // Create a new instance if it doesn't exist if (!(instance.length)) { - getActivityInstance(session); + getActivityInstance(key); return; } @@ -504,19 +504,21 @@ }); } - function getActivityInstance(session) { + function getActivityInstance(session_key) { $.ajax({ url: 'get_current_activity_instance', type: 'GET', cache: false, async: true, - data: session, + data: { + session_key: session_key + }, complete: function(xhr, status) { $('#currentActivity').append(xhr.responseText); - $('#activity-instance-' + session.session_key + ' .dashboard-activity-info-scroller').scrollbar(); - $('#activity-instance-' + session.session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 }) - $('#terminate-button-' + session.session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 }); - lockScroll('#activity-instance-' + session.session_key + ' .dashboard-activity-info-scroller'); + $('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller').scrollbar(); + $('#activity-instance-' + session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 }); + $('#terminate-button-' + session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 }); + lockScroll('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller'); } }); } diff --git a/plexpy/webserve.py b/plexpy/webserve.py index c31e04a3..6cc3b6fc 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -226,18 +226,8 @@ class WebInterface(object): @requireAuth() def get_current_activity(self, **kwargs): - try: - pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN) - result = pms_connect.get_current_activity() - - data_factory = datafactory.DataFactory() - for session in result['sessions']: - if not session['ip_address']: - ip_address = data_factory.get_session_ip(session['session_key']) - session['ip_address'] = ip_address - - except: - return serve_template(templatename="current_activity.html", data=None) + pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN) + result = pms_connect.get_current_activity() if result: return serve_template(templatename="current_activity.html", data=result) @@ -247,45 +237,16 @@ class WebInterface(object): @cherrypy.expose @requireAuth() - def get_current_activity_instance(self, **kwargs): + def get_current_activity_instance(self, session_key=None, **kwargs): - return serve_template(templatename="current_activity_instance.html", session=kwargs) - - @cherrypy.expose - @requireAuth() - def get_current_activity_header(self, **kwargs): - - try: - pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN) - result = pms_connect.get_current_activity() - except: - return serve_template(templatename="current_activity_header.html", data=None) + pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN) + result = pms_connect.get_current_activity() if result: - data = {'stream_count': result['stream_count'], - 'direct_play': 0, - 'direct_stream': 0, - 'transcode': 0} - for s in result['sessions']: - if s['media_type'] == 'track': - if s['audio_decision'] == 'transcode': - data['transcode'] += 1 - elif s['audio_decision'] == 'copy': - data['direct_stream'] += 1 - else: - data['direct_play'] += 1 - else: - if s['video_decision'] == 'transcode' or s['audio_decision'] == 'transcode': - data['transcode'] += 1 - elif s['video_decision'] == 'copy' or s['audio_decision'] == 'copy': - data['direct_stream'] += 1 - else: - data['direct_play'] += 1 - - return serve_template(templatename="current_activity_header.html", data=data) + session = next((s for s in result['sessions'] if s['session_key'] == session_key), None) + return serve_template(templatename="current_activity_instance.html", session=session) else: - logger.warn(u"Unable to retrieve data for get_current_activity_header.") - return serve_template(templatename="current_activity_header.html", data=None) + return serve_template(templatename="current_activity_instance.html", session=None) @cherrypy.expose @cherrypy.tools.json_out() @@ -4464,19 +4425,13 @@ class WebInterface(object): result = pms_connect.get_current_activity() if result: - data_factory = datafactory.DataFactory() - for session in result['sessions']: - if not session['ip_address']: - ip_address = data_factory.get_session_ip(session['session_key']) - session['ip_address'] = ip_address - if session_key: return next((s for s in result['sessions'] if s['session_key'] == session_key), {}) counts = {'stream_count_direct_play': 0, - 'stream_count_direct_stream': 0, - 'stream_count_transcode': 0} + 'stream_count_direct_stream': 0, + 'stream_count_transcode': 0} for s in result['sessions']: if s['transcode_decision'] == 'transcode':