github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-20 13:23:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Include deleted usernames in log filter

Browse source
This commit is contained in:
JonnyWong16 2024-03-14 12:15:02 -07:00
commit 901c484f89
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/logger.py
View file

@ -76,7 +76,7 @@ def filter_usernames(new_users=None):
global _FILTER_USERNAMES global _FILTER_USERNAMES
if new_users is None: if new_users is None:
new_users = [user['username'] for user in users.Users().get_users()] new_users = [user['username'] for user in users.Users().get_users(include_deleted=True)]
for username in new_users: for username in new_users:
if username.lower() not in ('local', 'guest') and len(username) > 3 and username not in _FILTER_USERNAMES: if username.lower() not in ('local', 'guest') and len(username) > 3 and username not in _FILTER_USERNAMES:

6
plexpy/users.py
View file

@ -679,15 +679,17 @@ class Users(object):
return recently_watched return recently_watched
def get_users(self): def get_users(self, include_deleted=False):
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()
where = '' if include_deleted else 'WHERE deleted_user = 0'
try: try:
query = "SELECT id AS row_id, user_id, username, friendly_name, thumb, custom_avatar_url, email, " \ query = "SELECT id AS row_id, user_id, username, friendly_name, thumb, custom_avatar_url, email, " \
"is_active, is_admin, is_home_user, is_allow_sync, is_restricted, " \ "is_active, is_admin, is_home_user, is_allow_sync, is_restricted, " \
"do_notify, keep_history, allow_guest, shared_libraries, " \ "do_notify, keep_history, allow_guest, shared_libraries, " \
"filter_all, filter_movies, filter_tv, filter_music, filter_photos " \ "filter_all, filter_movies, filter_tv, filter_music, filter_photos " \
"FROM users WHERE deleted_user = 0" "FROM users %s" % where
result = monitor_db.select(query=query) result = monitor_db.select(query=query)
except Exception as e: except Exception as e:
logger.warn("Tautulli Users :: Unable to execute database query for get_users: %s." % e) logger.warn("Tautulli Users :: Unable to execute database query for get_users: %s." % e)