diff --git a/CHANGELOG.md b/CHANGELOG.md index fd6c3d83..9d051a08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v1.4.23 (2017-09-30) + +* Fix: Playstation 4 platform name. +* Fix: PlexWatch and Plexivity import. +* Fix: Pushbullet authorization header. + + ## v1.4.22 (2017-08-19) * Fix: Cleaning up of old config backups. diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 07c19dfe..a91802ad 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -315,9 +315,10 @@ ${next.modalIncludes()}
@@ -417,12 +418,13 @@ ${next.modalIncludes()} }); $('#donation_type a.crypto-donation').on('shown.bs.tab', function () { - var crypto_type = $(this).data('coin'); + var crypto_coin = $(this).data('coin'); + var crypto_name = $(this).data('name'); var crypto_address = $(this).data('address') $('#crypto_qr_code').empty().qrcode({ - text: crypto_type + ":" + crypto_address + text: crypto_coin + ":" + crypto_address }); - $('#crypto_type_label').html(crypto_type); + $('#crypto_type_label').html(crypto_name); $('#crypto_address').html(crypto_address); }); % endif diff --git a/plexpy/common.py b/plexpy/common.py index f151fa3b..8722956f 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -39,7 +39,8 @@ DEFAULT_ART = "interfaces/default/images/art.png" PLATFORM_NAME_OVERRIDES = {'Konvergo': 'Plex Media Player', 'Mystery 3': 'Playstation 3', 'Mystery 4': 'Playstation 4', - 'Mystery 5': 'Xbox 360' + 'Mystery 5': 'Xbox 360', + 'WebMAF': 'Playstation 4' } PMS_PLATFORM_NAME_OVERRIDES = {'MacOSX': 'Mac' diff --git a/plexpy/plexivity_import.py b/plexpy/plexivity_import.py index a90a0650..f5b9623b 100644 --- a/plexpy/plexivity_import.py +++ b/plexpy/plexivity_import.py @@ -406,7 +406,17 @@ def import_from_plexivity(database=None, table_name=None, import_ignore_interval 'genres': extracted_xml['genres'], 'studio': extracted_xml['studio'], 'labels': extracted_xml['labels'], - 'full_title': row['full_title'] + 'full_title': row['full_title'], + 'width': extracted_xml['width'], + 'height': extracted_xml['height'], + 'container': extracted_xml['container'], + 'video_codec': extracted_xml['video_codec'], + 'audio_codec': extracted_xml['audio_codec'], + 'bitrate': extracted_xml['bitrate'], + 'video_resolution': extracted_xml['video_resolution'], + 'video_framerate': extracted_xml['video_framerate'], + 'aspect_ratio': extracted_xml['aspect_ratio'], + 'audio_channels': extracted_xml['audio_channels'] } # On older versions of PMS, "clip" items were still classified as "movie" and had bad ratingKey values diff --git a/plexpy/plexwatch_import.py b/plexpy/plexwatch_import.py index 10046ee5..fa67dec3 100644 --- a/plexpy/plexwatch_import.py +++ b/plexpy/plexwatch_import.py @@ -399,7 +399,17 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval 'genres': extracted_xml['genres'], 'studio': extracted_xml['studio'], 'labels': extracted_xml['labels'], - 'full_title': row['full_title'] + 'full_title': row['full_title'], + 'width': extracted_xml['width'], + 'height': extracted_xml['height'], + 'container': extracted_xml['container'], + 'video_codec': extracted_xml['video_codec'], + 'audio_codec': extracted_xml['audio_codec'], + 'bitrate': extracted_xml['bitrate'], + 'video_resolution': extracted_xml['video_resolution'], + 'video_framerate': extracted_xml['video_framerate'], + 'aspect_ratio': extracted_xml['aspect_ratio'], + 'audio_channels': extracted_xml['audio_channels'] } # On older versions of PMS, "clip" items were still classified as "movie" and had bad ratingKey values diff --git a/plexpy/version.py b/plexpy/version.py index c06a6b34..7954e8fc 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_BRANCH = "master" -PLEXPY_RELEASE_VERSION = "1.4.22" +PLEXPY_RELEASE_VERSION = "1.4.23"