anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow info pages to be pulled from the db instead of the Plex Server, useful for media that has been deleted.

Browse Source 
Fix home stats user link if user has no id.
Fix bug in PlexWatch import script which switched around the episode and show titles.
This commit is contained in:
Tim
2015-07-25 12:40:38 +02:00
parent 187f9d7cd4
commit 7d9934e4b6
11 changed files with 137 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plexpy/webserve.py
View File

@@ -671,16 +671,20 @@ class WebInterface(object):
return None
@cherrypy.expose
def info(self, rating_key='', **kwargs):
def info(self, item_id=None, source=None, **kwargs):
pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_metadata_details(rating_key)
if source == 'history':
data_factory = datafactory.DataFactory()
result = data_factory.get_metadata_details(row_id=item_id)
else:
pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_metadata_details(rating_key=item_id)['metadata']
if result:
return serve_template(templatename="info.html", data=result['metadata'], title="Info")
return serve_template(templatename="info.html", data=result, title="Info")
else:
return serve_template(templatename="info.html", data=None, title="Info")
logger.warn('Unable to retrieve data.')
return serve_template(templatename="info.html", data=None, title="Info")
@cherrypy.expose
def get_user_recently_watched(self, user=None, user_id=None, limit='10', **kwargs):