v1.4.25

Fix tab to space
v1.4.24
2017-10-02 18:08:23 -07:00 · 2017-10-02 18:07:16 -07:00 · 2017-10-01 11:13:16 -07:00 · 2017-10-01 11:08:52 -07:00 · 2017-10-01 11:08:40 -07:00 · 2017-10-01 10:49:49 -07:00
12 changed files with 80 additions and 23 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog

+## v1.4.25 (2017-10-02)
+
+* Fix: Tab instead of spaces preventing startup.
+
+
+## v1.4.24 (2017-10-01)
+
+* Fix: New Plex Web urls. (Thanks @Joshua1337)
+* Fix: Fallback to the product name if the player title is blank.
+* New: Added no forking option to startup arguments. (Thanks @Vashypooh)
+
+
+## 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.
--- a/PlexPy.py
+++ b/PlexPy.py
@@ -92,6 +92,8 @@ def main():
        '--nolaunch', action='store_true', help='Prevent browser from launching on startup')
    parser.add_argument(
        '--pidfile', help='Create a pid file (only relevant when running as a daemon)')
+    parser.add_argument(
+        '--nofork', action='store_true', help='Start PlexPy as a service, do not fork when restarting')
 		
    args = parser.parse_args()

@@ -116,6 +118,10 @@ def main():
            plexpy.DAEMON = True
            plexpy.QUIET = True

+    if args.nofork:
+        plexpy.NOFORK = True
+        logger.info("PlexPy is running as a service, it will not fork when restarted.")
+
    if args.pidfile:
        plexpy.PIDFILE = str(args.pidfile)

--- a/data/interfaces/default/base.html
+++ b/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="Ethereum" data-address="0x8512f6545858eB6269A0F39349F1cC86Df6Ffaf6">Ethereum</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="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="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="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
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -115,9 +115,9 @@ DOCUMENTATION :: END
                <div class="col-md-9">
                    <div class="summary-content-poster hidden-xs hidden-sm">
                        % if data['media_type'] == 'track':
-                        <a href="https://app.plex.tv/web/app#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['parent_rating_key']}" target="_blank" title="View in Plex Web">
+                        <a href="https://app.plex.tv/desktop#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['parent_rating_key']}" target="_blank" title="View in Plex Web">
                        % else:
-                        <a href="https://app.plex.tv/web/app#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['rating_key']}" target="_blank" title="View in Plex Web">
+                        <a href="https://app.plex.tv/desktop#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['rating_key']}" target="_blank" title="View in Plex Web">
                        % endif
                            % if data['media_type'] == 'episode':
                            <div class="summary-poster-face-episode" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=280&fallback=art);">
--- a/plexpy/init.py
+++ b/plexpy/init.py
@@ -54,6 +54,7 @@ VERBOSE = True
 DAEMON = False
 CREATEPID = False
 PIDFILE = None
+NOFORK = False

 SCHED = BackgroundScheduler()
 SCHED_LOCK = threading.Lock()
@@ -989,13 +990,16 @@ def shutdown(restart=False, update=False):
        args += ARGS
        if '--nolaunch' not in args:
            args += ['--nolaunch']
-        logger.info('Restarting PlexPy with %s', args)

        # os.execv fails with spaced names on Windows
        # https://bugs.python.org/issue19066
-        if os.name == 'nt':
+        if NOFORK:
+            logger.info('Running as service, not forking. Exiting...')
+        elif os.name == 'nt':
+            logger.info('Restarting PlexPy with %s', args)
            subprocess.Popen(args, cwd=os.getcwd())
        else:
+            logger.info('Restarting PlexPy with %s', args)
            os.execv(exe, args)

    os._exit(0)
--- 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'
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -666,7 +666,7 @@ def build_notify_text(session=None, timeline=None, notify_action=None, agent_id=
    remaining_duration = duration - view_offset

    # Build Plex URL
-    metadata['plex_url'] = 'https://app.plex.tv/web/app#!/server/{0}/details?key=%2Flibrary%2Fmetadata%2F{1}'.format(
+    metadata['plex_url'] = 'https://app.plex.tv/desktop#!/server/{0}/details?key=%2Flibrary%2Fmetadata%2F{1}'.format(
        plexpy.CONFIG.PMS_IDENTIFIER, str(rating_key))

    # Get media IDs from guid and build URLs
--- a/plexpy/notifiers.py
+++ b/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
--- a/plexpy/plexivity_import.py
+++ b/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
--- a/plexpy/plexwatch_import.py
+++ b/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
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -1115,7 +1115,8 @@ class PmsConnect(object):
                              'friendly_name': user_details['friendly_name'],
                              'user_thumb': user_details['user_thumb'],
                              'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
-                              'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                              'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title')
+                                  or helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'product'),
                              'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
                              'machine_id': machine_id,
                              'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
@@ -1258,7 +1259,8 @@ class PmsConnect(object):
                                  'friendly_name': user_details['friendly_name'],
                                  'user_thumb': user_details['user_thumb'],
                                  'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
-                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title')
+                                      or helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'product'),
                                  'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
                                  'machine_id': machine_id,
                                  'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
@@ -1322,7 +1324,8 @@ class PmsConnect(object):
                                  'friendly_name': user_details['friendly_name'],
                                  'user_thumb': user_details['user_thumb'],
                                  'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
-                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title')
+                                      or helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'product'),
                                  'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
                                  'machine_id': machine_id,
                                  'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
@@ -1385,7 +1388,8 @@ class PmsConnect(object):
                                  'friendly_name': user_details['friendly_name'],
                                  'user_thumb': user_details['user_thumb'],
                                  'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
-                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title')
+                                      or helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'product'),
                                  'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
                                  'machine_id': machine_id,
                                  'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
@@ -1491,7 +1495,8 @@ class PmsConnect(object):
                              'friendly_name': user_details['friendly_name'],
                              'user_thumb': user_details['user_thumb'],
                              'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
-                              'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                              'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title')
+                                  or helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'product'),
                              'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
                              'machine_id': machine_id,
                              'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.4.22"
+PLEXPY_RELEASE_VERSION = "1.4.25"
Author	SHA1	Message	Date
JonnyWong16	cfd3099626	v1.4.25	2017-10-02 18:08:23 -07:00
JonnyWong16	3db6c98c27	Fix tab to space	2017-10-02 18:07:16 -07:00
JonnyWong16	5417747473	v1.4.24	2017-10-01 11:13:16 -07:00
JonnyWong16	cf6847d777	Fallback to product if player title is blank	2017-10-01 11:08:52 -07:00
JonnyWong16	464fa1f8a3	Add no forking option to startup arguments	2017-10-01 11:08:40 -07:00
JonnyWong16	665a6435ef	Merge pull request #1076 from Vashypooh/master Added support for windows service	2017-10-01 10:49:49 -07:00
JonnyWong16	2d64ba4a0e	Merge pull request #1107 from Joshua1337/master Update web 3.20.5 urls	2017-10-01 10:43:58 -07:00
JonnyWong16	006c778dca	v1.4.23	2017-09-30 15:28:32 -07:00
JonnyWong16	bd636b756b	Update PushBullet authorization header	2017-09-30 15:03:51 -07:00
JonnyWong16	d21b74f231	Fix regression for PlexWatch and Plexivity import	2017-09-30 15:01:10 -07:00
JonnyWong16	4354f72578	Update platform name override for Playstation 4	2017-09-30 14:53:24 -07:00
JonnyWong16	f5ca522e6c	Update coin addresses	2017-09-30 14:44:14 -07:00
Joshua Dehler	8a556a50ab	Fix web 3.20.5 urls	2017-09-08 20:13:45 +02:00
Joshua Dehler	532ff59dfe	Fix web 3.20.5 urls	2017-09-08 20:13:07 +02:00
Vashypooh	b3fe6145e2	Added support for windows service Added support for running as a windows service so it does not fork the process on reboot.	2017-07-22 16:02:42 -04:00