From b9c95d49a60198832460610bb1adf5831c090c01 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 7 Dec 2015 22:22:47 +0200 Subject: [PATCH] Fix regression on select_single queries. --- plexpy/activity_processor.py | 4 ++-- plexpy/database.py | 2 +- plexpy/users.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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: