From a5eb0e7faad7a4b33537c253302ba70621795edb Mon Sep 17 00:00:00 2001 From: Hellowlol Date: Tue, 21 Mar 2017 15:35:03 +0100 Subject: [PATCH 01/17] Add missing CONFIG --- plexpy/api2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexpy/api2.py b/plexpy/api2.py index f25487b6..54a6bd53 100644 --- a/plexpy/api2.py +++ b/plexpy/api2.py @@ -407,7 +407,7 @@ General optional parameters: data = None apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32] if plexpy.CONFIG.HTTP_USERNAME and plexpy.CONFIG.HTTP_PASSWORD: - if username == plexpy.HTTP_USERNAME and password == plexpy.CONFIG.HTTP_PASSWORD: + if username == plexpy.CONFIG.HTTP_USERNAME and password == plexpy.CONFIG.HTTP_PASSWORD: if plexpy.CONFIG.API_KEY: data = plexpy.CONFIG.API_KEY else: From 279d27d081c26cb4fcb562b2e26135b7bd7354a0 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 22 Apr 2017 13:32:36 -0700 Subject: [PATCH 02/17] Update PayPal donation link --- data/interfaces/default/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 83b51225..c0a82331 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -223,7 +223,7 @@
  • FAQ
  • Support
    • -
  • Paypal
    • +
  • Paypal
  • Bitcoin
    • % if plexpy.CONFIG.CHECK_GITHUB: From 4fcfea943ef4ce41818727bc7d6af2907929228c Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 22 Apr 2017 13:35:22 -0700 Subject: [PATCH 03/17] Add badges to readme --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3a55c328..89be468a 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,13 @@ # PlexPy -[![Join the chat at https://gitter.im/plexpy/general](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/plexpy/general?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Discord](https://img.shields.io/badge/Discord-PlexPy-738bd7.svg?style=flat-square)](https://discord.gg/36ggawe) +[![Gitter](https://img.shields.io/badge/Gitter-PlexPy-ed1965.svg?style=flat-square)](https://gitter.im/plexpy/general) +[![Plex Forums](https://img.shields.io/badge/Plex%20Forums-PlexPy-E5A00D.svg?style=flat-square)](https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program) A python based web application for monitoring, analytics and notifications for [Plex Media Server](https://plex.tv). This project is based on code from [Headphones](https://github.com/rembo10/headphones) and [PlexWatchWeb](https://github.com/ecleese/plexWatchWeb). -* [Plex forum thread](https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program) -* [Gitter chat](https://gitter.im/plexpy/general) -* [/r/Plex Discord server](https://discord.gg/011TFFWSuNFI02EKr) | [PlexPy Discord server](https://discord.gg/36ggawe) - ## Features * Responsive web design viewable on desktop, tablet and mobile web browsers. From fbe136a3507607cc2b92fb82d4a23188276178e8 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 22 Apr 2017 13:43:45 -0700 Subject: [PATCH 04/17] Fix datatables footer text wrapping --- data/interfaces/default/css/plexpy.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index f1fcb31e..f7385355 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -2491,6 +2491,9 @@ a .home-platforms-list-cover-face:hover .dataTables_paginate li { margin: 0; } +div.dataTables_info { + white-space: normal !important; +} .tooltip.top .tooltip-arrow { border-top-color: #fff; } From 14b0353ba43af21f247b4e14644eafea26b2e130 Mon Sep 17 00:00:00 2001 From: o Date: Sat, 22 Apr 2017 18:40:21 -0400 Subject: [PATCH 05/17] A correction and additional Arnold quotes Correction: True Lies (1994) 'Can you hurry up. My horse is getting tired.' to 'Make it quick because my horse is getting tired.' http://www.imdb.com/title/tt0111503/quotes?item=qt0408883 Additions: Last Action Hero (1993) 'Well, listen to this one: Rubber baby buggy bumpers!' http://www.imdb.com/title/tt0107362/quotes?item=qt1196411 Kindergarten Cop (1990) 'Take your toy back to the carpet!' http://www.imdb.com/title/tt0099938/quotes?item=qt0460013 Kindergarten Cop (1990) 'My name is John Kimble... And I love my car.' http://www.imdb.com/title/tt0099938/quotes?item=qt0460001 Commando (1985) 'I eat Green Berets for breakfast.' http://www.imdb.com/title/tt0088944/quotes?item=qt0402329 Jingle All the Way (1996) 'Put that cookie down. NOW!' http://www.imdb.com/title/tt0116705/quotes?item=qt0266218 --- plexpy/webserve.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 9cc79e9f..c180244a 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -4312,13 +4312,18 @@ class WebInterface(object): 'Come with me if you want to live.', 'Who is your daddy and what does he do?', 'Oh, cookies! I can\'t wait to toss them.', - 'Can you hurry up. My horse is getting tired.', + 'Make it quick because my horse is getting tired.', 'What killed the dinosaurs? The Ice Age!', 'That\'s for sleeping with my wife!', 'Remember when I said I\'d kill you last... I lied!', 'You want to be a farmer? Here\'s a couple of acres', 'Now, this is the plan. Get your ass to Mars.', - 'I just had a terrible thought... What if this is a dream?' + 'I just had a terrible thought... What if this is a dream?', + 'Well, listen to this one: Rubber baby buggy bumpers!', + 'Take your toy back to the carpet!', + 'My name is John Kimble... And I love my car.', + 'I eat Green Berets for breakfast.', + 'Put that cookie down! NOW!' ] random_number = randint(0, len(quote_list) - 1) From ed2d34e97945525a5f83f6b9edc3350df54057b8 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 22 Apr 2017 15:54:45 -0700 Subject: [PATCH 06/17] v1.4.18 --- CHANGELOG.md | 7 +++++++ plexpy/version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f7d173c..31e53a79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v1.4.18 (2017-04-22) + +* New: Added some new Arnold quotes. (Thanks @senepa) +* Fix: Text wrapping in datatable footers. +* Fix: API command get_apikey. (Thanks @Hellowlol) + + ## v1.4.17 (2017-03-04) * New: Configurable month range for the Plays by month graph. (Thanks @Pbaboe) diff --git a/plexpy/version.py b/plexpy/version.py index ce0b3a0d..39ca460c 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.4.17" +PLEXPY_RELEASE_VERSION = "1.4.18" From 1c50e615cf67c3a2a4ef952ad4087a4d75951a07 Mon Sep 17 00:00:00 2001 From: o Date: Sat, 22 Apr 2017 19:27:31 -0400 Subject: [PATCH 07/17] Fixing math used to calculate human_duration There are 86400 seconds in a day --- plexpy/helpers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plexpy/helpers.py b/plexpy/helpers.py index 07a6fb13..90c091d1 100644 --- a/plexpy/helpers.py +++ b/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: From 5147baab05818a4f3ac5866a8dc337cfc374a85d Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 31 May 2017 19:50:44 -0700 Subject: [PATCH 08/17] Temporary fix for current activity resolution on PMS 1.7.x --- plexpy/pmsconnect.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index d1c37f19..71d06ac9 100644 --- a/plexpy/pmsconnect.py +++ b/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: From ea41d06023969d938bd3b690e72cd3de56b18370 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 31 May 2017 19:55:42 -0700 Subject: [PATCH 09/17] v1.4.19 --- CHANGELOG.md | 5 +++++ plexpy/version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31e53a79..19256f3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 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) diff --git a/plexpy/version.py b/plexpy/version.py index 39ca460c..113de069 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.4.18" +PLEXPY_RELEASE_VERSION = "1.4.19" From 099a887cc7a9ee6c16957743452dffa66ec3af7f Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 24 Jun 2017 21:06:40 -0700 Subject: [PATCH 10/17] Add PlexTogether platform image --- .../default/images/platforms/plextogether.png | Bin 0 -> 4345 bytes data/interfaces/default/js/script.js | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 data/interfaces/default/images/platforms/plextogether.png diff --git a/data/interfaces/default/images/platforms/plextogether.png b/data/interfaces/default/images/platforms/plextogether.png new file mode 100644 index 0000000000000000000000000000000000000000..f21a81b8a9079c56a7822fc5286761be47375e37 GIT binary patch literal 4345 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 literal 0 HcmV?d00001 diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index e592b397..71e599fb 100644 --- a/data/interfaces/default/js/script.js +++ b/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'; } From d128d7c8e6a0905271c02105a254cfc66815e35a Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 24 Jun 2017 21:17:26 -0700 Subject: [PATCH 11/17] Sort 4k properly in media info table --- plexpy/libraries.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexpy/libraries.py b/plexpy/libraries.py index 649d454a..fce8f27e 100644 --- a/plexpy/libraries.py +++ b/plexpy/libraries.py @@ -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) From 428a5cc0fffd8ffe4ace1e61fe60d596347e8efd Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 24 Jun 2017 21:34:22 -0700 Subject: [PATCH 12/17] Udate file sizes when refreshing media info --- plexpy/libraries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexpy/libraries.py b/plexpy/libraries.py index fce8f27e..cf4a753a 100644 --- a/plexpy/libraries.py +++ b/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() From cd417aaf44b13bae81c3538196531ccaa0c2d214 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 24 Jun 2017 21:34:53 -0700 Subject: [PATCH 13/17] Support custom port for Mattermost (Slack) notifications --- plexpy/notifiers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 508b1cec..6c724ecd 100644 --- a/plexpy/notifiers.py +++ b/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"}, From 29c7853380ea255cd017a77647d4485ab41c5382 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 24 Jun 2017 21:41:24 -0700 Subject: [PATCH 14/17] v1.4.20 --- CHANGELOG.md | 9 +++++++++ plexpy/version.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19256f3a..e66d7233 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # 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. diff --git a/plexpy/version.py b/plexpy/version.py index 113de069..6a4e7bc1 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.4.19" +PLEXPY_RELEASE_VERSION = "1.4.20" From 8ec30a77ff1324203e080bae3e5ed91f829a07b5 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 1 Jul 2017 16:35:12 -0700 Subject: [PATCH 15/17] Update donation methods --- data/interfaces/default/base.html | 72 +++++++++++++++++- .../default/images/flattr-badge-large.png | Bin 0 -> 2238 bytes .../default/images/gold-rect-paypal-34px.png | Bin 0 -> 2751 bytes .../default/js/jquery.qrcode.min.js | 28 +++++++ 4 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 data/interfaces/default/images/flattr-badge-large.png create mode 100644 data/interfaces/default/images/gold-rect-paypal-34px.png create mode 100644 data/interfaces/default/js/jquery.qrcode.min.js diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index c0a82331..e9459c86 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -223,8 +223,7 @@
  • FAQ
  • Support
    • -
  • Paypal
    • -
  • Bitcoin
    • +
  • Donate
    • % if plexpy.CONFIG.CHECK_GITHUB:
  • Check for Updates
    • @@ -305,6 +304,63 @@ +% else: + % endif ${next.headerIncludes()} @@ -319,6 +375,8 @@ ${next.headerIncludes()} % if _session['user_group'] == 'admin' and plexpy.CONFIG.BROWSER_ENABLED: +% else: + % endif + % if _session['user_group'] == 'admin' and plexpy.CONFIG.BROWSER_ENABLED: % else: - % endif