diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index 7890c3e7..5241d10e 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -95,5 +95,5 @@
Nothing is currently being watched.

% endif % else: -
There was an error communicating with your Plex Server. Please check your settings.

+
There was an error communicating with your Plex Server. Please check your settings.

% endif \ No newline at end of file diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index e773471a..08527355 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -116,7 +116,7 @@ "language": { "search": "Search: ", "lengthMenu":"Show _MENU_ entries per page", - "info":"Showing _START_ to _END_ of _TOTAL_ entries", + "info":"Showing _START_ to _END_ of _TOTAL_ history items", "infoEmpty":"Showing 0 to 0 of 0 entries", "infoFiltered":"(filtered from _MAX_ total entries)", "emptyTable": "No data in table", diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index bb3a7632..cc275130 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -21,7 +21,7 @@
-
Checking for activity...

+
Checking for activity...

@@ -33,7 +33,9 @@

Recently Added

-
+
+
Looking for new items...

+
diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html index d6841f4a..fb8c866a 100644 --- a/data/interfaces/default/logs.html +++ b/data/interfaces/default/logs.html @@ -80,9 +80,8 @@ }, "sPaginationType": "bootstrap", "order": [ 0, 'desc'], - "pageLength": 25, + "pageLength": 10, "stateSave": true, - "autoWidth": true, "language": { "search":"Search: ", "lengthMenu":"Show _MENU_ lines per page", @@ -91,9 +90,17 @@ "infoEmpty":"Showing 0 to 0 of 0 lines", "infoFiltered":"(filtered from _MAX_ total lines)"}, "columnDefs": [ + { + "targets": [0], + "width": "15%" + }, + { + "targets": [1], + "width": "10%" + }, { "targets": [2], - "width": "70%" + "width": "75%" } ], "drawCallback": function (settings) { diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html index 84d42a1e..41ecde9a 100644 --- a/data/interfaces/default/recently_added.html +++ b/data/interfaces/default/recently_added.html @@ -32,5 +32,5 @@ % else: -

No recently added items.

+
There was an error communicating with your Plex Server. Please check your settings.

% endif \ No newline at end of file diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html index 03abfcd6..d09354ce 100644 --- a/data/interfaces/default/users.html +++ b/data/interfaces/default/users.html @@ -55,7 +55,7 @@ "language": { "search": "Search: ", "lengthMenu":"Show _MENU_ entries per page", - "info":"Showing _START_ to _END_ of _TOTAL_ entries", + "info":"Showing _START_ to _END_ of _TOTAL_ active users", "infoEmpty":"Showing 0 to 0 of 0 entries", "infoFiltered":"(filtered from _MAX_ total entries)", "emptyTable": "No data in table", diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 2d0428d8..97c730ba 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -65,17 +65,25 @@ class PmsConnect(object): url_command = '/status/sessions' http_handler = HTTPConnection(self.host, self.port, timeout=10) - http_handler.request("GET", url_command + '?X-Plex-Token=' + self.token) - response = http_handler.getresponse() - request_status = response.status - request_content = response.read() + try: + http_handler.request("GET", url_command + '?X-Plex-Token=' + self.token) + response = http_handler.getresponse() + request_status = response.status + request_content = response.read() + except IOError, e: + logger.warn(u"Failed to access sessions. %s" % e) + return None - if output_format == 'dict': - output = helpers.convert_xml_to_dict(request_content) - elif output_format == 'json': - output = helpers.convert_xml_to_json(request_content) + if request_status == 200: + if output_format == 'dict': + output = helpers.convert_xml_to_dict(request_content) + elif output_format == 'json': + output = helpers.convert_xml_to_json(request_content) + else: + output = request_content else: - output = request_content + logger.warn(u"Failed to access sessions. Status code %r" % request_status) + return None return output @@ -91,17 +99,25 @@ class PmsConnect(object): url_command = '/library/metadata/' + rating_key http_handler = HTTPConnection(self.host, self.port, timeout=10) - http_handler.request("GET", url_command + '?X-Plex-Token=' + self.token) - response = http_handler.getresponse() - request_status = response.status - request_content = response.read() + try: + http_handler.request("GET", url_command + '?X-Plex-Token=' + self.token) + response = http_handler.getresponse() + request_status = response.status + request_content = response.read() + except IOError, e: + logger.warn(u"Failed to access metadata. %s" % e) + return None - if output_format == 'dict': - output = helpers.convert_xml_to_dict(request_content) - elif output_format == 'json': - output = helpers.convert_xml_to_json(request_content) + if request_status == 200: + if output_format == 'dict': + output = helpers.convert_xml_to_dict(request_content) + elif output_format == 'json': + output = helpers.convert_xml_to_json(request_content) + else: + output = request_content else: - output = request_content + logger.warn(u"Failed to access metadata. Status code %r" % request_status) + return None return output @@ -117,17 +133,25 @@ class PmsConnect(object): url_command = '/library/recentlyAdded?X-Plex-Container-Start=0&X-Plex-Container-Size=' + count http_handler = HTTPConnection(self.host, self.port, timeout=10) - http_handler.request("GET", url_command + '&X-Plex-Token=' + self.token) - response = http_handler.getresponse() - request_status = response.status - request_content = response.read() + try: + http_handler.request("GET", url_command + '&X-Plex-Token=' + self.token) + response = http_handler.getresponse() + request_status = response.status + request_content = response.read() + except IOError, e: + logger.warn(u"Failed to access recently added items. %s" % e) + return None - if output_format == 'dict': - output = helpers.convert_xml_to_dict(request_content) - elif output_format == 'json': - output = helpers.convert_xml_to_json(request_content) + if request_status == 200: + if output_format == 'dict': + output = helpers.convert_xml_to_dict(request_content) + elif output_format == 'json': + output = helpers.convert_xml_to_json(request_content) + else: + output = request_content else: - output = request_content + logger.warn(u"Failed to access recently added. Status code %r" % request_status) + return None return output @@ -546,7 +570,6 @@ class PmsConnect(object): request_status = response.status request_content = response.read() request_content_type = response.getheader('content-type') - logger.debug(u"Content type: %r" % request_content_type) except IOError, e: logger.warn(u"Failed to retrieve image. %s" % e) return None diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 80a192c2..0ded4a8d 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -699,7 +699,7 @@ class WebInterface(object): try: pms_connect = pmsconnect.PmsConnect() result = pms_connect.get_image(img, width, height) - logger.info('Image proxy queried. Content type is %s' % result[0]) + logger.debug(u'Image proxy queried. Content type is %s' % result[0]) cherrypy.response.headers['Content-type'] = result[0] return result[1] except: