Manually merge v1.4.24 into v2

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 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.

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)
 

data/interfaces/default/info.html

@@ -116,9 +116,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);">

plexpy/__init__.py

@@ -58,6 +58,7 @@ VERBOSE = True
 DAEMON = False
 CREATEPID = False
 PIDFILE = None
+NOFORK = False
 
 SCHED = BackgroundScheduler()
 SCHED_LOCK = threading.Lock()
@@ -1195,13 +1196,16 @@ def shutdown(restart=False, update=False, checkout=False):
         args += ARGS
         if '--nolaunch' not in args:
             args += ['--nolaunch']
-        logger.info(u"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)

plexpy/notification_handler.py

@@ -500,7 +500,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
     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

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "master"
-PLEXPY_RELEASE_VERSION = "1.4.23"
+PLEXPY_RELEASE_VERSION = "1.4.24"