Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.3.14 (2016-03-29)
+
+* Fix: Regression for missing notify_action for script notifications.
+* Fix: Typo for home stats cards in the settings.
+
+
+## v1.3.13 (2016-03-27)
+
+* Fix: Only mask strings longer than 5 characters in logs.
+
+
 ## v1.3.12 (2016-03-27)
 
 * Fix: "Check GitHub for updates" not rescheduling when toggling setting.

data/interfaces/default/settings.html

@@ -269,13 +269,13 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                                         <li class="card card-sortable">
                                             <div class="card-handle"><i class="fa fa-bars"></i></div>
                                             <label>
-                                                <input type="checkbox" id="hscard-top_music" name="hscard-top_music" value="top_music"> Most Listened Music
+                                                <input type="checkbox" id="hscard-top_music" name="hscard-top_music" value="top_music"> Most Listened to Artist
                                             </label>
                                         </li>
                                         <li class="card card-sortable">
                                             <div class="card-handle"><i class="fa fa-bars"></i></div>
                                             <label>
-                                                <input type="checkbox" id="hscard-popular_music" name="hscard-popular_music" value="popular_music"> Most Popular Music
+                                                <input type="checkbox" id="hscard-popular_music" name="hscard-popular_music" value="popular_music"> Most Popular Artist
                                             </label>
                                         </li>
                                         <li class="card card-sortable">

plexpy/config.py

@@ -458,10 +458,11 @@ class Config(object):
 
         for key, subkeys in self._config.iteritems():
             for subkey, value in subkeys.iteritems():
-                if str(value).strip() and subkey.upper() not in _WHITELIST_KEYS and any(bk in subkey.upper() for bk in _BLACKLIST_KEYS):
-                    blacklist.append(str(value).strip())
+                if isinstance(value, basestring) and len(value.strip()) > 5 and \
+                    subkey.upper() not in _WHITELIST_KEYS and any(bk in subkey.upper() for bk in _BLACKLIST_KEYS):
+                    blacklist.append(value.strip())
 
-        plexpy.logger._BLACKLIST_WORDS = filter(None, blacklist)
+        plexpy.logger._BLACKLIST_WORDS = blacklist
 
     def _define(self, name):
         key = name.upper()

plexpy/notifiers.py

@@ -487,7 +487,7 @@ def send_notification(agent_id, subject, body, notify_action, **kwargs):
             slackClient.notify(message=body, event=subject)
         elif agent_id == 15:
             scripts = Scripts()
-            scripts.notify(message=body, subject=subject, **kwargs)
+            scripts.notify(message=body, subject=subject, notify_action=notify_action, **kwargs)
         elif agent_id == 16:
             facebook = FacebookNotifier()
             facebook.notify(subject=subject, message=body, **kwargs)

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.3.12"
+PLEXPY_RELEASE_VERSION = "1.3.14"