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

Make sure current activity returned sessions when refreshing

Browse source
This commit is contained in:
JonnyWong16 2016-05-17 21:10:05 -07:00
parent e5530182cd
commit 33458c1bdb
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
data/interfaces/default/index.html
View file

@ -107,6 +107,11 @@
$('#dashboard-checking-activity').remove(); $('#dashboard-checking-activity').remove();
var current_activity = $.parseJSON(xhr.responseText); var current_activity = $.parseJSON(xhr.responseText);
if (!(current_activity)) {
$('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.</div>');
return
}
var stream_count = parseInt(current_activity.stream_count); var stream_count = parseInt(current_activity.stream_count);
var sessions = current_activity.sessions; var sessions = current_activity.sessions;

3
data/interfaces/default/recently_added.html
View file

@ -109,6 +109,5 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
% else: % else:
<div class="text-muted">There was an error communicating with your Plex Server. Please check your <a href="settings">settings</a>. <div class="text-muted">There was an error communicating with your Plex Server.</div><br>
</div><br>
% endif % endif

12
plexpy/webserve.py
View file

@ -3618,13 +3618,13 @@ class WebInterface(object):
pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN) pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
result = pms_connect.get_current_activity() 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
if result: 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
return result return result
else: else:
logger.warn(u"Unable to retrieve data for get_activity.") logger.warn(u"Unable to retrieve data for get_activity.")