From c827c9e825f01d16274aaa31d1cd6a255624d24b Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Thu, 26 Nov 2015 19:06:51 -0800
Subject: [PATCH 1/3] Fix IP logging again

* Really this time...
---
 plexpy/activity_processor.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py
index e64b88da..e64308c7 100644
--- a/plexpy/activity_processor.py
+++ b/plexpy/activity_processor.py
@@ -39,7 +39,7 @@ class ActivityProcessor(object):
                       'parent_title': session['parent_title'],
                       'grandparent_title': session['grandparent_title'],
                       'friendly_name': session['friendly_name'],
-                      'ip_address': session['ip_address'],
+                      #'ip_address': session['ip_address'],
                       'player': session['player'],
                       'platform': session['platform'],
                       'parent_rating_key': session['parent_rating_key'],
@@ -67,6 +67,10 @@ class ActivityProcessor(object):
                       'transcode_height': session['transcode_height']
                       }
 
+            # Add ip_address back into values
+            if session['ip_address']:
+                values.update({'ip_address': session['ip_address']})
+
             keys = {'session_key': session['session_key'],
                     'rating_key': session['rating_key']}
 
@@ -88,12 +92,8 @@ class ActivityProcessor(object):
                     if plexpy.CONFIG.IP_LOGGING_ENABLE and plexpy.CONFIG.PMS_LOGS_FOLDER:
                         ip_address = self.find_session_ip(rating_key=session['rating_key'],
                                                           machine_id=session['machine_id'])
-                    else:
-                        ip_adress = None
-
-                    query = 'UPDATE sessions SET ip_address = ? WHERE session_key = ? AND rating_key = ? '
-                    args = [ip_address, session['session_key'], session['rating_key']]
-                    self.db.action(query=query, args=args)
+                        ip_address = {'ip_address': ip_address}
+                        self.db.upsert('sessions', ip_address, keys)
 
     def write_session_history(self, session=None, import_metadata=None, is_import=False, import_ignore_interval=0):
         from plexpy import users

From aaf3de68cffdc59b69b529d379b15c438e9309bc Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Fri, 27 Nov 2015 06:25:47 -0800
Subject: [PATCH 2/3] Fix IP address in notifications

---
 plexpy/activity_processor.py   | 1 +
 plexpy/notification_handler.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py
index e64308c7..bdc2b83d 100644
--- a/plexpy/activity_processor.py
+++ b/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()
 
diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py
index 4dab68dc..29d65097 100644
--- a/plexpy/notification_handler.py
+++ b/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)
 

From beb66396fea272c85326baf20294ec84120638f3 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Fri, 27 Nov 2015 06:33:03 -0800
Subject: [PATCH 3/3] v1.2.7

---
 CHANGELOG.md      | 4 ++++
 plexpy/version.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80214da5..09ba5125 100644
--- a/CHANGELOG.md
+++ b/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.
diff --git a/plexpy/version.py b/plexpy/version.py
index d6213d00..dcea93a3 100644
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.2.6"
+PLEXPY_RELEASE_VERSION = "1.2.7"