v1.4.14

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v1.4.14 (2016-10-12)
+
+* Fix: History logging locking up if media is removed from Plex before PlexPy can save the session.
+* Fix: Unable to save API key in the settings.
+* Fix: Some typos in the settings. (Thanks @Leafar3456)
+* Change: Disable script timeout by setting timeout to 0 seconds.
+
+
 ## v1.4.13 (2016-10-08)
 
 * New: Option to set the number of days to keep PlexPy backups.

data/interfaces/default/css/plexpy.css

@@ -3059,6 +3059,9 @@ a:hover .overlay-refresh-image:hover {
 #plex-log-levels label {
     margin-bottom: 0;
 }
-#api_key.form-control[disabled] {
+#api_key.form-control[readonly] {
     background-color: #555;
 }
+#api_key.form-control[readonly]:focus {
+    background-color: #fff;
+}

data/interfaces/default/settings.html

@@ -541,7 +541,7 @@
                             <div class="row">
                                 <div class="col-md-6">
                                     <div class="input-group">
-                                        <input class="form-control" type="text" name="api_key" id="api_key" value="${config['api_key']}" size="20" disabled>
+                                        <input class="form-control" type="text" name="api_key" id="api_key" value="${config['api_key']}" size="20" readonly>
                                         <span class="input-group-btn">
                                             <button class="btn btn-form" type="button" id="generate_api">Generate</button>
                                         </span>
@@ -762,8 +762,8 @@
                         <div class="form-group">
                             <label>Flush Temporary Sessions</label>
                             <p class="help-block">
-                                Attempt to fix hisotry logging by flushing out all of the temporary sessions in the database.<br />
+                                Attempt to fix history logging by flushing out all of the temporary sessions in the database.<br />
-                                Warning: This will reset all currently active sessions. For emergeny use only when history logging is stuck!
+                                Warning: This will reset all currently active sessions. For emergency use only when history logging is stuck!
                             </p>
                             <div class="row">
                                 <div class="col-md-4">

plexpy/activity_processor.py

@@ -221,7 +221,7 @@ class ActivityProcessor(object):
                     logger.debug(u"PlexPy ActivityProcessor :: Fetching metadata for item ratingKey %s" % session['rating_key'])
                     pms_connect = pmsconnect.PmsConnect()
                     result = pms_connect.get_metadata_details(rating_key=str(session['rating_key']))
-                    if result:
+                    if result and result['metadata']:
                         metadata = result['metadata']
                     else:
                         return False

plexpy/notifiers.py

@@ -2207,13 +2207,17 @@ class Scripts(object):
                                        stderr=subprocess.PIPE,
                                        cwd=self.script_folder)
 
+            if self.script_timeout:
                 timer = threading.Timer(self.script_timeout, kill_script, (process,))
+            else:
+                timer = None
+
             try:
-                timer.start()
+                if timer: timer.start()
                 output, error = process.communicate()
                 status = process.returncode
             finally:
-                timer.cancel()
+                if timer: timer.cancel()
 
         except OSError as e:
             logger.error(u"PlexPy Notifiers :: Failed to run script: %s" % e)
@@ -2420,7 +2424,7 @@ class Scripts(object):
                          {'label': 'Script Timeout',
                           'value': self.script_timeout,
                           'name': 'scripts_timeout',
-                          'description': 'The number of seconds to wait before killing the script.',
+                          'description': 'The number of seconds to wait before killing the script. 0 to disable timeout.',
                           'input_type': 'number'
                           }
                          ]

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.4.13"
+PLEXPY_RELEASE_VERSION = "1.4.14"