Merge branch 'dev'

* Really this time...

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.7 (2015-11-27)
+* Fix IP address option in notifications
+
+
 ## v1.2.6 (2015-11-27)
 
 * Fixes for IP logging in PMS < 0.9.14.x.

plexpy/activity_processor.py

@@ -79,6 +79,7 @@ class ActivityProcessor(object):
             if result == 'insert':
                 # Push any notifications - Push it on it's own thread so we don't hold up our db actions
                 if notify:
+                    values.update({'ip_address': session['ip_address']})
                     threading.Thread(target=notification_handler.notify,
                                      kwargs=dict(stream_data=values, notify_action='play')).start()
 

plexpy/notification_handler.py

@@ -404,7 +404,7 @@ def build_notify_text(session=None, timeline=None, state=None):
         user = session['friendly_name']
         platform = session['platform']
         player = session['player']
-        ip_address = session['ip_address'] if session['ip_address'] != '' else 'N/A'
+        ip_address = session['ip_address'] if session['ip_address'] else 'N/A'
 
     progress_percent = helpers.get_percent(view_offset, duration)
 

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.2.6"
+PLEXPY_RELEASE_VERSION = "1.2.7"