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

Styling tweaks.

Browse source 
Don't log error everytime OSX Notify agent cannot be found.
Add check in PlexWatch importer to skip over rows with bad xml.
Move some logging out of places where they would never be executed.
This commit is contained in:
Tim 2015-07-27 20:42:40 +02:00
parent eb2b530718
commit abc90e1252
5 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plexpy/webserve.py
View file

@ -619,8 +619,8 @@ class WebInterface(object):
if result:
return serve_template(templatename="current_activity.html", data=result)
else:
return serve_template(templatename="current_activity.html", data=None)
logger.warn('Unable to retrieve data.')
return serve_template(templatename="current_activity.html", data=None)
@cherrypy.expose
def get_current_activity_header(self, **kwargs):
@ -634,8 +634,8 @@ class WebInterface(object):
if result:
return serve_template(templatename="current_activity_header.html", data=result['stream_count'])
else:
return serve_template(templatename="current_activity_header.html", data=None)
logger.warn('Unable to retrieve data.')
return serve_template(templatename="current_activity_header.html", data=None)
@cherrypy.expose
def get_recently_added(self, count='0', **kwargs):
@ -649,8 +649,8 @@ class WebInterface(object):
if result:
return serve_template(templatename="recently_added.html", data=result['recently_added'])
else:
return serve_template(templatename="recently_added.html", data=None)
logger.warn('Unable to retrieve data.')
return serve_template(templatename="recently_added.html", data=None)
@cherrypy.expose
def pms_image_proxy(self, img='', width='0', height='0', fallback=None, **kwargs):
@ -706,9 +706,9 @@ class WebInterface(object):
return serve_template(templatename="user_recently_watched.html", data=result,
title="Recently Watched")
else:
logger.warn('Unable to retrieve data.')
return serve_template(templatename="user_recently_watched.html", data=None,
title="Recently Watched")
logger.warn('Unable to retrieve data.')
@cherrypy.expose
def get_user_watch_time_stats(self, user=None, user_id=None, **kwargs):
@ -719,8 +719,8 @@ class WebInterface(object):
if result:
return serve_template(templatename="user_watch_time_stats.html", data=result, title="Watch Stats")
else:
return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats")
logger.warn('Unable to retrieve data.')
return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats")
@cherrypy.expose
def get_user_platform_stats(self, user=None, user_id=None, **kwargs):
@ -732,8 +732,8 @@ class WebInterface(object):
return serve_template(templatename="user_platform_stats.html", data=result,
title="Platform Stats")
else:
return serve_template(templatename="user_platform_stats.html", data=None, title="Platform Stats")
logger.warn('Unable to retrieve data.')
return serve_template(templatename="user_platform_stats.html", data=None, title="Platform Stats")
@cherrypy.expose
def get_children(self, rating_key='', **kwargs):
@ -744,8 +744,8 @@ class WebInterface(object):
if result:
return serve_template(templatename="info_episode_list.html", data=result, title="Episode List")
else:
return serve_template(templatename="info_episode_list.html", data=None, title="Episode List")
logger.warn('Unable to retrieve data.')
return serve_template(templatename="info_episode_list.html", data=None, title="Episode List")
@cherrypy.expose
def get_metadata_json(self, rating_key='', **kwargs):