From a98bc45c102b95822b0ea63465b843690244f879 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Fri, 24 Jan 2020 20:14:48 -0800 Subject: [PATCH 001/114] Fix HDR for direct stream video --- plexpy/pmsconnect.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index f81f35e3..297bf2e8 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -1995,7 +1995,8 @@ class PmsConnect(object): else: stream_details['video_dynamic_range'] = 'SDR' - if helpers.cast_to_int(video_details['stream_video_bit_depth']) > 8 \ + if video_details['stream_video_decision'] != 'transcode' \ + or helpers.cast_to_int(video_details['stream_video_bit_depth']) > 8 \ and video_details['stream_video_color_space'] == 'bt2020nc': stream_details['stream_video_dynamic_range'] = 'HDR' else: From 4d4a8ca3b2c3c1cb1ab552c09909f070f4177f8b Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 28 Jan 2020 10:38:21 -0800 Subject: [PATCH 002/114] Trim MaxMind License Key when saving --- data/interfaces/default/settings.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index bee08d84..6f6282e8 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -2868,11 +2868,13 @@ $(document).ready(function() { } $("#install_geoip_db").click(function () { - if ($.trim($("#maxmind_license_key").val()) === "") { - $("#maxmind_license_key").focus(); + var maxmind_license_key = $("#maxmind_license_key"); + maxmind_license_key.val($.trim(maxmind_license_key.val())); + if (maxmind_license_key.val() === "") { + maxmind_license_key.focus(); showMsg(' Maxmind License Key is required.', false, true, 5000, true); return false; - } else if (!(saveSettings())){ + } else if (!(saveSettings())) { return false; } var msg = 'Are you sure you want to install the GeoLite2 database?

' + From 645c2ecef61226b81c5271f7e44105c9aae3d6e1 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Mon, 3 Feb 2020 18:11:56 -0800 Subject: [PATCH 003/114] Use Authorization header for GitHub API --- plexpy/versioncheck.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py index b9440c19..dce083aa 100644 --- a/plexpy/versioncheck.py +++ b/plexpy/versioncheck.py @@ -158,13 +158,17 @@ def check_update(auto_update=False, notify=False): def check_github(auto_update=False, notify=False): plexpy.COMMITS_BEHIND = 0 + if plexpy.CONFIG.GIT_TOKEN: + headers = {'Authorization': 'token {}'.format(plexpy.CONFIG.GIT_TOKEN)} + else: + headers = {} + # Get the latest version available from github logger.info('Retrieving latest version information from GitHub') url = 'https://api.github.com/repos/%s/%s/commits/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH) - if plexpy.CONFIG.GIT_TOKEN: url = url + '?access_token=%s' % plexpy.CONFIG.GIT_TOKEN - version = request.request_json(url, timeout=20, validator=lambda x: type(x) == dict) + version = request.request_json(url, headers=headers, timeout=20, validator=lambda x: type(x) == dict) if version is None: logger.warn('Could not get the latest version from GitHub. Are you running a local development version?') @@ -187,8 +191,8 @@ def check_github(auto_update=False, notify=False): plexpy.CONFIG.GIT_REPO, plexpy.LATEST_VERSION, plexpy.CURRENT_VERSION) - if plexpy.CONFIG.GIT_TOKEN: url = url + '?access_token=%s' % plexpy.CONFIG.GIT_TOKEN - commits = request.request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == dict) + commits = request.request_json(url, headers=headers, timeout=20, whitelist_status_code=404, + validator=lambda x: type(x) == dict) if commits is None: logger.warn('Could not get commits behind from GitHub.') From bc2f73d68645bdee06729ac80c485b60ab9851be Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Mon, 3 Feb 2020 18:27:41 -0800 Subject: [PATCH 004/114] v2.1.43 --- CHANGELOG.md | 19 +++++++++++++++++++ plexpy/version.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41f2eeed..fc9fcdbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## v2.1.43 (2020-02-03) + +* Monitoring: + * New: Added HDR indicator on activity card. + * New: Added dynamic range to history steam info modal. +* Notifications: + * Fix: Webhook notification body sent as incorrect data type when Content-Type header is overridden. + * Fix: Telegram notification character limit incorrect for unicode characters. + * New: Added color and dynamic range notification parameters. +* Newsletters: + * Fix: Episodes and Albums plural spelling on recently added newsletter section headers. +* UI: + * Fix: Windows and macOS platform capitalization. + * Fix: Season number 0 not shown for episodes on history tables. +* Other: + * Change: Mask email addresses in logs. + * Change: Update deprecated GitHub access token URL parameter to Authorization header. + + ## v2.1.42 (2020-01-04) * Other: diff --git a/plexpy/version.py b/plexpy/version.py index 591119a4..bb0fa335 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_BRANCH = "master" -PLEXPY_RELEASE_VERSION = "v2.1.42" +PLEXPY_RELEASE_VERSION = "v2.1.43" From f88d673e874b222b0abc91b04ccff10d1de543cc Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 4 Feb 2020 13:48:29 -0800 Subject: [PATCH 005/114] Remove capitalization for platform on history tables --- data/interfaces/default/js/tables/history_table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index 60f55513..2011ebaa 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -115,7 +115,7 @@ history_table_options = { "data": "platform", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { - $(td).html(capitalizeFirstLetter(cellData)); + $(td).html(cellData); } }, "width": "10%", From 99f826c2364db85a71b18b3b372f4e8570e5993f Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 5 Feb 2020 20:24:43 -0800 Subject: [PATCH 006/114] Fix video color notification condition types --- plexpy/common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plexpy/common.py b/plexpy/common.py index c3c5c547..1b74989f 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -364,8 +364,8 @@ NOTIFICATION_PARAMETERS = [ {'name': 'Stream Video Bitrate', 'type': 'int', 'value': 'stream_video_bitrate', 'description': 'The video bitrate (in kbps) of the stream.'}, {'name': 'Stream Video Bit Depth', 'type': 'int', 'value': 'stream_video_bit_depth', 'description': 'The video bit depth of the stream.'}, {'name': 'Stream Video Chroma Subsampling', 'type': 'str', 'value': 'stream_video_chroma_subsampling', 'description': 'The video chroma subsampling of the stream.'}, - {'name': 'Stream Video Color Primaries', 'type': 'srt', 'value': 'stream_video_color_primaries', 'description': 'The video color primaries of the stream.'}, - {'name': 'Stream Video Color Range', 'type': 'srt', 'value': 'stream_video_color_range', 'description': 'The video color range of the stream.'}, + {'name': 'Stream Video Color Primaries', 'type': 'str', 'value': 'stream_video_color_primaries', 'description': 'The video color primaries of the stream.'}, + {'name': 'Stream Video Color Range', 'type': 'str', 'value': 'stream_video_color_range', 'description': 'The video color range of the stream.'}, {'name': 'Stream Video Color Space', 'type': 'str', 'value': 'stream_video_color_space', 'description': 'The video color space of the stream.'}, {'name': 'Stream Video Color Transfer Function', 'type': 'str', 'value': 'stream_video_color_trc', 'description': 'The video transfer function of the stream.'}, {'name': 'Stream Video Dynamic Range', 'type': 'str', 'value': 'stream_video_dynamic_range', 'description': 'The video dynamic range of the stream.', 'example': 'HDR or SDR'}, @@ -477,8 +477,8 @@ NOTIFICATION_PARAMETERS = [ {'name': 'Video Bitrate', 'type': 'int', 'value': 'video_bitrate', 'description': 'The video bitrate of the original media.'}, {'name': 'Video Bit Depth', 'type': 'int', 'value': 'video_bit_depth', 'description': 'The video bit depth of the original media.'}, {'name': 'Video Chroma Subsampling', 'type': 'str', 'value': 'video_chroma_subsampling', 'description': 'The video chroma subsampling of the original media.'}, - {'name': 'Video Color Primaries', 'type': 'srt', 'value': 'video_color_primaries', 'description': 'The video color primaries of the original media.'}, - {'name': 'Video Color Range', 'type': 'srt', 'value': 'video_color_range', 'description': 'The video color range of the original media.'}, + {'name': 'Video Color Primaries', 'type': 'str', 'value': 'video_color_primaries', 'description': 'The video color primaries of the original media.'}, + {'name': 'Video Color Range', 'type': 'str', 'value': 'video_color_range', 'description': 'The video color range of the original media.'}, {'name': 'Video Color Space', 'type': 'str', 'value': 'video_color_space', 'description': 'The video color space of the original media.'}, {'name': 'Video Color Transfer Function', 'type': 'str', 'value': 'video_color_trc', 'description': 'The video transfer function of the original media.'}, {'name': 'Video Dynamic Range', 'type': 'str', 'value': 'video_dynamic_range', 'description': 'The video dynamic range of the original media.', 'example': 'HDR or SDR'}, From 7ae87fe0e7b94039db7cbe648856cd75ef1027e4 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 5 Feb 2020 21:37:33 -0800 Subject: [PATCH 007/114] Fix SDR source video being identified as HDR stream video --- plexpy/__init__.py | 9 +++++++++ plexpy/pmsconnect.py | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 73f7e63a..63a93802 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -1569,6 +1569,15 @@ def dbcheck(): c_db.execute( 'ALTER TABLE session_history_media_info ADD COLUMN stream_video_dynamic_range TEXT ' ) + + result = c_db.execute('SELECT * FROM session_history_media_info ' + 'WHERE video_dynamic_range = "SDR" AND stream_video_dynamic_range = "HDR"').fetchone() + if result: + c_db.execute( + 'UPDATE session_history_media_info SET stream_video_dynamic_range = "SDR" ' + 'WHERE video_dynamic_range = "SDR" AND stream_video_dynamic_range = "HDR"' + ) + # Upgrade users table from earlier versions try: c_db.execute('SELECT do_notify FROM users') diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 297bf2e8..7867fdc4 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -1995,7 +1995,8 @@ class PmsConnect(object): else: stream_details['video_dynamic_range'] = 'SDR' - if video_details['stream_video_decision'] != 'transcode' \ + if stream_details['video_dynamic_range'] == 'HDR' \ + and video_details['stream_video_decision'] != 'transcode' \ or helpers.cast_to_int(video_details['stream_video_bit_depth']) > 8 \ and video_details['stream_video_color_space'] == 'bt2020nc': stream_details['stream_video_dynamic_range'] = 'HDR' From c825176563a21245a035514b1d870aa814d77f63 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 5 Feb 2020 21:41:31 -0800 Subject: [PATCH 008/114] v2.1.44 --- CHANGELOG.md | 10 ++++++++++ plexpy/version.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc9fcdbc..3d631062 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## v2.1.44 (2020-02-05) + +* Monitoring: + * Fix: SDR source video being identified as HDR stream video. +* Notifications: + * Fix: Unable to select condition operator for video color parameters. +* UI: + * Fix: Capitalization for platforms on history tables. + + ## v2.1.43 (2020-02-03) * Monitoring: diff --git a/plexpy/version.py b/plexpy/version.py index bb0fa335..9b23cb76 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_BRANCH = "master" -PLEXPY_RELEASE_VERSION = "v2.1.43" +PLEXPY_RELEASE_VERSION = "v2.1.44" From 66de806b02693ce1f6f3d0ca487f3b07a2868fa0 Mon Sep 17 00:00:00 2001 From: Patrick Koenig Date: Fri, 14 Feb 2020 08:11:07 -0800 Subject: [PATCH 009/114] Add crossorigin use-credentials attribute to manifest tag --- data/interfaces/default/base.html | 2 +- data/interfaces/default/login.html | 4 ++-- data/interfaces/default/welcome.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 38b7cc10..47f262f9 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -28,7 +28,7 @@ - + diff --git a/data/interfaces/default/login.html b/data/interfaces/default/login.html index 30e72046..99e906da 100644 --- a/data/interfaces/default/login.html +++ b/data/interfaces/default/login.html @@ -24,7 +24,7 @@ - + @@ -183,4 +183,4 @@ } - \ No newline at end of file + diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html index 88bafce0..10af25ae 100644 --- a/data/interfaces/default/welcome.html +++ b/data/interfaces/default/welcome.html @@ -27,7 +27,7 @@ - + From a811edb236cdb59659299bf61019912db52b3a17 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 15 Feb 2020 10:03:11 -0800 Subject: [PATCH 010/114] Fix race condition for notification stream count when stopping playback --- plexpy/notification_handler.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 2901bb80..1afbe47e 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -536,8 +536,15 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m ap = activity_processor.ActivityProcessor() sessions = ap.get_sessions() - stream_count = len(sessions) user_sessions = ap.get_sessions(user_id=session.get('user_id')) + + # Filter out the session_key from the database sessions for playback stopped events + # to prevent race condition between the database and notifications + if notify_action == 'on_stop': + sessions = [s for s in sessions if str(s['session_key']) != notify_params['session_key']] + user_sessions = [s for s in user_sessions if str(s['session_key']) != notify_params['session_key']] + + stream_count = len(sessions) user_stream_count = len(user_sessions) # Generate a combined transcode decision value From 91da41ff867facd0938c902fca3c3d1f77ed637e Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 15 Feb 2020 10:48:01 -0800 Subject: [PATCH 011/114] Fix Live TV on PMS 1.18.7.2415 crashing Tautulli activity --- plexpy/pmsconnect.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 7867fdc4..dc0c4671 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -1342,8 +1342,6 @@ class PmsConnect(object): 'parts': parts }) - video_full_resolution = helpers.get_xml_attr(media, 'videoResolution').lower() - metadata['media_info'] = medias if metadata: @@ -1819,7 +1817,7 @@ class PmsConnect(object): source_media_details = source_media_part_details = \ source_video_details = source_audio_details = source_subtitle_details = {} - if not helpers.get_xml_attr(session, 'ratingKey').isdigit(): + if stream_details['live'] or not helpers.get_xml_attr(session, 'ratingKey').isdigit(): channel_stream = 1 audio_channels = helpers.get_xml_attr(stream_media_info, 'audioChannels') @@ -1865,13 +1863,19 @@ class PmsConnect(object): 'full_title': helpers.get_xml_attr(session, 'title'), 'container': helpers.get_xml_attr(stream_media_info, 'container') \ or helpers.get_xml_attr(stream_media_parts_info, 'container'), + 'bitrate': helpers.get_xml_attr(stream_media_info, 'bitrate'), 'height': helpers.get_xml_attr(stream_media_info, 'height'), 'width': helpers.get_xml_attr(stream_media_info, 'width'), + 'aspect_ratio': helpers.get_xml_attr(stream_media_info, 'aspectRatio'), 'video_codec': helpers.get_xml_attr(stream_media_info, 'videoCodec'), 'video_resolution': helpers.get_xml_attr(stream_media_info, 'videoResolution').lower(), + 'video_full_resolution': helpers.get_xml_attr(stream_media_info, 'videoResolution').lower(), + 'video_framerate': helpers.get_xml_attr(stream_media_info, 'videoFrameRate'), + 'video_profile': helpers.get_xml_attr(stream_media_info, 'videoProfile'), 'audio_codec': helpers.get_xml_attr(stream_media_info, 'audioCodec'), 'audio_channels': audio_channels, 'audio_channel_layout': common.AUDIO_CHANNELS.get(audio_channels, audio_channels), + 'audio_profile': helpers.get_xml_attr(stream_media_info, 'audioProfile'), 'channel_icon': helpers.get_xml_attr(session, 'sourceIcon'), 'channel_title': helpers.get_xml_attr(session, 'sourceTitle'), 'extra_type': helpers.get_xml_attr(session, 'extraType'), @@ -1973,15 +1977,15 @@ class PmsConnect(object): # Override * in audio codecs if stream_details['stream_audio_codec'] == '*': - stream_details['stream_audio_codec'] = source_audio_details['audio_codec'] + stream_details['stream_audio_codec'] = source_audio_details.get('audio_codec', '') if transcode_details['transcode_audio_codec'] == '*': - transcode_details['transcode_audio_codec'] = source_audio_details['audio_codec'] + transcode_details['transcode_audio_codec'] = source_audio_details.get('audio_codec', '') # Override * in video codecs if stream_details['stream_video_codec'] == '*': - stream_details['stream_video_codec'] = source_video_details['video_codec'] + stream_details['stream_video_codec'] = source_video_details.get('video_codec', '') if transcode_details['transcode_video_codec'] == '*': - transcode_details['transcode_video_codec'] = source_video_details['video_codec'] + transcode_details['transcode_video_codec'] = source_video_details.get('video_codec', '') if media_type in ('movie', 'episode', 'clip'): # Set the full resolution by combining stream_video_resolution and stream_video_scan_type @@ -1989,8 +1993,8 @@ class PmsConnect(object): stream_details['stream_video_resolution'], stream_details['stream_video_resolution'] + (video_details['stream_video_scan_type'][:1] or 'p')) - if helpers.cast_to_int(source_video_details['video_bit_depth']) > 8 \ - and source_video_details['video_color_space'] == 'bt2020nc': + if helpers.cast_to_int(source_video_details.get('video_bit_depth')) > 8 \ + and source_video_details.get('video_color_space') == 'bt2020nc': stream_details['video_dynamic_range'] = 'HDR' else: stream_details['video_dynamic_range'] = 'SDR' @@ -2032,7 +2036,7 @@ class PmsConnect(object): if stream_details['optimized_version']: source_bitrate = helpers.cast_to_int(source_media_details.get('bitrate')) optimized_version_profile = '{} Mbps {}'.format(round(source_bitrate / 1000.0, 1), - source_media_details['video_full_resolution']) + source_media_details.get('video_full_resolution')) else: optimized_version_profile = '' From c6cfb4a020568689a61692c47e8fe44c62f8dbbd Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 15 Feb 2020 11:44:11 -0800 Subject: [PATCH 012/114] More Live TV fixes --- plexpy/pmsconnect.py | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index dc0c4671..564eed41 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -776,7 +776,7 @@ class PmsConnect(object): elif metadata_type == 'season': parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey') - show_details = self.get_metadata_details(parent_rating_key) + show_details = self.get_metadata_details(parent_rating_key) if parent_rating_key else {} metadata = {'media_type': metadata_type, 'section_id': section_id, 'library_name': library_name, @@ -790,22 +790,22 @@ class PmsConnect(object): 'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'), 'media_index': helpers.get_xml_attr(metadata_main, 'index'), 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), - 'studio': show_details['studio'], - 'content_rating': show_details['content_rating'], - 'summary': show_details['summary'], + 'studio': show_details.get('studio', ''), + 'content_rating': show_details.get('content_rating', ''), + 'summary': show_details.get('summary', ''), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), 'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'), 'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'), 'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'), 'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'), - 'duration': show_details['duration'], + 'duration': show_details.get('duration', ''), 'year': helpers.get_xml_attr(metadata_main, 'year'), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), 'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'), 'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'), 'art': helpers.get_xml_attr(metadata_main, 'art'), - 'banner': show_details['banner'], + 'banner': show_details.get('banner', ''), 'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'), 'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'), 'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'), @@ -813,12 +813,12 @@ class PmsConnect(object): 'guid': helpers.get_xml_attr(metadata_main, 'guid'), 'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'), 'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'), - 'directors': show_details['directors'], - 'writers': show_details['writers'], - 'actors': show_details['actors'], - 'genres': show_details['genres'], - 'labels': show_details['labels'], - 'collections': show_details['collections'], + 'directors': show_details.get('directors', []), + 'writers': show_details.get('writers', []), + 'actors': show_details.get('actors', []), + 'genres': show_details.get('genres', []), + 'labels': show_details.get('labels', []), + 'collections': show_details.get('collections', []), 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'), helpers.get_xml_attr(metadata_main, 'title')), 'children_count': helpers.get_xml_attr(metadata_main, 'leafCount') @@ -826,7 +826,7 @@ class PmsConnect(object): elif metadata_type == 'episode': grandparent_rating_key = helpers.get_xml_attr(metadata_main, 'grandparentRatingKey') - show_details = self.get_metadata_details(grandparent_rating_key) + show_details = self.get_metadata_details(grandparent_rating_key) if grandparent_rating_key else {} parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey') parent_media_index = helpers.get_xml_attr(metadata_main, 'parentIndex') @@ -838,7 +838,7 @@ class PmsConnect(object): parent_rating_key = parent_thumb.split('/')[3] # Try getting the parent_rating_key from the grandparent's children - if not parent_rating_key: + if not parent_rating_key and grandparent_rating_key: children_list = self.get_item_children(grandparent_rating_key) parent_rating_key = next((c['rating_key'] for c in children_list['children_list'] if c['media_index'] == parent_media_index), '') @@ -856,7 +856,7 @@ class PmsConnect(object): 'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'), 'media_index': helpers.get_xml_attr(metadata_main, 'index'), 'parent_media_index': parent_media_index, - 'studio': show_details['studio'], + 'studio': show_details.get('studio', ''), 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), @@ -871,7 +871,7 @@ class PmsConnect(object): 'parent_thumb': parent_thumb, 'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'), 'art': helpers.get_xml_attr(metadata_main, 'art'), - 'banner': show_details['banner'], + 'banner': show_details.get('banner', ''), 'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'), 'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'), 'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'), @@ -881,10 +881,10 @@ class PmsConnect(object): 'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'), 'directors': directors, 'writers': writers, - 'actors': show_details['actors'], - 'genres': show_details['genres'], - 'labels': show_details['labels'], - 'collections': show_details['collections'], + 'actors': show_details.get('actors', []), + 'genres': show_details.get('genres', []), + 'labels': show_details.get('labels', []), + 'collections': show_details.get('collections', []), 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'grandparentTitle'), helpers.get_xml_attr(metadata_main, 'title')), 'children_count': helpers.get_xml_attr(metadata_main, 'leafCount') @@ -939,7 +939,7 @@ class PmsConnect(object): elif metadata_type == 'album': parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey') - artist_details = self.get_metadata_details(parent_rating_key) + artist_details = self.get_metadata_details(parent_rating_key) if parent_rating_key else {} metadata = {'media_type': metadata_type, 'section_id': section_id, 'library_name': library_name, @@ -955,7 +955,7 @@ class PmsConnect(object): 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), 'studio': helpers.get_xml_attr(metadata_main, 'studio'), 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), - 'summary': helpers.get_xml_attr(metadata_main, 'summary') or artist_details['summary'], + 'summary': helpers.get_xml_attr(metadata_main, 'summary') or artist_details.get('summary', ''), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), 'rating': helpers.get_xml_attr(metadata_main, 'rating'), 'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'), @@ -968,7 +968,7 @@ class PmsConnect(object): 'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'), 'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'), 'art': helpers.get_xml_attr(metadata_main, 'art'), - 'banner': artist_details['banner'], + 'banner': artist_details.get('banner', ''), 'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'), 'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'), 'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'), @@ -989,7 +989,7 @@ class PmsConnect(object): elif metadata_type == 'track': parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey') - album_details = self.get_metadata_details(parent_rating_key) + album_details = self.get_metadata_details(parent_rating_key) if parent_rating_key else {} track_artist = helpers.get_xml_attr(metadata_main, 'originalTitle') or \ helpers.get_xml_attr(metadata_main, 'grandparentTitle') metadata = {'media_type': metadata_type, @@ -1015,12 +1015,12 @@ class PmsConnect(object): 'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'), 'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'), 'duration': helpers.get_xml_attr(metadata_main, 'duration'), - 'year': album_details['year'], + 'year': album_details.get('year', ''), 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), 'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'), 'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'), 'art': helpers.get_xml_attr(metadata_main, 'art'), - 'banner': album_details['banner'], + 'banner': album_details.get('banner', ''), 'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'), 'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'), 'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'), @@ -1031,9 +1031,9 @@ class PmsConnect(object): 'directors': directors, 'writers': writers, 'actors': actors, - 'genres': album_details['genres'], - 'labels': album_details['labels'], - 'collections': album_details['collections'], + 'genres': album_details.get('genres', []), + 'labels': album_details.get('labels', []), + 'collections': album_details.get('collections', []), 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'title'), track_artist), 'children_count': helpers.get_xml_attr(metadata_main, 'leafCount') @@ -1088,7 +1088,7 @@ class PmsConnect(object): elif metadata_type == 'photo': parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey') - photo_album_details = self.get_metadata_details(parent_rating_key) + photo_album_details = self.get_metadata_details(parent_rating_key) if parent_rating_key else {} metadata = {'media_type': metadata_type, 'section_id': section_id, 'library_name': library_name, @@ -1128,9 +1128,9 @@ class PmsConnect(object): 'directors': directors, 'writers': writers, 'actors': actors, - 'genres': photo_album_details.get('genres', ''), - 'labels': photo_album_details.get('labels', ''), - 'collections': photo_album_details.get('collections', ''), + 'genres': photo_album_details.get('genres', []), + 'labels': photo_album_details.get('labels', []), + 'collections': photo_album_details.get('collections', []), 'full_title': u'{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle') or library_name, helpers.get_xml_attr(metadata_main, 'title')), 'children_count': helpers.get_xml_attr(metadata_main, 'leafCount') @@ -1817,7 +1817,7 @@ class PmsConnect(object): source_media_details = source_media_part_details = \ source_video_details = source_audio_details = source_subtitle_details = {} - if stream_details['live'] or not helpers.get_xml_attr(session, 'ratingKey').isdigit(): + if not helpers.get_xml_attr(session, 'ratingKey').isdigit(): channel_stream = 1 audio_channels = helpers.get_xml_attr(stream_media_info, 'audioChannels') From ee1b0eeeff1db0c2121fd3fe725cfa791c1ca952 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 15 Feb 2020 13:29:25 -0800 Subject: [PATCH 013/114] Add Live TV metadata to activity card --- .../default/current_activity_instance.html | 35 +++++++++++++-- data/interfaces/default/index.html | 21 +++++++-- plexpy/pmsconnect.py | 45 +++++++++++-------- 3 files changed, 75 insertions(+), 26 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index c69b295e..4e0b609a 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -96,7 +96,13 @@ DOCUMENTATION :: END
% endif % if data['live'] == 1: + % if data['grandparent_thumb'].startswith('http'): +
+ % elif data['grandparent_thumb']: +
+ % else:
+ % endif % elif data['channel_stream'] == 0: % if data['media_type'] == 'movie': @@ -377,7 +383,7 @@ DOCUMENTATION :: END
% if data['live'] == 1: -
Live
+
Live
% else:
${data['transcode_progress']}%
${data['progress_percent']}%
@@ -400,7 +406,16 @@ DOCUMENTATION :: END % endif
- % if data['channel_stream'] == 0: + % if data['live'] == 1: + % if data['media_type'] == 'movie': + ${data['title']} + % elif data['media_type'] == 'episode': + ${data['grandparent_title']} + - ${data['title']} + % else: + ${data['title']} + % endif + % elif data['channel_stream'] == 0: % if data['media_type'] == 'movie': ${data['title']} % elif data['media_type'] == 'episode': @@ -425,7 +440,7 @@ DOCUMENTATION :: END
- % if data['live'] == 1: + % if data['live'] == 1 and data['media_type'] == 'clip':
 
@@ -449,8 +464,20 @@ DOCUMENTATION :: END
% endif
- % if data['live'] == 1: + % if data['live']: + % if data['media_type'] == 'movie': + ${data['year']} + % elif data['media_type'] == 'episode': + S${data['parent_media_index']} + · E${data['media_index']} + % else: Plex Live TV + % endif + % if data['channel_identifier']: + + (${data['channel_call_sign']} ${data['channel_identifier']}) + + % endif % elif data['channel_stream'] == 0: % if data['media_type'] == 'movie': ${data['year']} diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index d6b479d5..04f34678 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -543,10 +543,12 @@ // Update the progress bars, percent - 3 because of 3px padding-right $('#buffer-bar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%') .attr('data-original-title', 'Transcoder Progress ' + s.transcode_progress + '%'); - var progress_bar = $('#progress-bar-' + key); - progress_bar.data('state', s.state); - if (progress_bar.data('last_view_offset') !== s.view_offset) { - progress_bar.data('last_view_offset', s.view_offset).data('view_offset', s.view_offset); + if (s.live !== 1) { + var progress_bar = $('#progress-bar-' + key); + progress_bar.data('state', s.state); + if (progress_bar.data('last_view_offset') !== s.view_offset) { + progress_bar.data('last_view_offset', s.view_offset).data('view_offset', s.view_offset); + } } // Add temporary class so we know which instances are still active @@ -593,6 +595,17 @@ $('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller').scrollbar(); $('#activity-instance-' + session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 }); + $('#activity-instance-' + session_key + ' [data-toggle=popover]').popover({ + html: true, + container: 'body', + trigger: 'hover', + placement: 'right', + delay: 50, + template: '', + content: function () { + return '
'; + } + }); $('#terminate-button-' + session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 }); lockScroll('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller'); diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 564eed41..1b295a77 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -641,6 +641,8 @@ class PmsConnect(object): if metadata_main.nodeName == 'Directory' and metadata_type == 'photo': metadata_type = 'photo_album' + live = int(helpers.get_xml_attr(metadata_main, 'live') == '1') + section_id = helpers.get_xml_attr(a, 'librarySectionID') library_name = helpers.get_xml_attr(a, 'librarySectionTitle') @@ -1323,24 +1325,31 @@ class PmsConnect(object): audio_channels = helpers.get_xml_attr(media, 'audioChannels') - medias.append({'id': helpers.get_xml_attr(media, 'id'), - 'container': helpers.get_xml_attr(media, 'container'), - 'bitrate': helpers.get_xml_attr(media, 'bitrate'), - 'height': helpers.get_xml_attr(media, 'height'), - 'width': helpers.get_xml_attr(media, 'width'), - 'aspect_ratio': helpers.get_xml_attr(media, 'aspectRatio'), - 'video_codec': helpers.get_xml_attr(media, 'videoCodec'), - 'video_resolution': video_resolution, - 'video_full_resolution': video_full_resolution, - 'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'), - 'video_profile': helpers.get_xml_attr(media, 'videoProfile'), - 'audio_codec': helpers.get_xml_attr(media, 'audioCodec'), - 'audio_channels': audio_channels, - 'audio_channel_layout': common.AUDIO_CHANNELS.get(audio_channels, audio_channels), - 'audio_profile': helpers.get_xml_attr(media, 'audioProfile'), - 'optimized_version': int(helpers.get_xml_attr(media, 'proxyType') == '42'), - 'parts': parts - }) + media_info = {'id': helpers.get_xml_attr(media, 'id'), + 'container': helpers.get_xml_attr(media, 'container'), + 'bitrate': helpers.get_xml_attr(media, 'bitrate'), + 'height': helpers.get_xml_attr(media, 'height'), + 'width': helpers.get_xml_attr(media, 'width'), + 'aspect_ratio': helpers.get_xml_attr(media, 'aspectRatio'), + 'video_codec': helpers.get_xml_attr(media, 'videoCodec'), + 'video_resolution': video_resolution, + 'video_full_resolution': video_full_resolution, + 'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'), + 'video_profile': helpers.get_xml_attr(media, 'videoProfile'), + 'audio_codec': helpers.get_xml_attr(media, 'audioCodec'), + 'audio_channels': audio_channels, + 'audio_channel_layout': common.AUDIO_CHANNELS.get(audio_channels, audio_channels), + 'audio_profile': helpers.get_xml_attr(media, 'audioProfile'), + 'optimized_version': int(helpers.get_xml_attr(media, 'proxyType') == '42'), + 'parts': parts + } + + if live: + media_info['channel_call_sign'] = helpers.get_xml_attr(media, 'channelCallSign') or 'WBTV HD' + media_info['channel_identifier'] = helpers.get_xml_attr(media, 'channelIdentifier') or '3.1' + media_info['channel_thumb'] = helpers.get_xml_attr(media, 'channelThumb') or 'http://cps-static.rovicorp.com/2/Open/2400x2400_1578/Source/77752/cbs_2400_color_dark_light.png' + + medias.append(media_info) metadata['media_info'] = medias From 9aea4c85b0a51786ab83074d289ef5b585b9cfb6 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 15 Feb 2020 14:28:19 -0800 Subject: [PATCH 014/114] Remove test parameters from Live TV --- plexpy/pmsconnect.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 1b295a77..d110a2e0 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -1345,9 +1345,9 @@ class PmsConnect(object): } if live: - media_info['channel_call_sign'] = helpers.get_xml_attr(media, 'channelCallSign') or 'WBTV HD' - media_info['channel_identifier'] = helpers.get_xml_attr(media, 'channelIdentifier') or '3.1' - media_info['channel_thumb'] = helpers.get_xml_attr(media, 'channelThumb') or 'http://cps-static.rovicorp.com/2/Open/2400x2400_1578/Source/77752/cbs_2400_color_dark_light.png' + media_info['channel_call_sign'] = helpers.get_xml_attr(media, 'channelCallSign') + media_info['channel_identifier'] = helpers.get_xml_attr(media, 'channelIdentifier') + media_info['channel_thumb'] = helpers.get_xml_attr(media, 'channelThumb') medias.append(media_info) From 26f10b2c3d9abb0e79c9de99196451b5223d50db Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 15 Feb 2020 14:36:51 -0800 Subject: [PATCH 015/114] Add poster to activity card for Live TV movies --- .../interfaces/default/current_activity_instance.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 4e0b609a..66925d9f 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -96,10 +96,13 @@ DOCUMENTATION :: END
% endif % if data['live'] == 1: - % if data['grandparent_thumb'].startswith('http'): -
- % elif data['grandparent_thumb']: -
+ <% + live_thumb = data['grandparent_thumb'] or data['thumb'] + %> + % if live_thumb.startswith('http'): +
+ % elif live_thumb: +
% else:
% endif From 13a45facf99d2089c7e3f6c625a821813f5e8f53 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 15 Feb 2020 20:14:50 -0800 Subject: [PATCH 016/114] Update pms_image_proxy to work with web URLs --- .../default/current_activity_instance.html | 24 ++------------ plexpy/common.py | 10 ++++++ plexpy/pmsconnect.py | 8 +++-- plexpy/webserve.py | 32 +++++++------------ 4 files changed, 30 insertions(+), 44 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 66925d9f..85720937 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -62,7 +62,6 @@ DOCUMENTATION :: END % if session is not None: <% from collections import defaultdict - from urllib import quote from plexpy import helpers from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES import plexpy @@ -81,14 +80,11 @@ DOCUMENTATION :: END
<% if data['live'] == 1: - background_url = 'images/art-live.png' + background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art-live&refresh=true' elif data['channel_stream'] == 0: background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true' else: - if (data['art'] and data['art'].startswith('http')) or (data['thumb'] and data['thumb'].startswith('http')): - background_url = data['art'] - else: - background_url = 'pms_image_proxy?img=' + quote(data['art'] or data['thumb']) + '&width=500&height=280&fallback=art&refresh=true&clip=true' + background_url = 'pms_image_proxy?img=' + (data['art'] or data['thumb']) + '&width=500&height=280&fallback=art&refresh=true&clip=true' %>
diff --git a/plexpy/common.py b/plexpy/common.py index 1b74989f..c944ff79 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -34,11 +34,21 @@ DEFAULT_USER_THUMB = "interfaces/default/images/gravatar-default-80x80.png" DEFAULT_POSTER_THUMB = "interfaces/default/images/poster.png" DEFAULT_COVER_THUMB = "interfaces/default/images/cover.png" DEFAULT_ART = "interfaces/default/images/art.png" +DEFAULT_LIVE_TV_POSTER_THUMB = "interfaces/default/images/poster-live.png" +DEFAULT_LIVE_TV_ART = "interfaces/default/images/art-live.png" ONLINE_POSTER_THUMB = "https://tautulli.com/images/poster.png" ONLINE_COVER_THUMB = "https://tautulli.com/images/cover.png" ONLINE_ART = "https://tautulli.com/images/art.png" +DEFAULT_IMAGES = { + 'poster': DEFAULT_POSTER_THUMB, + 'cover': DEFAULT_COVER_THUMB, + 'art': DEFAULT_ART, + 'poster-live': DEFAULT_LIVE_TV_POSTER_THUMB, + 'poster-art': DEFAULT_LIVE_TV_ART +} + MEDIA_TYPE_HEADERS = { 'movie': 'Movies', 'show': 'TV Shows', diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index d110a2e0..fdca4d2e 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -2694,10 +2694,14 @@ class PmsConnect(object): height = height or 1500 if img: - if refresh: + web_img = img.startswith('http') + + if refresh and not web_img: img = '{}/{}'.format(img.rstrip('/'), int(time.time())) - if clip: + if web_img: + params = {'url': '%s' % img} + elif clip: params = {'url': '%s&%s' % (img, urllib.urlencode({'X-Plex-Token': self.token}))} else: params = {'url': 'http://127.0.0.1:32400%s?%s' % (img, urllib.urlencode({'X-Plex-Token': self.token}))} diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 474e2122..a206c327 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -4038,7 +4038,7 @@ class WebInterface(object): background (str): 282828 blur (str): 3 img_format (str): png - fallback (str): "poster", "cover", "art" + fallback (str): "poster", "cover", "art", "poster-live", "poster-art" refresh (bool): True or False whether to refresh the image cache return_hash (bool): True or False to return the self-hosted image hash instead of the image @@ -4058,9 +4058,12 @@ class WebInterface(object): else: img = '/library/metadata/{}/thumb'.format(rating_key) - img_split = img.split('/') - img = '/'.join(img_split[:5]) - rating_key = rating_key or img_split[3] + web_img = img.startswith('http') + + if not web_img: + img_split = img.split('/') + img = '/'.join(img_split[:5]) + rating_key = rating_key or img_split[3] img_hash = notification_handler.set_hash_image_info( img=img, rating_key=rating_key, width=width, height=height, @@ -4111,15 +4114,8 @@ class WebInterface(object): except Exception as e: logger.warn(u'Failed to get image %s, falling back to %s.' % (img, fallback)) - fbi = None - if fallback == 'poster': - fbi = common.DEFAULT_POSTER_THUMB - elif fallback == 'cover': - fbi = common.DEFAULT_COVER_THUMB - elif fallback == 'art': - fbi = common.DEFAULT_ART - - if fbi: + if fallback in common.DEFAULT_IMAGES: + fbi = common.DEFAULT_IMAGES[fallback] fp = os.path.join(plexpy.PROG_DIR, 'data', fbi) return serve_file(path=fp, content_type='image/png') @@ -4137,14 +4133,8 @@ class WebInterface(object): img_hash = args[0].split('.')[0] - if img_hash in ('poster', 'cover', 'art'): - if img_hash == 'poster': - fbi = common.DEFAULT_POSTER_THUMB - elif img_hash == 'cover': - fbi = common.DEFAULT_COVER_THUMB - elif img_hash == 'art': - fbi = common.DEFAULT_ART - + if img_hash in common.DEFAULT_IMAGES: + fbi = common.DEFAULT_IMAGES[img_hash] fp = os.path.join(plexpy.PROG_DIR, 'data', fbi) return serve_file(path=fp, content_type='image/png') From 66c1fd6593b0c2b9db89812aac6beecf01b8703d Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 16 Feb 2020 14:54:48 -0800 Subject: [PATCH 017/114] Save Live TV sessions to the database --- plexpy/__init__.py | 38 ++++++++++++++++++++++++++++++++++-- plexpy/activity_processor.py | 13 ++++++++++-- plexpy/datafactory.py | 10 +++++++++- plexpy/pmsconnect.py | 9 +++++---- 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 63a93802..15188922 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -604,7 +604,8 @@ def dbcheck(): 'transcode_hw_decoding INTEGER, transcode_hw_encoding INTEGER, ' 'optimized_version INTEGER, optimized_version_profile TEXT, optimized_version_title TEXT, ' 'synced_version INTEGER, synced_version_profile TEXT, ' - 'live INTEGER, live_uuid TEXT, secure INTEGER, relayed INTEGER, ' + 'live INTEGER, live_uuid TEXT, channel_call_sign TEXT, channel_identifier TEXT, channel_thumb TEXT, ' + 'secure INTEGER, relayed INTEGER, ' 'buffer_count INTEGER DEFAULT 0, buffer_last_triggered INTEGER, last_paused INTEGER, watched INTEGER DEFAULT 0, ' 'write_attempts INTEGER DEFAULT 0, raw_stream_info TEXT)' ) @@ -652,7 +653,7 @@ def dbcheck(): 'art TEXT, media_type TEXT, year INTEGER, originally_available_at TEXT, added_at INTEGER, updated_at INTEGER, ' 'last_viewed_at INTEGER, content_rating TEXT, summary TEXT, tagline TEXT, rating TEXT, ' 'duration INTEGER DEFAULT 0, guid TEXT, directors TEXT, writers TEXT, actors TEXT, genres TEXT, studio TEXT, ' - 'labels TEXT)' + 'labels TEXT, live INTEGER DEFAULT 0, channel_call_sign TEXT, channel_identifier TEXT, channel_thumb TEXT)' ) # users table :: This table keeps record of the friends list @@ -1220,6 +1221,21 @@ def dbcheck(): 'ALTER TABLE sessions ADD COLUMN stream_video_dynamic_range TEXT' ) + # Upgrade sessions table from earlier versions + try: + c_db.execute('SELECT channel_identifier FROM sessions') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table sessions.") + c_db.execute( + 'ALTER TABLE sessions ADD COLUMN channel_call_sign TEXT' + ) + c_db.execute( + 'ALTER TABLE sessions ADD COLUMN channel_identifier TEXT' + ) + c_db.execute( + 'ALTER TABLE sessions ADD COLUMN channel_thumb TEXT' + ) + # Upgrade session_history table from earlier versions try: c_db.execute('SELECT reference_id FROM session_history') @@ -1327,6 +1343,24 @@ def dbcheck(): 'ALTER TABLE session_history_metadata ADD COLUMN original_title TEXT' ) + # Upgrade session_history_metadata table from earlier versions + try: + c_db.execute('SELECT live FROM session_history_metadata') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table session_history_metadata.") + c_db.execute( + 'ALTER TABLE session_history_metadata ADD COLUMN live INTEGER DEFAULT 0' + ) + c_db.execute( + 'ALTER TABLE session_history_metadata ADD COLUMN channel_call_sign TEXT' + ) + c_db.execute( + 'ALTER TABLE session_history_metadata ADD COLUMN channel_identifier TEXT' + ) + c_db.execute( + 'ALTER TABLE session_history_metadata ADD COLUMN channel_thumb TEXT' + ) + # Upgrade session_history_media_info table from earlier versions try: c_db.execute('SELECT transcode_decision FROM session_history_media_info') diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index 03df9fb5..5c84dfbf 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -235,7 +235,12 @@ class ActivityProcessor(object): if not is_import: logger.debug(u"Tautulli ActivityProcessor :: Fetching metadata for item ratingKey %s" % session['rating_key']) pms_connect = pmsconnect.PmsConnect() - metadata = pms_connect.get_metadata_details(rating_key=str(session['rating_key'])) + if session['live']: + metadata = pms_connect.get_metadata_details(rating_key=str(session['rating_key']), + cache_key=session['session_key'], + skip_cache_time=True) + else: + metadata = pms_connect.get_metadata_details(rating_key=str(session['rating_key'])) if not metadata: return False else: @@ -453,7 +458,11 @@ class ActivityProcessor(object): 'actors': actors, 'genres': genres, 'studio': metadata['studio'], - 'labels': labels + 'labels': labels, + 'live': session['live'], + 'channel_call_sign': metadata['channel_call_sign'], + 'channel_identifier': metadata['channel_identifier'], + 'channel_thumb': metadata['channel_thumb'] } # logger.debug(u"Tautulli ActivityProcessor :: Writing sessionKey %s session_history_metadata transaction..." diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 1e635e0f..e35a3dbd 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -94,6 +94,7 @@ class DataFactory(object): 'session_history_metadata.thumb', 'session_history_metadata.parent_thumb', 'session_history_metadata.grandparent_thumb', + 'session_history_metadata.live', 'MAX((CASE WHEN (view_offset IS NULL OR view_offset = "") THEN 0.1 ELSE view_offset * 1.0 END) / \ (CASE WHEN (session_history_metadata.duration IS NULL OR session_history_metadata.duration = "") \ THEN 1.0 ELSE session_history_metadata.duration * 1.0 END) * 100) AS percent_complete', @@ -142,6 +143,7 @@ class DataFactory(object): 'thumb', 'parent_thumb', 'grandparent_thumb', + 'live', 'MAX((CASE WHEN (view_offset IS NULL OR view_offset = "") THEN 0.1 ELSE view_offset * 1.0 END) / \ (CASE WHEN (duration IS NULL OR duration = "") \ THEN 1.0 ELSE duration * 1.0 END) * 100) AS percent_complete', @@ -206,6 +208,9 @@ class DataFactory(object): else: thumb = item['thumb'] + if item['live']: + item['percent_complete'] = 100 + if item['percent_complete'] >= watched_percent[item['media_type']]: watched_status = 1 elif item['percent_complete'] >= watched_percent[item['media_type']]/2: @@ -230,6 +235,7 @@ class DataFactory(object): 'product': item['product'], 'player': item['player'], 'ip_address': item['ip_address'], + 'live': item['live'], 'media_type': item['media_type'], 'rating_key': item['rating_key'], 'parent_rating_key': item['parent_rating_key'], @@ -1016,7 +1022,9 @@ class DataFactory(object): 'session_history_media_info.container, session_history_media_info.bitrate, ' \ 'session_history_media_info.video_codec, session_history_media_info.video_resolution, ' \ 'session_history_media_info.video_framerate, session_history_media_info.audio_codec, ' \ - 'session_history_media_info.audio_channels ' \ + 'session_history_media_info.audio_channels, session_history_metadata.live, ' \ + 'session_history_metadata.channel_call_sign, session_history_metadata.channel_identifier, ' \ + 'session_history_metadata.channel_thumb ' \ 'FROM session_history_metadata ' \ 'JOIN library_sections ON session_history_metadata.section_id = library_sections.section_id ' \ 'JOIN session_history_media_info ON session_history_metadata.id = session_history_media_info.id ' \ diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index fdca4d2e..d83cfd16 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -571,7 +571,7 @@ class PmsConnect(object): return output - def get_metadata_details(self, rating_key='', sync_id='', cache_key=None, media_info=True): + def get_metadata_details(self, rating_key='', sync_id='', cache_key=None, skip_cache_time=False, media_info=True): """ Return processed and validated metadata list for requested item. @@ -597,7 +597,7 @@ class PmsConnect(object): if metadata: _cache_time = metadata.pop('_cache_time', 0) # Return cached metadata if less than METADATA_CACHE_SECONDS ago - if int(time.time()) - _cache_time <= plexpy.CONFIG.METADATA_CACHE_SECONDS: + if skip_cache_time or int(time.time()) - _cache_time <= plexpy.CONFIG.METADATA_CACHE_SECONDS: return metadata if rating_key: @@ -641,8 +641,6 @@ class PmsConnect(object): if metadata_main.nodeName == 'Directory' and metadata_type == 'photo': metadata_type = 'photo_album' - live = int(helpers.get_xml_attr(metadata_main, 'live') == '1') - section_id = helpers.get_xml_attr(a, 'librarySectionID') library_name = helpers.get_xml_attr(a, 'librarySectionTitle') @@ -1344,7 +1342,10 @@ class PmsConnect(object): 'parts': parts } + live = int(helpers.get_xml_attr(metadata_main, 'live') == '1') + if live: + media_info['live'] = live media_info['channel_call_sign'] = helpers.get_xml_attr(media, 'channelCallSign') media_info['channel_identifier'] = helpers.get_xml_attr(media, 'channelIdentifier') media_info['channel_thumb'] = helpers.get_xml_attr(media, 'channelThumb') From f94b796c2b0865eddb453c358d4eb0c6fd12412f Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 16 Feb 2020 16:06:43 -0800 Subject: [PATCH 018/114] Fix saving channel info to database --- plexpy/activity_processor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index 5c84dfbf..7567c8dc 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -460,9 +460,9 @@ class ActivityProcessor(object): 'studio': metadata['studio'], 'labels': labels, 'live': session['live'], - 'channel_call_sign': metadata['channel_call_sign'], - 'channel_identifier': metadata['channel_identifier'], - 'channel_thumb': metadata['channel_thumb'] + 'channel_call_sign': media_info.get('channel_call_sign', ''), + 'channel_identifier': media_info.get('channel_identifier', ''), + 'channel_thumb': media_info.get('channel_thumb', '') } # logger.debug(u"Tautulli ActivityProcessor :: Writing sessionKey %s session_history_metadata transaction..." From 3d65ffc6d358a6224d071d8d752a839661cc3f68 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 16 Feb 2020 16:23:42 -0800 Subject: [PATCH 019/114] Update font-awesome icon for Live TV --- .../default/current_activity_instance.html | 8 +-- .../default/js/tables/history_table.js | 15 ++++-- .../default/js/tables/history_table_modal.js | 15 ++++-- .../interfaces/default/js/tables/libraries.js | 50 +++++++------------ data/interfaces/default/js/tables/user_ips.js | 31 ++++++++---- data/interfaces/default/js/tables/users.js | 15 ++++-- 6 files changed, 78 insertions(+), 56 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 85720937..30ffb207 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -425,9 +425,9 @@ DOCUMENTATION :: END
- % if data['live'] == 1 and data['media_type'] == 'clip': -
-   + % if data['live']: +
+  
% elif data['channel_stream'] == 0:
@@ -456,7 +456,7 @@ DOCUMENTATION :: END S${data['parent_media_index']} · E${data['media_index']} % else: - Plex Live TV + Live TV % endif % if data['channel_identifier']: diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index 2011ebaa..9df1ef01 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -156,19 +156,26 @@ history_table_options = { "data": "full_title", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { + var icon = ''; + var icon_title = ''; var parent_info = ''; var media_type = ''; var thumb_popover = ''; + var fallback = (rowData['live']) ? 'poster-live' : 'poster'; var source = (rowData['state'] === null) ? 'source=history&' : ''; if (rowData['media_type'] === 'movie') { + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; } - media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'episode') { + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (S' + rowData['parent_media_index'] + ' · E' + rowData['media_index'] + ')'; } - media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'track') { if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js index 59d3357d..c1bff4cd 100644 --- a/data/interfaces/default/js/tables/history_table_modal.js +++ b/data/interfaces/default/js/tables/history_table_modal.js @@ -98,18 +98,25 @@ history_table_modal_options = { "data":"full_title", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { + var icon = ''; + var icon_title = ''; var parent_info = ''; var media_type = ''; var thumb_popover = ''; + var fallback = (rowData['live']) ? 'poster-live' : 'poster'; if (rowData['media_type'] === 'movie') { + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; } - media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'episode') { + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (S' + rowData['parent_media_index'] + ' · E' + rowData['media_index'] + ')'; } - media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'track') { if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js index 5c2c334d..f32fa7e4 100644 --- a/data/interfaces/default/js/tables/libraries.js +++ b/data/interfaces/default/js/tables/libraries.js @@ -137,45 +137,33 @@ libraries_list_table_options = { "data":"last_played", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== null && cellData !== '') { + var icon = ''; + var icon_title = ''; var parent_info = ''; var media_type = ''; var thumb_popover = ''; + var fallback = (rowData['live']) ? 'poster-live' : 'poster'; if (rowData['media_type'] === 'movie') { - media_type = ''; - if (rowData['rating_key']) { - if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; } - thumb_popover = '' + cellData + parent_info + '' - $(td).html('
' + media_type + ' ' + thumb_popover + '
'); - } else { - thumb_popover = '' + cellData + parent_info + '' - $(td).html('
' + media_type + ' ' + thumb_popover + '
'); - } + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; + if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; } + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' + $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'episode') { - media_type = ''; - if (rowData['rating_key']) { - if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (S' + rowData['parent_media_index'] + ' · E' + rowData['media_index'] + ')'; } - thumb_popover = '' + cellData + parent_info + '' - $(td).html('
' + media_type + ' ' + thumb_popover + '
'); - } else { - thumb_popover = '' + cellData + parent_info + '' - $(td).html('
' + media_type + ' ' + thumb_popover + '
'); - } + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; + if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (S' + rowData['parent_media_index'] + ' · E' + rowData['media_index'] + ')'; } + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' + $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'track') { + if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } media_type = ''; - if (rowData['rating_key']) { - if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } - thumb_popover = '' + cellData + parent_info + '' - $(td).html('
' + media_type + ' ' + thumb_popover + '
'); - } else { - thumb_popover = '' + cellData + parent_info + '' - $(td).html('
' + media_type + ' ' + thumb_popover + '
'); - } + thumb_popover = '' + cellData + parent_info + '' + $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type']) { - if (rowData['rating_key']) { - $(td).html('' + cellData + ''); - } else { - $(td).html(cellData); - } + $(td).html('' + cellData + ''); } } else { $(td).html('n/a'); diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js index 046adc65..292b2191 100644 --- a/data/interfaces/default/js/tables/user_ips.js +++ b/data/interfaces/default/js/tables/user_ips.js @@ -82,29 +82,42 @@ user_ip_table_options = { "data": "last_played", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { + var icon = ''; + var icon_title = ''; var parent_info = ''; var media_type = ''; var thumb_popover = ''; + var fallback = (rowData['live']) ? 'poster-live' : 'poster'; if (rowData['media_type'] === 'movie') { - if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; } - media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; + if (rowData['year']) { + parent_info = ' (' + rowData['year'] + ')'; + } + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'episode') { - if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (S' + rowData['parent_media_index'] + ' · E' + rowData['media_index'] + ')'; } - media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; + if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { + parent_info = ' (S' + rowData['parent_media_index'] + ' · E' + rowData['media_index'] + ')'; + } + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'track') { - if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } + if (rowData['parent_title']) { + parent_info = ' (' + rowData['parent_title'] + ')'; + } media_type = ''; thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type']) { $(td).html('' + cellData + ''); - } else { - $(td).html('n/a'); } + } else { + $(td).html('n/a'); } }, "width": "30%", diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js index bc9caf5b..f7151542 100644 --- a/data/interfaces/default/js/tables/users.js +++ b/data/interfaces/default/js/tables/users.js @@ -157,18 +157,25 @@ users_list_table_options = { "data":"last_played", "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== null && cellData !== '') { + var icon = ''; + var icon_title = ''; var parent_info = ''; var media_type = ''; var thumb_popover = ''; + var fallback = (rowData['live']) ? 'poster-live' : 'poster'; if (rowData['media_type'] === 'movie') { + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; } - media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'episode') { + icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television'; + icon_title = (rowData['live']) ? 'Live TV' : 'Movie'; if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (S' + rowData['parent_media_index'] + ' · E' + rowData['media_index'] + ')'; } - media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + media_type = ''; + thumb_popover = '' + cellData + parent_info + '' $(td).html('
' + media_type + ' ' + thumb_popover + '
'); } else if (rowData['media_type'] === 'track') { if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } From ca55900d40e969da7a037f2aa6c54c9fb540b3ae Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 16 Feb 2020 16:23:58 -0800 Subject: [PATCH 020/114] Update info page for Live TV --- .../default/current_activity_instance.html | 30 ++++++--- data/interfaces/default/info.html | 67 +++++++++++++++++-- plexpy/webserve.py | 2 +- 3 files changed, 81 insertions(+), 18 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 30ffb207..e6c1ab0b 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -79,7 +79,7 @@ DOCUMENTATION :: END data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
<% - if data['live'] == 1: + if data['live']: background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art-live&refresh=true' elif data['channel_stream'] == 0: background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true' @@ -91,8 +91,18 @@ DOCUMENTATION :: END % if data['media_type'] == 'track':
% endif - % if data['live'] == 1: + % if data['live']: + % if data['media_type'] == 'movie': + +
+ + % elif data['media_type'] == 'episode': + +
+ + % else:
+ % endif % elif data['channel_stream'] == 0: % if data['media_type'] == 'movie': @@ -337,7 +347,7 @@ DOCUMENTATION :: END
% if data['media_type'] != 'photo':
- % if data['live'] == 1: + % if data['live']:
Live % elif data['view_offset']: ETA: @@ -367,7 +377,7 @@ DOCUMENTATION :: END
- % if data['live'] == 1: + % if data['live']:
Live
% else:
${data['transcode_progress']}%
@@ -391,12 +401,12 @@ DOCUMENTATION :: END % endif
- % if data['live'] == 1: + % if data['live']: % if data['media_type'] == 'movie': - ${data['title']} + ${data['title']} % elif data['media_type'] == 'episode': - ${data['grandparent_title']} - - ${data['title']} + ${data['grandparent_title']} + - ${data['title']} % else: ${data['title']} % endif @@ -453,8 +463,8 @@ DOCUMENTATION :: END % if data['media_type'] == 'movie': ${data['year']} % elif data['media_type'] == 'episode': - S${data['parent_media_index']} - · E${data['media_index']} + S${data['parent_media_index']} + · E${data['media_index']} % else: Live TV % endif diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index a2bb4d2b..1b0ce616 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -36,6 +36,7 @@ DOCUMENTATION :: END <%! + from collections import defaultdict import re from plexpy import notifiers @@ -68,8 +69,11 @@ DOCUMENTATION :: END <%def name="body()"> -% if data: -<% media_info = data['media_info'][0] if data['media_info'] else {} %> +% if metadata: +<% + data = defaultdict(lambda: None, **metadata) + media_info = defaultdict(lambda: None, **(data['media_info'][0] if data['media_info'] else {})) +%>
@@ -81,7 +85,23 @@ DOCUMENTATION :: END
    - % if data['media_type'] in ('movie', 'collection'): + % if media_info['live']: +
  • Live TV
    • + + % if data['media_type'] == 'movie': +
  • ${data['title']}
    • + % elif data['media_type'] == 'episode': + + + % if data['media_index']: +
  • Season ${data['parent_media_index']}
    • + +
  • Episode ${data['media_index']} - ${data['title']}
    • + % else: +
  • ${data['title']}
    • + % endif + % endif + % elif data['media_type'] in ('movie', 'collection'):
  • ${data['library_name']}
  • ${data['title']}
    • @@ -134,6 +154,13 @@ DOCUMENTATION :: END % else: % endif + % if media_info['live']: +
    +
    + +
    +
    + % else: % if data['media_type'] == 'episode':
    @@ -162,10 +189,21 @@ DOCUMENTATION :: END % endif % endif + % endif
    - % if data['media_type'] in ('movie', 'show', 'artist', 'collection'): + % if media_info['live']: + % if data['media_type'] == 'movie': +

     

    ${data['title']}

    + % elif data['media_type'] == 'eipsode': +

    ${data['grandparent_title']}

    +

    ${data['title']}

    + % if data['media_index']: + + % endif + % endif + % elif data['media_type'] in ('movie', 'show', 'artist', 'collection'):

     

    ${data['title']}

    % elif data['media_type'] == 'season':

     

    ${data['parent_title']}

    @@ -187,7 +225,7 @@ DOCUMENTATION :: END
    - % if data['media_type'] == 'movie': + % if data['media_type'] == 'movie' or media_info['live']: % if data['tagline']:
    @@ -474,6 +519,10 @@ DOCUMENTATION :: END <%def name="modalIncludes()"> +% if metadata: +<% + data = defaultdict(None, **metadata) +%>
    +% endif <%def name="javascriptIncludes()"> @@ -558,7 +608,10 @@ DOCUMENTATION :: END -% if data: +% if metadata: +<% + data = defaultdict(None, **metadata) +%> % if data['media_type'] in ('show', 'artist'): -% if data['media_type'] in ('show', 'artist'): +% if data['live']: + +% elif data['media_type'] in ('show', 'artist'): % if data.get('poster_url'): % if data.get('poster_url'): % if data: +<% from plexpy.common import LIVE_TV_SECTION_ID %> @@ -391,6 +408,7 @@ hc_plays_by_day_options.yAxis.min = 0; hc_plays_by_day_options.xAxis.categories = dateArray; hc_plays_by_day_options.series = getGraphVisibility(hc_plays_by_day_options.chart.renderTo, data.series); + hc_plays_by_day_options.colors = getGraphColors(data.series); var hc_plays_by_day = new Highcharts.Chart(hc_plays_by_day_options); } }); @@ -404,6 +422,7 @@ if (yaxis === 'duration') { dataSecondsToHours(data); } hc_plays_by_dayofweek_options.xAxis.categories = data.categories; hc_plays_by_dayofweek_options.series = getGraphVisibility(hc_plays_by_dayofweek_options.chart.renderTo, data.series); + hc_plays_by_dayofweek_options.colors = getGraphColors(data.series); var hc_plays_by_dayofweek = new Highcharts.Chart(hc_plays_by_dayofweek_options); } }); @@ -417,6 +436,7 @@ if (yaxis === 'duration') { dataSecondsToHours(data); } hc_plays_by_hourofday_options.xAxis.categories = data.categories; hc_plays_by_hourofday_options.series = getGraphVisibility(hc_plays_by_hourofday_options.chart.renderTo, data.series); + hc_plays_by_hourofday_options.colors = getGraphColors(data.series); var hc_plays_by_hourofday = new Highcharts.Chart(hc_plays_by_hourofday_options); } }); @@ -430,6 +450,7 @@ if (yaxis === 'duration') { dataSecondsToHours(data); } hc_plays_by_platform_options.xAxis.categories = data.categories; hc_plays_by_platform_options.series = getGraphVisibility(hc_plays_by_platform_options.chart.renderTo, data.series); + hc_plays_by_platform_options.colors = getGraphColors(data.series); var hc_plays_by_platform = new Highcharts.Chart(hc_plays_by_platform_options); } }); @@ -443,6 +464,7 @@ if (yaxis === 'duration') { dataSecondsToHours(data); } hc_plays_by_user_options.xAxis.categories = data.categories; hc_plays_by_user_options.series = getGraphVisibility(hc_plays_by_user_options.chart.renderTo, data.series); + hc_plays_by_user_options.colors = getGraphColors(data.series); var hc_plays_by_user = new Highcharts.Chart(hc_plays_by_user_options); } }); @@ -479,6 +501,7 @@ hc_plays_by_stream_type_options.yAxis.min = 0; hc_plays_by_stream_type_options.xAxis.categories = dateArray; hc_plays_by_stream_type_options.series = getGraphVisibility(hc_plays_by_stream_type_options.chart.renderTo, data.series); + hc_plays_by_stream_type_options.colors = getGraphColors(data.series); var hc_plays_by_stream_type = new Highcharts.Chart(hc_plays_by_stream_type_options); } }); @@ -492,6 +515,7 @@ if (yaxis === 'duration') { dataSecondsToHours(data); } hc_plays_by_source_resolution_options.xAxis.categories = data.categories; hc_plays_by_source_resolution_options.series = getGraphVisibility(hc_plays_by_source_resolution_options.chart.renderTo, data.series); + hc_plays_by_source_resolution_options.colors = getGraphColors(data.series); var hc_plays_by_source_resolution = new Highcharts.Chart(hc_plays_by_source_resolution_options); } }); @@ -505,6 +529,7 @@ if (yaxis === 'duration') { dataSecondsToHours(data); } hc_plays_by_stream_resolution_options.xAxis.categories = data.categories; hc_plays_by_stream_resolution_options.series = getGraphVisibility(hc_plays_by_stream_resolution_options.chart.renderTo, data.series); + hc_plays_by_stream_resolution_options.colors = getGraphColors(data.series); var hc_plays_by_stream_resolution = new Highcharts.Chart(hc_plays_by_stream_resolution_options); } }); @@ -518,6 +543,7 @@ if (yaxis === 'duration') { dataSecondsToHours(data); } hc_plays_by_platform_by_stream_type_options.xAxis.categories = data.categories; hc_plays_by_platform_by_stream_type_options.series = getGraphVisibility(hc_plays_by_platform_by_stream_type_options.chart.renderTo, data.series); + hc_plays_by_platform_by_stream_type_options.colors = getGraphColors(data.series); var hc_plays_by_platform_by_stream_type = new Highcharts.Chart(hc_plays_by_platform_by_stream_type_options); } }); @@ -531,6 +557,7 @@ if (yaxis === 'duration') { dataSecondsToHours(data); } hc_plays_by_user_by_stream_type_options.xAxis.categories = data.categories; hc_plays_by_user_by_stream_type_options.series = getGraphVisibility(hc_plays_by_user_by_stream_type_options.chart.renderTo, data.series); + hc_plays_by_user_by_stream_type_options.colors = getGraphColors(data.series); var hc_plays_by_user_by_stream_type = new Highcharts.Chart(hc_plays_by_user_by_stream_type_options); } }); @@ -554,6 +581,7 @@ hc_plays_by_month_options.yAxis.min = 0; hc_plays_by_month_options.xAxis.categories = data.categories; hc_plays_by_month_options.series = getGraphVisibility(hc_plays_by_month_options.chart.renderTo, data.series); + hc_plays_by_month_options.colors = getGraphColors(data.series); var hc_plays_by_month = new Highcharts.Chart(hc_plays_by_month_options); } }); diff --git a/data/interfaces/default/js/graphs/plays_by_day.js b/data/interfaces/default/js/graphs/plays_by_day.js index da6de24d..3252403e 100644 --- a/data/interfaces/default/js/graphs/plays_by_day.js +++ b/data/interfaces/default/js/graphs/plays_by_day.js @@ -40,7 +40,6 @@ var hc_plays_by_day_options = { } } }, - colors: ['#E5A00D', '#FFFFFF', '#F06464', '#19A0D7'], xAxis: { type: 'datetime', labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_dayofweek.js b/data/interfaces/default/js/graphs/plays_by_dayofweek.js index d3cf4dfe..84337f8d 100644 --- a/data/interfaces/default/js/graphs/plays_by_dayofweek.js +++ b/data/interfaces/default/js/graphs/plays_by_dayofweek.js @@ -23,7 +23,6 @@ var hc_plays_by_dayofweek_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464', '#19A0D7'], xAxis: { categories: [{}], labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_hourofday.js b/data/interfaces/default/js/graphs/plays_by_hourofday.js index a36d37c0..e9d0ca4c 100644 --- a/data/interfaces/default/js/graphs/plays_by_hourofday.js +++ b/data/interfaces/default/js/graphs/plays_by_hourofday.js @@ -23,7 +23,6 @@ var hc_plays_by_hourofday_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464', '#19A0D7'], xAxis: { categories: [{}], labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_month.js b/data/interfaces/default/js/graphs/plays_by_month.js index 9dc4d4da..084c636c 100644 --- a/data/interfaces/default/js/graphs/plays_by_month.js +++ b/data/interfaces/default/js/graphs/plays_by_month.js @@ -23,7 +23,6 @@ var hc_plays_by_month_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464', '#19A0D7'], xAxis: { labels: { style: { diff --git a/data/interfaces/default/js/graphs/plays_by_platform.js b/data/interfaces/default/js/graphs/plays_by_platform.js index a3e7f890..70e0c193 100644 --- a/data/interfaces/default/js/graphs/plays_by_platform.js +++ b/data/interfaces/default/js/graphs/plays_by_platform.js @@ -23,7 +23,6 @@ var hc_plays_by_platform_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464', '#19A0D7'], xAxis: { categories: [{}], labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js b/data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js index 0b9e6b19..95727a50 100644 --- a/data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js +++ b/data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js @@ -23,7 +23,6 @@ var hc_plays_by_platform_by_stream_type_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464'], xAxis: { categories: [{}], labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_source_resolution.js b/data/interfaces/default/js/graphs/plays_by_source_resolution.js index e7744138..b8273780 100644 --- a/data/interfaces/default/js/graphs/plays_by_source_resolution.js +++ b/data/interfaces/default/js/graphs/plays_by_source_resolution.js @@ -23,7 +23,6 @@ var hc_plays_by_source_resolution_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464'], xAxis: { categories: [{}], labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_stream_resolution.js b/data/interfaces/default/js/graphs/plays_by_stream_resolution.js index 54881cf9..103d9443 100644 --- a/data/interfaces/default/js/graphs/plays_by_stream_resolution.js +++ b/data/interfaces/default/js/graphs/plays_by_stream_resolution.js @@ -23,7 +23,6 @@ var hc_plays_by_stream_resolution_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464'], xAxis: { categories: [{}], labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_stream_type.js b/data/interfaces/default/js/graphs/plays_by_stream_type.js index c34c5706..1be862f4 100644 --- a/data/interfaces/default/js/graphs/plays_by_stream_type.js +++ b/data/interfaces/default/js/graphs/plays_by_stream_type.js @@ -40,7 +40,6 @@ var hc_plays_by_stream_type_options = { } } }, - colors: ['#E5A00D', '#FFFFFF', '#F06464'], xAxis: { type: 'datetime', labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_user.js b/data/interfaces/default/js/graphs/plays_by_user.js index f49b837f..eb3a528a 100644 --- a/data/interfaces/default/js/graphs/plays_by_user.js +++ b/data/interfaces/default/js/graphs/plays_by_user.js @@ -23,7 +23,6 @@ var hc_plays_by_user_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464', '#19A0D7'], xAxis: { categories: [{}], labels: { diff --git a/data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js b/data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js index c8daa322..55ca25ca 100644 --- a/data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js +++ b/data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js @@ -23,7 +23,6 @@ var hc_plays_by_user_by_stream_type_options = { credits: { enabled: false }, - colors: ['#E5A00D', '#FFFFFF', '#F06464'], xAxis: { categories: [{}], labels: { diff --git a/plexpy/graphs.py b/plexpy/graphs.py index ee98dceb..9caf2198 100644 --- a/plexpy/graphs.py +++ b/plexpy/graphs.py @@ -18,6 +18,7 @@ import datetime import plexpy import common import database +import libraries import logger import session @@ -127,8 +128,18 @@ class Graphs(object): series_4_output = {'name': 'Live TV', 'data': series_4} + series_output = [] + if libraries.has_library_type('show'): + series_output.append(series_1_output) + if libraries.has_library_type('movie'): + series_output.append(series_2_output) + if libraries.has_library_type('artist'): + series_output.append(series_3_output) + if libraries.has_library_type('live'): + series_output.append(series_4_output) + output = {'categories': categories, - 'series': [series_1_output, series_2_output, series_3_output, series_4_output]} + 'series': series_output} return output def get_total_plays_per_dayofweek(self, time_range='30', y_axis='plays', user_id=None, grouping=None): @@ -248,8 +259,18 @@ class Graphs(object): series_4_output = {'name': 'Live TV', 'data': series_4} + series_output = [] + if libraries.has_library_type('show'): + series_output.append(series_1_output) + if libraries.has_library_type('movie'): + series_output.append(series_2_output) + if libraries.has_library_type('artist'): + series_output.append(series_3_output) + if libraries.has_library_type('live'): + series_output.append(series_4_output) + output = {'categories': categories, - 'series': [series_1_output, series_2_output, series_3_output, series_4_output]} + 'series': series_output} return output def get_total_plays_per_hourofday(self, time_range='30', y_axis='plays', user_id=None, grouping=None): @@ -351,8 +372,18 @@ class Graphs(object): series_4_output = {'name': 'Live TV', 'data': series_4} + series_output = [] + if libraries.has_library_type('show'): + series_output.append(series_1_output) + if libraries.has_library_type('movie'): + series_output.append(series_2_output) + if libraries.has_library_type('artist'): + series_output.append(series_3_output) + if libraries.has_library_type('live'): + series_output.append(series_4_output) + output = {'categories': categories, - 'series': [series_1_output, series_2_output, series_3_output, series_4_output]} + 'series': series_output} return output def get_total_plays_per_month(self, time_range='12', y_axis='plays', user_id=None, grouping=None): @@ -462,8 +493,18 @@ class Graphs(object): series_4_output = {'name': 'Live TV', 'data': series_4} + series_output = [] + if libraries.has_library_type('show'): + series_output.append(series_1_output) + if libraries.has_library_type('movie'): + series_output.append(series_2_output) + if libraries.has_library_type('artist'): + series_output.append(series_3_output) + if libraries.has_library_type('live'): + series_output.append(series_4_output) + output = {'categories': categories, - 'series': [series_1_output, series_2_output, series_3_output, series_4_output]} + 'series': series_output} return output def get_total_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, grouping=None): @@ -548,8 +589,18 @@ class Graphs(object): series_4_output = {'name': 'Live TV', 'data': series_4} + series_output = [] + if libraries.has_library_type('show'): + series_output.append(series_1_output) + if libraries.has_library_type('movie'): + series_output.append(series_2_output) + if libraries.has_library_type('artist'): + series_output.append(series_3_output) + if libraries.has_library_type('live'): + series_output.append(series_4_output) + output = {'categories': categories, - 'series': [series_1_output, series_2_output, series_3_output, series_4_output]} + 'series': series_output} return output def get_total_plays_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, grouping=None): @@ -647,8 +698,18 @@ class Graphs(object): series_4_output = {'name': 'Live TV', 'data': series_4} + series_output = [] + if libraries.has_library_type('show'): + series_output.append(series_1_output) + if libraries.has_library_type('movie'): + series_output.append(series_2_output) + if libraries.has_library_type('artist'): + series_output.append(series_3_output) + if libraries.has_library_type('live'): + series_output.append(series_4_output) + output = {'categories': categories, - 'series': [series_1_output, series_2_output, series_3_output, series_4_output]} + 'series': series_output} return output def get_total_plays_per_stream_type(self, time_range='30', y_axis='plays', user_id=None, grouping=None): diff --git a/plexpy/libraries.py b/plexpy/libraries.py index 24869451..0b5a63cc 100644 --- a/plexpy/libraries.py +++ b/plexpy/libraries.py @@ -111,6 +111,14 @@ def add_live_tv_library(): plexpy.CONFIG.write() +def has_library_type(section_type): + monitor_db = database.MonitorDatabase() + query = 'SELECT * FROM library_sections WHERE section_type = ? AND deleted_section = 0' + args = [section_type] + result = monitor_db.select_single(query=query, args=args) + return bool(result) + + def update_section_ids(): plexpy.CONFIG.UPDATE_SECTION_IDS = -1 From 47d51f92c75f480b0c1ee9b297709b59c581226c Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 25 Feb 2020 18:00:02 -0800 Subject: [PATCH 106/114] Hide Live TV library from Library Statistics setting --- data/interfaces/default/settings.html | 1 + 1 file changed, 1 insertion(+) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 28ad41e6..f4f366c0 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -2531,6 +2531,7 @@ $(document).ready(function() { for (var i in libraries_list) { var title = libraries_list[i].section_name; var key = libraries_list[i].section_id; + if (key === 999999) { continue; } // Don't show Live TV library $('#sortable_home_library_cards').append( '
  • ' + '
    ' + From 5aa59b93b0f667d6692badfe2c20ab817ee98638 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Thu, 27 Feb 2020 14:49:07 -0800 Subject: [PATCH 107/114] Update Docker build workflows --- .github/workflows/publishdocker-branch.yml | 4 +++- .github/workflows/publishdocker-release.yml | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publishdocker-branch.yml b/.github/workflows/publishdocker-branch.yml index e6734393..b8a6b336 100644 --- a/.github/workflows/publishdocker-branch.yml +++ b/.github/workflows/publishdocker-branch.yml @@ -1,5 +1,7 @@ name: Publish Docker Branch -on: [push] +on: + push: + branches: [master, beta, nightly] jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/publishdocker-release.yml b/.github/workflows/publishdocker-release.yml index 5e8e1c2c..b4bf5226 100644 --- a/.github/workflows/publishdocker-release.yml +++ b/.github/workflows/publishdocker-release.yml @@ -1,7 +1,8 @@ name: Publish Docker Release on: - release: - types: [published, prereleased] + push: + tags: + - 'v*' jobs: build: runs-on: ubuntu-latest From f457704105faf286c3905dac0c6c62326d4de1ea Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Thu, 27 Feb 2020 12:41:32 -0800 Subject: [PATCH 108/114] v2.2.0-beta --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ plexpy/version.py | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d631062..831d94e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog +## v2.2.0-beta (2020-02-27) + +* Important Note! + * All Live TV changes requires Plex Media Server 1.18.7 or higher. +* Monitoring: + * New: Added Live TV metadata and posters to the activity cards. + * Change: Show bandwidth in Gbps when greater than 1000 Mbps. +* History: + * New: Added history logging for Live TV sessions. + * New: Added a fake "Live TV" library to collect Live TV history. + * Note: This library will show up the first time that Live TV is played. + * New: Added the ability to filter history by Live TV. +* Graphs: + * New: Added Live TV series to the "Plays by Period" and "Play Totals" graphs. + * Change: Media type series on the graphs are only shown if the corresponding library type is present. +* Notifications: + * Fix: Race condition causing stream count to be incorrect for playback stop notifications. + * New: Added Live TV channel notification parameters. +* API: + * New: Added ability to filter history using a "live" media type and by guid for the get_history API command. +* Other: + * Change: Add crossorigin use-credentials attribute to manifest tags. (Thanks @pkoenig10) + * Change: Disable automatic updates for Docker containers. Updates are now handled by updating the Docker container. + * Note: If you are using an old Docker container created before v2.2.0, then you may need to completely remove and recreate the container to update for the first time. + * Note: Use the ":latest" Docker tag for the newest stable release, or the ":beta" or ":nightly" tags to access the beta or nightly branches. + + ## v2.1.44 (2020-02-05) * Monitoring: diff --git a/plexpy/version.py b/plexpy/version.py index 9b23cb76..f39ee0e3 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ -PLEXPY_BRANCH = "master" -PLEXPY_RELEASE_VERSION = "v2.1.44" +PLEXPY_BRANCH = "beta" +PLEXPY_RELEASE_VERSION = "v2.2.0-beta" From 05a16bb1999f69a1afd7539380e2e4772ca387cc Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Thu, 27 Feb 2020 15:26:52 -0800 Subject: [PATCH 109/114] Fix tag in Docker release build workflow --- .github/workflows/publishdocker-release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publishdocker-release.yml b/.github/workflows/publishdocker-release.yml index b4bf5226..96f5bb66 100644 --- a/.github/workflows/publishdocker-release.yml +++ b/.github/workflows/publishdocker-release.yml @@ -10,9 +10,7 @@ jobs: - name: Checkout Code uses: actions/checkout@master - name: Get Branch - run: echo ::set-env name=BRANCH::${GITHUB_REF#refs/heads/} - - name: Get Release Version - run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//} + run: echo ::set-env name=BRANCH::${GITHUB_REF/refs\/tags\//} - name: Publish to Registry uses: elgohr/Publish-Docker-Github-Action@master env: @@ -23,7 +21,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} dockerfile: Dockerfile buildargs: VERSION, BRANCH - tags: ${{ env.RELEASE_VERSION }} + tags: ${{ env.BRANCH }} - name: Post Status to Discord uses: sarisia/actions-status-discord@v1 if: always() From 359776d48af970b0ff0dfd896ce169f6f8601c5a Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Fri, 28 Feb 2020 11:27:03 -0800 Subject: [PATCH 110/114] Default webhook notification method to POST --- plexpy/notifiers.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 839178e5..b5b5bb61 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -3609,7 +3609,7 @@ class WEBHOOK(Notifier): """ NAME = 'Webhook' _DEFAULT_CONFIG = {'hook': '', - 'method': '' + 'method': 'POST' } def agent_notify(self, subject='', body='', action='', **kwargs): @@ -3655,8 +3655,7 @@ class WEBHOOK(Notifier): 'name': 'webhook_method', 'description': 'The Webhook HTTP request method.', 'input_type': 'select', - 'select_options': {'': '', - 'GET': 'GET', + 'select_options': {'GET': 'GET', 'POST': 'POST', 'PUT': 'PUT', 'DELETE': 'DELETE'} From 2bead0fc2995d8a4ffc5702b41bcf8410366510c Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 29 Feb 2020 13:54:24 -0800 Subject: [PATCH 111/114] Add live tv to log message --- plexpy/activity_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py index 9ab237fb..40c30489 100644 --- a/plexpy/activity_handler.py +++ b/plexpy/activity_handler.py @@ -117,9 +117,9 @@ class ActivityHandler(object): if not session: return - logger.debug(u"Tautulli ActivityHandler :: Session %s started by user %s (%s) with ratingKey %s (%s)." + logger.debug(u"Tautulli ActivityHandler :: Session %s started by user %s (%s) with ratingKey %s (%s)%s." % (str(session['session_key']), str(session['user_id']), session['username'], - str(session['rating_key']), session['full_title'])) + str(session['rating_key']), session['full_title'], '[Live TV]' if session['live'] else '')) plexpy.NOTIFY_QUEUE.put({'stream_data': session.copy(), 'notify_action': 'on_play'}) From 8ec136a0ca1ab9a3241137c107347ada0f6d1b6d Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 29 Feb 2020 13:54:52 -0800 Subject: [PATCH 112/114] Fix creating metadata cache when starting session --- plexpy/pmsconnect.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index a19a9296..d3f521ff 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -572,7 +572,7 @@ class PmsConnect(object): return output def get_metadata_details(self, rating_key='', sync_id='', plex_guid='', - cache_key=None, return_cache=False, media_info=True): + skip_cache=False, cache_key=None, return_cache=False, media_info=True): """ Return processed and validated metadata list for requested item. @@ -582,7 +582,7 @@ class PmsConnect(object): """ metadata = {} - if cache_key: + if not skip_cache and cache_key: in_file_folder = os.path.join(plexpy.CONFIG.CACHE_DIR, 'session_metadata') in_file_path = os.path.join(in_file_folder, 'metadata-sessionKey-%s.json' % cache_key) @@ -1929,12 +1929,12 @@ class PmsConnect(object): media_id = helpers.get_xml_attr(stream_media_info, 'id') part_id = helpers.get_xml_attr(stream_media_parts_info, 'id') - cache_key = None if skip_cache else session_key - if sync_id: - metadata_details = self.get_metadata_details(rating_key=rating_key, sync_id=sync_id, cache_key=cache_key) + metadata_details = self.get_metadata_details(rating_key=rating_key, sync_id=sync_id, + skip_cache=skip_cache, cache_key=session_key) else: - metadata_details = self.get_metadata_details(rating_key=rating_key, cache_key=cache_key) + metadata_details = self.get_metadata_details(rating_key=rating_key, + skip_cache=skip_cache, cache_key=session_key) # Get the media info, fallback to first item if match id is not found source_medias = metadata_details.pop('media_info', []) From 2a3bd3413f3ff17e8b50468cee638050763e4a10 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 29 Feb 2020 14:10:20 -0800 Subject: [PATCH 113/114] Add --ff-only to git pull command --- plexpy/versioncheck.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py index 0c9cbadd..7ec34725 100644 --- a/plexpy/versioncheck.py +++ b/plexpy/versioncheck.py @@ -251,7 +251,8 @@ def update(): logger.info('Windows .exe updating not supported yet.') elif plexpy.INSTALL_TYPE == 'git': - output, err = runGit('pull ' + plexpy.CONFIG.GIT_REMOTE + ' ' + plexpy.CONFIG.GIT_BRANCH) + output, err = runGit('pull {} {} --ff-only'.format(plexpy.CONFIG.GIT_REMOTE, + plexpy.CONFIG.GIT_BRANCH)) if not output: logger.error('Unable to download latest version') @@ -270,7 +271,9 @@ def update(): return else: - tar_download_url = 'https://github.com/{}/{}/tarball/{}'.format(plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH) + tar_download_url = 'https://github.com/{}/{}/tarball/{}'.format(plexpy.CONFIG.GIT_USER, + plexpy.CONFIG.GIT_REPO, + plexpy.CONFIG.GIT_BRANCH) update_dir = os.path.join(plexpy.PROG_DIR, 'update') version_path = os.path.join(plexpy.PROG_DIR, 'version.txt') From 96500f75b0f9d7c61cc974ad10190a617969aac7 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 29 Feb 2020 14:47:45 -0800 Subject: [PATCH 114/114] Add option to reset Tautulli installation --- data/interfaces/default/settings.html | 20 ++++++++++++++ plexpy/versioncheck.py | 38 ++++++++++++++++++++++----- plexpy/webserve.py | 12 +++++++++ 3 files changed, 64 insertions(+), 6 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index f4f366c0..e448e56a 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -265,6 +265,19 @@

    • Optional: The path to your git environment variable. Leave blank for default.

    +
    + +

    + Attempt to fix updating by resetting your Tautulli installation to the latest "${config['git_remote']}/${config['git_branch']}" branch. +

    +
    +
    +
    + +
    +
    +
    +
    % endif

    @@ -2154,6 +2167,13 @@ $(document).ready(function() { } }); + $("#reset_git_install").click(function () { + var msg = 'Are you sure you want to reset your Tautulli installtion?'; + var url = 'reset_git_install'; + confirmAjaxCall(url, msg); + }); + + $('#api_key').click(function(){ $('#api_key').select() }); $("#generate_api").click(function() { $.get('generate_api_key', diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py index 7ec34725..31bd4408 100644 --- a/plexpy/versioncheck.py +++ b/plexpy/versioncheck.py @@ -259,13 +259,10 @@ def update(): return for line in output.split('\n'): - - if 'Already up-to-date.' in line: + if 'Already up-to-date.' in line or 'Already up to date.' in line: logger.info('No update available, not updating') - logger.info('Output: ' + str(output)) elif line.endswith(('Aborting', 'Aborting.')): logger.error('Unable to update from git: ' + line) - logger.info('Output: ' + str(output)) elif plexpy.INSTALL_TYPE == 'docker': return @@ -331,6 +328,34 @@ def update(): return +def reset(): + if plexpy.INSTALL_TYPE == 'git': + logger.info('Attempting to reset git install to "%s/%s"' % (plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH)) + output, err = runGit('remote set-url {} https://github.com/{}/{}.git'.format(plexpy.CONFIG.GIT_REMOTE, + plexpy.CONFIG.GIT_USER, + plexpy.CONFIG.GIT_REPO)) + output, err = runGit('fetch {}'.format(plexpy.CONFIG.GIT_REMOTE)) + output, err = runGit('checkout {}'.format(plexpy.CONFIG.GIT_BRANCH)) + output, err = runGit('branch -u {}/{}'.format(plexpy.CONFIG.GIT_REMOTE, + plexpy.CONFIG.GIT_BRANCH)) + output, err = runGit('reset --hard {}/{}'.format(plexpy.CONFIG.GIT_REMOTE, + plexpy.CONFIG.GIT_BRANCH)) + output, err = runGit('pull {} {}'.format(plexpy.CONFIG.GIT_REMOTE, + plexpy.CONFIG.GIT_BRANCH)) + + if not output: + logger.error('Unable to reset Tautulli installation.') + return False + + for line in output.split('\n'): + if 'Already up-to-date.' in line or 'Already up to date.' in line: + logger.info('Tautulli installation reset successfully.') + return True + elif line.endswith(('Aborting', 'Aborting.')): + logger.error('Unable to reset Tautulli installation: ' + line) + return False + + def checkout_git_branch(): if plexpy.INSTALL_TYPE == 'git': output, err = runGit('fetch %s' % plexpy.CONFIG.GIT_REMOTE) @@ -343,9 +368,10 @@ def checkout_git_branch(): for line in output.split('\n'): if line.endswith(('Aborting', 'Aborting.')): logger.error('Unable to checkout from git: ' + line) - logger.info('Output: ' + str(output)) + return - output, err = runGit('pull %s %s' % (plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH)) + output, err = runGit('pull {} {}'.format(plexpy.CONFIG.GIT_REMOTE, + plexpy.CONFIG.GIT_BRANCH)) def read_changelog(latest_only=False, since_prev_release=False): diff --git a/plexpy/webserve.py b/plexpy/webserve.py index cf0dba47..dae7e1e9 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -3916,6 +3916,18 @@ class WebInterface(object): plexpy.CONFIG.write() return self.do_state_change('checkout', 'Switching Git Branches', 120) + @cherrypy.expose + @cherrypy.tools.json_out() + @requireAuth(member_of("admin")) + def reset_git_install(self, **kwargs): + result = versioncheck.reset() + + if result: + return {'result': 'success', 'message': 'Tautulli installation reset.'} + else: + return {'result': 'error', 'message': 'Reset installation failed.'} + + @cherrypy.expose @requireAuth(member_of("admin")) def get_changelog(self, latest_only=False, since_prev_release=False, update_shown=False, **kwargs):