From ff0ed1abe4c29721093950def61a685489372f38 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 27 Aug 2015 00:35:29 +0200 Subject: [PATCH] Fix info pages bugging out if non-existent rating key is passed. --- plexpy/webserve.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 93092587..54fc8d9f 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -747,16 +747,19 @@ class WebInterface(object): @cherrypy.expose def info(self, item_id=None, source=None, **kwargs): + metadata = None if source == 'history': data_factory = datafactory.DataFactory() - result = data_factory.get_metadata_details(row_id=item_id) + metadata = 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'] + result = pms_connect.get_metadata_details(rating_key=item_id) + if result: + metadata = result['metadata'] - if result: - return serve_template(templatename="info.html", data=result, title="Info") + if metadata: + return serve_template(templatename="info.html", data=metadata, title="Info") else: logger.warn('Unable to retrieve data.') return serve_template(templatename="info.html", data=None, title="Info")