diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 53fc50d6..5b9061af 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -62,147 +62,145 @@ DOCUMENTATION :: END % if data is not None: <% from urllib import quote - - from plexpy import helpers - data['indexes'] = helpers.cast_to_int(data['indexes']) + import plexpy %>
% if (data['media_type'] == 'movie' or data['media_type'] == 'episode' or data['media_type'] == 'track') and data['rating_key']: - % else: - - % endif -
- % if not data['art'].startswith('interfaces') or not data['thumb'].startswith('interfaces'): - % if (data['media_type'] == 'movie' and not data['indexes']) or (data['indexes'] and not data['view_offset']): -
- % elif (data['media_type'] == 'episode' and not data['indexes']) or (data['indexes'] and not data['view_offset']): -
- % elif data['indexes']: - - % else: - % if data['media_type'] == 'track': -
-
- % elif data['media_type'] == 'clip': - % if data['art'].startswith('http'): -
- % elif data['thumb'].startswith('http'): -
- % else: - % if data['art']: - -
- % else: - -
- % endif - % endif - % elif data['media_type'] == 'photo': -
- % else: -
- % endif - % endif + % else: + + % endif +
+ % if not data['art'].startswith('interfaces') or not data['thumb'].startswith('interfaces'): + % if (data['media_type'] == 'movie' and not plexpy.CONFIG.PMS_USE_BIF) or (plexpy.CONFIG.PMS_USE_BIF and not data['view_offset']): +
+ % elif (data['media_type'] == 'episode' and not plexpy.CONFIG.PMS_USE_BIF) or (plexpy.CONFIG.PMS_USE_BIF and not data['view_offset']): +
+ % elif plexpy.CONFIG.PMS_USE_BIF: + % else: -
- % endif - % if _session['user_group'] == 'admin': - - % endif -
- -
-
-
-
- -
-
- ${data['player']}
- - % if data['state'] == 'playing': - State  Playing - % elif data['state'] == 'paused': - State  Paused - % elif data['state'] == 'buffering': - State  Buffering - % endif - -
- - % if data['video_decision'] == 'transcode' or data['audio_decision'] == 'transcode': - Stream  Transcode (Speed: ${data['transcode_speed']}) - % if data['transcode_throttled'] == '1': - (Throttled) - % endif - - % elif data['video_decision'] == 'copy' or data['audio_decision'] == 'copy': - Stream  Direct Stream + % if data['media_type'] == 'track': +
+
+ % elif data['media_type'] == 'clip': + % if data['art'].startswith('http'): +
+ % elif data['thumb'].startswith('http'): +
+ % else: + % if data['art']: + +
% else: - Stream  Direct Play + +
% endif -
- % if data['media_type'] in ('movie', 'episode', 'clip'): - % if data['video_decision'] == 'transcode': - Video  Transcode (${data['transcode_video_codec']}) (${data['transcode_width']}x${data['transcode_height']}) - % elif data['video_decision'] == 'copy': - Video  Direct Stream (${data['transcode_video_codec']}) (${data['width']}x${data['height']}) - % else: - Video  Direct Play (${data['video_codec']}) (${data['width']}x${data['height']}) - % endif -
- % endif - % if data['media_type'] in ('movie', 'episode', 'clip', 'track'): - % if data['audio_decision'] == 'transcode': - Audio  Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch) - % elif data['audio_decision'] == 'copy': - Audio  Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch) - % else: - Audio  Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch) - % endif + % endif + % elif data['media_type'] == 'photo': +
+ % else: +
+ % endif + % endif + % else: +
+ % endif + % if _session['user_group'] == 'admin': + + % endif +
+ +
+
+
+
+ +
+
+ ${data['player']}
+ + % if data['state'] == 'playing': + State  Playing + % elif data['state'] == 'paused': + State  Paused + % elif data['state'] == 'buffering': + State  Buffering % endif
-
- % if data['media_type'] != 'photo': -
-
- % if data['ip_address']: - IP: ${data['ip_address']} + + % if data['video_decision'] == 'transcode' or data['audio_decision'] == 'transcode': + Stream  Transcode (Speed: ${data['transcode_speed']}) + % if data['transcode_throttled'] == '1': + (Throttled) + % endif + + % elif data['video_decision'] == 'copy' or data['audio_decision'] == 'copy': + Stream  Direct Stream % else: - IP: N/A + Stream  Direct Play % endif
- ETA: - - - -
-
- - - / - - -
+ % if data['media_type'] in ('movie', 'episode', 'clip'): + % if data['video_decision'] == 'transcode': + Video  Transcode (${data['transcode_video_codec']}) (${data['transcode_width']}x${data['transcode_height']}) + % elif data['video_decision'] == 'copy': + Video  Direct Stream (${data['transcode_video_codec']}) (${data['width']}x${data['height']}) + % else: + Video  Direct Play (${data['video_codec']}) (${data['width']}x${data['height']}) + % endif +
+ % endif + % if data['media_type'] in ('movie', 'episode', 'clip', 'track'): + % if data['audio_decision'] == 'transcode': + Audio  Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch) + % elif data['audio_decision'] == 'copy': + Audio  Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch) + % else: + Audio  Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch) + % endif + % endif +
- % endif
- % if (data['media_type'] == 'movie' or data['media_type'] == 'episode' or data['media_type'] == 'track') and data['rating_key']: - - % else: + % if data['media_type'] != 'photo': +
+
+ % if data['ip_address']: + IP: ${data['ip_address']} + % else: + IP: N/A + % endif +
+ ETA: + + + +
+
+ + + / + + +
+
+ % endif +
+ % if (data['media_type'] == 'movie' or data['media_type'] == 'episode' or data['media_type'] == 'track') and data['rating_key']: + + % else: % endif
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 86fc801a..98415229 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -181,6 +181,7 @@ $('#overlay-play-state-' + key).html(overlay_state); $('#play-state-' + key).html(state_icon); + % if config['pms_use_bif']: // if using bif indexes, update the bif thumbnail if (s.indexes) { var bif_poster = $('#bif-' + key); @@ -189,6 +190,7 @@ + s.bif_thumb + '&width=500&height=280&fallback=art);">
').fadeIn(1000, function () { bif_poster.remove() })); blurArtwork(key); } + % endif // if transcoding, update the transcode state var ts = ''; diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 0972afb2..4131bac4 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -172,10 +172,8 @@ class WebInterface(object): config = { "home_sections": plexpy.CONFIG.HOME_SECTIONS, "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH, - "home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS, - "home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS, - "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER, "pms_name": plexpy.CONFIG.PMS_NAME, + "pms_use_bif": plexpy.CONFIG.PMS_USE_BIF, "update_show_changelog": plexpy.CONFIG.UPDATE_SHOW_CHANGELOG } return serve_template(templatename="index.html", title="Home", config=config)