Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
29c7853380 | ||
![]() |
cd417aaf44 | ||
![]() |
428a5cc0ff | ||
![]() |
d128d7c8e6 | ||
![]() |
8027199bd5 | ||
![]() |
099a887cc7 | ||
![]() |
1c50e615cf |
@@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# 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)
|
## v1.4.19 (2017-05-31)
|
||||||
|
|
||||||
* Fix: Video resolution not showing up for transcoded streams on PMS 1.7.x.
|
* Fix: Video resolution not showing up for transcoded streams on PMS 1.7.x.
|
||||||
|
BIN
data/interfaces/default/images/platforms/plextogether.png
Normal file
BIN
data/interfaces/default/images/platforms/plextogether.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
@@ -256,6 +256,8 @@ function getPlatformImagePath(platformName) {
|
|||||||
return 'images/platforms/wp.png';
|
return 'images/platforms/wp.png';
|
||||||
} else if (platformName.indexOf("Plex Media Player") > -1) {
|
} else if (platformName.indexOf("Plex Media Player") > -1) {
|
||||||
return 'images/platforms/pmp.png';
|
return 'images/platforms/pmp.png';
|
||||||
|
} else if (platformName.indexOf("PlexTogether") > -1) {
|
||||||
|
return 'images/platforms/plextogether.png';
|
||||||
} else {
|
} else {
|
||||||
return 'images/platforms/default.png';
|
return 'images/platforms/default.png';
|
||||||
}
|
}
|
||||||
|
@@ -204,10 +204,10 @@ def human_duration(s, sig='dhms'):
|
|||||||
hd = ''
|
hd = ''
|
||||||
|
|
||||||
if str(s).isdigit() and s > 0:
|
if str(s).isdigit() and s > 0:
|
||||||
d = int(s / 84600)
|
d = int(s / 86400)
|
||||||
h = int((s % 84600) / 3600)
|
h = int((s % 86400) / 3600)
|
||||||
m = int(((s % 84600) % 3600) / 60)
|
m = int(((s % 86400) % 3600) / 60)
|
||||||
s = int(((s % 84600) % 3600) % 60)
|
s = int(((s % 86400) % 3600) % 60)
|
||||||
|
|
||||||
hd_list = []
|
hd_list = []
|
||||||
if sig >= 'd' and d > 0:
|
if sig >= 'd' and d > 0:
|
||||||
|
@@ -382,7 +382,7 @@ class Libraries(object):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
# If no cache was imported, get all library children items
|
# 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:
|
if refresh or not rows:
|
||||||
pms_connect = pmsconnect.PmsConnect()
|
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)
|
results = sorted(results, key=lambda k: helpers.cast_to_int(k['media_index']), reverse=reverse)
|
||||||
elif sort_key == 'file_size' or sort_key == 'bitrate':
|
elif sort_key == 'file_size' or sort_key == 'bitrate':
|
||||||
results = sorted(results, key=lambda k: helpers.cast_to_int(k[sort_key]), reverse=reverse)
|
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:
|
else:
|
||||||
results = sorted(results, key=lambda k: k[sort_key], reverse=reverse)
|
results = sorted(results, key=lambda k: k[sort_key], reverse=reverse)
|
||||||
|
|
||||||
|
@@ -2062,9 +2062,10 @@ class SLACK(object):
|
|||||||
data['attachments'] = [attachment]
|
data['attachments'] = [attachment]
|
||||||
|
|
||||||
slackhost = urlparse(self.slack_hook).hostname
|
slackhost = urlparse(self.slack_hook).hostname
|
||||||
|
slackport = urlparse(self.slack_hook).port
|
||||||
slackpath = urlparse(self.slack_hook).path
|
slackpath = urlparse(self.slack_hook).path
|
||||||
|
|
||||||
http_handler = HTTPSConnection(slackhost)
|
http_handler = HTTPSConnection(slackhost, slackport)
|
||||||
http_handler.request("POST",
|
http_handler.request("POST",
|
||||||
slackpath,
|
slackpath,
|
||||||
headers={'Content-type': "application/json"},
|
headers={'Content-type': "application/json"},
|
||||||
|
@@ -1,2 +1,2 @@
|
|||||||
PLEXPY_VERSION = "master"
|
PLEXPY_VERSION = "master"
|
||||||
PLEXPY_RELEASE_VERSION = "1.4.19"
|
PLEXPY_RELEASE_VERSION = "1.4.20"
|
||||||
|
Reference in New Issue
Block a user