v1.4.23

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.

data/interfaces/default/base.html

@@ -326,9 +326,10 @@
                 <ul id="donation_type" class="nav nav-pills" role="tablist" style="display: flex; justify-content: center; margin: 10px 0;">
                     <li class="active"><a href="#paypal-donation" role="tab" data-toggle="tab">PayPal</a></li>
                     <li><a href="#flattr-donation" role="tab" data-toggle="tab">Flattr</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="Bitcoin" data-address="15YMw9c8uH7QecVPXSSjdZ7s55vnbmdKLq">Bitcoin</a></li>
+                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="bitcoin" data-name="Bitcoin" data-address="3FdfJAyNWU15Sf11U9FTgPHuP1hPz32eEN">Bitcoin</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="Ethereum" data-address="0x8512f6545858eB6269A0F39349F1cC86Df6Ffaf6">Ethereum</a></li>
+                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="bitcoincash" data-name="Bitcoin Cash" data-address="1H2atabxAQGaFAWYQEiLkXKSnK9CZZvt2n">Bitcoin Cash</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="Litecoin" data-address="LZWsygTHuL4KNbg2H5EzXBDdJKNtZoqq2R">Litecoin</a></li>
+                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="ethereum" data-name="Ethereum" data-address="0x77ae4c2b8de1a1ccfa93553db39971da58c873d3">Ethereum</a></li>
+                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="litecoin" data-name="Litecoin" data-address="LWpPmUqQYHBhMV83XSCsHzPmKLhJt6r57J">Litecoin</a></li>
                 </ul>
                 <div class="tab-content">
                     <div role="tabpanel" class="tab-pane active" id="paypal-donation" style="text-align: center">
@@ -414,12 +415,13 @@ ${next.headerIncludes()}
     });
 
     $('#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

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'

plexpy/notifiers.py

@@ -1123,7 +1123,7 @@ class PUSHBULLET(object):
         http_handler.request("POST",
                              "/v2/pushes",
                              headers={'Content-type': "application/json",
-                             'Authorization': 'Basic %s' % base64.b64encode(self.apikey + ":")},
+                                      'Access-Token': self.apikey},
                              body=json.dumps(data))
 
         response = http_handler.getresponse()
@@ -1155,7 +1155,7 @@ class PUSHBULLET(object):
             http_handler = HTTPSConnection("api.pushbullet.com")
             http_handler.request("GET", "/v2/devices",
                                  headers={'Content-type': "application/json",
-                                 'Authorization': 'Basic %s' % base64.b64encode(self.apikey + ":")})
+                                          'Access-Token': self.apikey})
 
             response = http_handler.getresponse()
             request_status = response.status

plexpy/plexivity_import.py

@@ -414,7 +414,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

plexpy/plexwatch_import.py

@@ -407,7 +407,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

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.4.22"
+PLEXPY_RELEASE_VERSION = "1.4.23"