v1.4.20

Fixed math used to calculate human_duration

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v1.4.20 (2017-06-24)
+
+* New: Added platform image for the PlexTogether player.
+* Fix: Corrected math used to calculate human duration. (Thanks @senepa)
+* Fix: Sorting of 4k in media info tables.
+* Fix: Update file sizes when refreshing media info tables.
+* Fix: Support a custom port for Mattermost (Slack) notifications.
+
+
+## v1.4.19 (2017-05-31)
+
+* Fix: Video resolution not showing up for transcoded streams on PMS 1.7.x.
+
+
 ## v1.4.18 (2017-04-22)
 
 * New: Added some new Arnold quotes. (Thanks @senepa)

data/interfaces/default/js/script.js

@@ -256,6 +256,8 @@ function getPlatformImagePath(platformName) {
         return 'images/platforms/wp.png';
     } else if (platformName.indexOf("Plex Media Player") > -1) {
         return 'images/platforms/pmp.png';
+    } else if (platformName.indexOf("PlexTogether") > -1) {
+        return 'images/platforms/plextogether.png';
     } else {
         return 'images/platforms/default.png';
     }

plexpy/helpers.py

@@ -204,10 +204,10 @@ def human_duration(s, sig='dhms'):
     hd = ''
 
     if str(s).isdigit() and s > 0:
-        d = int(s / 84600)
-        h = int((s % 84600) / 3600)
-        m = int(((s % 84600) % 3600) / 60)
-        s = int(((s % 84600) % 3600) % 60)
+        d = int(s / 86400)
+        h = int((s % 86400) / 3600)
+        m = int(((s % 86400) % 3600) / 60)
+        s = int(((s % 86400) % 3600) % 60)
 
         hd_list = []
         if sig >= 'd' and d > 0:

plexpy/libraries.py

@@ -382,7 +382,7 @@ class Libraries(object):
                 pass
 
         # If no cache was imported, get all library children items
-        cached_items = {d['rating_key']: d['file_size'] for d in rows}
+        cached_items = {d['rating_key']: d['file_size'] for d in rows} if not refresh else {}
 
         if refresh or not rows:
             pms_connect = pmsconnect.PmsConnect()
@@ -491,6 +491,8 @@ class Libraries(object):
                 results = sorted(results, key=lambda k: helpers.cast_to_int(k['media_index']), reverse=reverse)
             elif sort_key == 'file_size' or sort_key == 'bitrate':
                 results = sorted(results, key=lambda k: helpers.cast_to_int(k[sort_key]), reverse=reverse)
+            elif sort_key == 'video_resolution':
+                results = sorted(results, key=lambda k: helpers.cast_to_int(k[sort_key].replace('4k', '2160p').rstrip('p')), reverse=reverse)
             else:
                 results = sorted(results, key=lambda k: k[sort_key], reverse=reverse)
 

plexpy/notifiers.py

@@ -2062,9 +2062,10 @@ class SLACK(object):
             data['attachments'] = [attachment]
 
         slackhost = urlparse(self.slack_hook).hostname
+        slackport = urlparse(self.slack_hook).port
         slackpath = urlparse(self.slack_hook).path
 
-        http_handler = HTTPSConnection(slackhost)
+        http_handler = HTTPSConnection(slackhost, slackport)
         http_handler.request("POST",
                              slackpath,
                              headers={'Content-type': "application/json"},

plexpy/pmsconnect.py

@@ -1186,8 +1186,8 @@ class PmsConnect(object):
                 transcode_audio_codec = helpers.get_xml_attr(transcode_session, 'audioCodec')
                 video_decision = helpers.get_xml_attr(transcode_session, 'videoDecision')
                 transcode_video_codec = helpers.get_xml_attr(transcode_session, 'videoCodec')
-                transcode_width = helpers.get_xml_attr(transcode_session, 'width')
-                transcode_height = helpers.get_xml_attr(transcode_session, 'height')
+                transcode_width = helpers.get_xml_attr(transcode_session, 'width') or width
+                transcode_height = helpers.get_xml_attr(transcode_session, 'height') or height
                 transcode_container = helpers.get_xml_attr(transcode_session, 'container')
                 transcode_protocol = helpers.get_xml_attr(transcode_session, 'protocol')
             else:
@@ -1443,8 +1443,8 @@ class PmsConnect(object):
                 transcode_speed = helpers.get_xml_attr(transcode_session, 'speed')
                 video_decision = helpers.get_xml_attr(transcode_session, 'videoDecision')
                 transcode_video_codec = helpers.get_xml_attr(transcode_session, 'videoCodec')
-                transcode_width = helpers.get_xml_attr(transcode_session, 'width')
-                transcode_height = helpers.get_xml_attr(transcode_session, 'height')
+                transcode_width = helpers.get_xml_attr(transcode_session, 'width') or width
+                transcode_height = helpers.get_xml_attr(transcode_session, 'height') or height
                 transcode_container = helpers.get_xml_attr(transcode_session, 'container')
                 transcode_protocol = helpers.get_xml_attr(transcode_session, 'protocol')
             else:

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.4.18"
+PLEXPY_RELEASE_VERSION = "1.4.20"