diff --git a/CHANGELOG.md b/CHANGELOG.md index b03ca181..e1c58a21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog -## v1.2.12 (2015-12-06) +## v1.2.14 (2015-12-07) + +* Fix regression with PlexWatch db importer and buffer warnings. + + +## v1.2.13 (2015-12-06) * Fix match newlines between tags in notification text. * Fix current activity not showing on PMS 0.9.12. diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index 3f7927fc..0a68f4d0 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -400,7 +400,7 @@ class ActivityProcessor(object): 'WHERE session_key = ?', [session_key]) if buffer_count: - return buffer_count + return buffer_count['buffer_count'] return 0 @@ -417,6 +417,6 @@ class ActivityProcessor(object): 'WHERE session_key = ?', [session_key]) if last_time: - return last_time + return last_time['buffer_last_triggered'] return None \ No newline at end of file diff --git a/plexpy/database.py b/plexpy/database.py index 73cdea8c..f4bbdcf5 100644 --- a/plexpy/database.py +++ b/plexpy/database.py @@ -111,7 +111,7 @@ class MonitorDatabase(object): def select_single(self, query, args=None): - sql_results = self.action(query, args).fetchone()[0] + sql_results = self.action(query, args).fetchone() if sql_results is None or sql_results == "": return "" diff --git a/plexpy/users.py b/plexpy/users.py index b1d613cd..c7adfedd 100644 --- a/plexpy/users.py +++ b/plexpy/users.py @@ -319,7 +319,7 @@ class Users(object): query = 'select user_id FROM users WHERE username = ?' result = monitor_db.select_single(query, args=[user]) if result: - return result + return result['user_id'] else: return None except: diff --git a/plexpy/version.py b/plexpy/version.py index 446464e0..dfb6543c 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.2.13" +PLEXPY_RELEASE_VERSION = "1.2.14"