From 0877a6bf21ddf882d6c9fa687207e9bd7440e30f Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 13 Aug 2015 23:05:09 +0200 Subject: [PATCH] Add per-user history logging toggle. Uncheck to disable history logging for specific user. On SSL cert bypass check that the method is available before allowing. --- data/interfaces/default/edit_user.html | 15 +++++++++++++-- plexpy/__init__.py | 12 +++++++++++- plexpy/datafactory.py | 25 ++++++++++++++++--------- plexpy/http_handler.py | 2 +- plexpy/monitor.py | 8 ++++++++ plexpy/webserve.py | 14 ++++++++++++-- 6 files changed, 61 insertions(+), 15 deletions(-) diff --git a/data/interfaces/default/edit_user.html b/data/interfaces/default/edit_user.html index 937647d4..f6507a43 100644 --- a/data/interfaces/default/edit_user.html +++ b/data/interfaces/default/edit_user.html @@ -14,6 +14,7 @@ user Return the real Plex username user_id Return the Plex user_id friendly_name Returns the friendly edited Plex username do_notify Returns bool value for whether the user should trigger notifications +keep_history Returns bool value for whether the user's activity should be logged DOCUMENTATION :: END @@ -42,6 +43,12 @@ DOCUMENTATION :: END

Uncheck this if you do not want to receive notifications for this user's activity.

+
+ +

Uncheck this if you do not want this keep any history on this user's activity.

+
@@ -57,14 +64,18 @@ DOCUMENTATION :: END $("#save_user_name").click(function() { var friendly_name = $("#friendly_name").val(); var do_notify = 0; + var keep_history = 0; if ($("#do_notify").is(":checked")) { do_notify = 1; } + if ($("#keep_history").is(":checked")) { + keep_history = 1; + } % if data['user_id']: $.ajax({ url: 'edit_user', - data: {user_id: '${data['user_id']}', friendly_name: friendly_name, do_notify: do_notify}, + data: {user_id: '${data['user_id']}', friendly_name: friendly_name, do_notify: do_notify, keep_history: keep_history}, cache: false, async: true, success: function(data) { @@ -77,7 +88,7 @@ DOCUMENTATION :: END % else: $.ajax({ url: 'edit_user', - data: {user: '${data['user']}', friendly_name: friendly_name, do_notify: do_notify}, + data: {user: '${data['user']}', friendly_name: friendly_name, do_notify: do_notify, keep_history: keep_history}, cache: false, async: true, success: function(data) { diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 91d0c9f7..fe8285bd 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -386,7 +386,8 @@ def dbcheck(): 'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTOINCREMENT, ' 'user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL UNIQUE, ' 'friendly_name TEXT, thumb TEXT, email TEXT, is_home_user INTEGER DEFAULT NULL, ' - 'is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, do_notify INTEGER DEFAULT 1)' + 'is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, do_notify INTEGER DEFAULT 1, ' + 'keep_history INTEGER DEFAULT 1)' ) # Upgrade sessions table from earlier versions @@ -540,6 +541,15 @@ def dbcheck(): 'ALTER TABLE users ADD COLUMN do_notify INTEGER DEFAULT 1' ) + # Upgrade sessions table from earlier versions + try: + c_db.execute('SELECT keep_history from users') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table sessions.") + c_db.execute( + 'ALTER TABLE users ADD COLUMN keep_history INTEGER DEFAULT 1' + ) + conn_db.commit() c_db.close() diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 8bba95b1..4219bea4 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -222,7 +222,7 @@ class DataFactory(object): return dict # TODO: The getter and setter for this needs to become a config getter/setter for more than just friendlyname - def set_user_friendly_name(self, user=None, user_id=None, friendly_name=None, do_notify=0): + def set_user_friendly_name(self, user=None, user_id=None, friendly_name=None, do_notify=0, keep_history=1): if user_id: if friendly_name.strip() == '': friendly_name = None @@ -231,7 +231,8 @@ class DataFactory(object): control_value_dict = {"user_id": user_id} new_value_dict = {"friendly_name": friendly_name, - "do_notify": do_notify} + "do_notify": do_notify, + "keep_history": keep_history} try: monitor_db.upsert('users', new_value_dict, control_value_dict) except Exception, e: @@ -244,7 +245,8 @@ class DataFactory(object): control_value_dict = {"username": user} new_value_dict = {"friendly_name": friendly_name, - "do_notify": do_notify} + "do_notify": do_notify, + "keep_history": keep_history} try: monitor_db.upsert('users', new_value_dict, control_value_dict) except Exception, e: @@ -255,39 +257,44 @@ class DataFactory(object): monitor_db = database.MonitorDatabase() query = 'select username, ' \ '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END),' \ - 'do_notify ' \ + 'do_notify, keep_history ' \ 'FROM users WHERE user_id = ?' result = monitor_db.select(query, args=[user_id]) if result: user_detail = {'user_id': user_id, 'user': result[0][0], 'friendly_name': result[0][1], - 'do_notify': helpers.checked(result[0][2])} + 'do_notify': helpers.checked(result[0][2]), + 'keep_history': helpers.checked(result[0][3]) + } return user_detail else: user_detail = {'user_id': user_id, 'user': '', 'friendly_name': '', - 'do_notify': ''} + 'do_notify': '', + 'keep_history': ''} return user_detail elif user: monitor_db = database.MonitorDatabase() query = 'select user_id, ' \ '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END),' \ - 'do_notify ' \ + 'do_notify, keep_history ' \ 'FROM users WHERE username = ?' result = monitor_db.select(query, args=[user]) if result: user_detail = {'user_id': result[0][0], 'user': user, 'friendly_name': result[0][1], - 'do_notify': helpers.checked(result[0][2])} + 'do_notify': helpers.checked(result[0][2]), + 'keep_history': helpers.checked(result[0][3])} return user_detail else: user_detail = {'user_id': None, 'user': user, 'friendly_name': '', - 'do_notify': ''} + 'do_notify': '', + 'keep_history': ''} return user_detail return None diff --git a/plexpy/http_handler.py b/plexpy/http_handler.py index 60950ff1..dc75a5c9 100644 --- a/plexpy/http_handler.py +++ b/plexpy/http_handler.py @@ -52,7 +52,7 @@ class HTTPHandler(object): if uri: if proto.upper() == 'HTTPS': - if not self.ssl_verify: + if not self.ssl_verify and hasattr(ssl, '_create_unverified_context'): context = ssl._create_unverified_context() handler = HTTPSConnection(host=self.host, port=self.port, timeout=10, context=context) logger.warn(u"PlexPy HTTP Handler :: Unverified HTTPS request made. This connection is not secure.") diff --git a/plexpy/monitor.py b/plexpy/monitor.py index f8ac4c11..35ae683f 100644 --- a/plexpy/monitor.py +++ b/plexpy/monitor.py @@ -179,6 +179,10 @@ class MonitorProcessing(object): self.db.upsert('sessions', timestamp, keys) def write_session_history(self, session=None, import_metadata=None, is_import=False, import_ignore_interval=0): + from plexpy import datafactory + + data_factory = datafactory.DataFactory() + user_details = data_factory.get_user_friendly_name(user=session['user']) if session: logging_enabled = False @@ -218,6 +222,10 @@ class MonitorProcessing(object): (session['rating_key'], str(int(stopped) - session['started']), import_ignore_interval)) + if not user_details['keep_history']: + logging_enabled = False + logger.debug(u"PlexPy Monitor :: History logging for user '%s' is disabled." % session['user']) + if logging_enabled: # logger.debug(u"PlexPy Monitor :: Attempting to write to session_history table...") query = 'INSERT INTO session_history (started, stopped, rating_key, parent_rating_key, ' \ diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 4d308158..363faa8e 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -179,10 +179,17 @@ class WebInterface(object): do_notify = kwargs.get('do_notify') else: do_notify = 0 + if 'keep_history' in kwargs: + keep_history = kwargs.get('keep_history') + else: + keep_history = 0 if user_id: try: data_factory = datafactory.DataFactory() - data_factory.set_user_friendly_name(user_id=user_id, friendly_name=friendly_name, do_notify=do_notify) + data_factory.set_user_friendly_name(user_id=user_id, + friendly_name=friendly_name, + do_notify=do_notify, + keep_history=keep_history) status_message = "Successfully updated user." return status_message @@ -192,7 +199,10 @@ class WebInterface(object): if user: try: data_factory = datafactory.DataFactory() - data_factory.set_user_friendly_name(user=user, friendly_name=friendly_name, do_notify=do_notify) + data_factory.set_user_friendly_name(user=user, + friendly_name=friendly_name, + do_notify=do_notify, + keep_history=keep_history) status_message = "Successfully updated user." return status_message