mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-16 02:02:58 -07:00
Remove unicode strings
This commit is contained in:
JonnyWong16
parent
1c18e72539
commit
c279057f91
28 changed files with 834 additions and 847 deletions
|
|
@ -28,7 +28,7 @@ import session
|
|||
|
||||
|
||||
def refresh_users():
|
||||
logger.info(u"Tautulli Users :: Requesting users list refresh...")
|
||||
logger.info("Tautulli Users :: Requesting users list refresh...")
|
||||
result = plextv.PlexTV().get_full_users_list()
|
||||
|
||||
if result:
|
||||
|
|
@ -58,10 +58,10 @@ def refresh_users():
|
|||
|
||||
monitor_db.upsert('users', item, keys_dict)
|
||||
|
||||
logger.info(u"Tautulli Users :: Users list refreshed.")
|
||||
logger.info("Tautulli Users :: Users list refreshed.")
|
||||
return True
|
||||
else:
|
||||
logger.warn(u"Tautulli Users :: Unable to refresh users list.")
|
||||
logger.warn("Tautulli Users :: Unable to refresh users list.")
|
||||
return False
|
||||
|
||||
|
||||
|
|
@ -137,7 +137,7 @@ class Users(object):
|
|||
['session_history.id', 'session_history_media_info.id']],
|
||||
kwargs=kwargs)
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_list: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_list: %s." % e)
|
||||
return default_return
|
||||
|
||||
users = query['result']
|
||||
|
|
@ -248,7 +248,7 @@ class Users(object):
|
|||
['session_history.id', 'session_history_media_info.id']],
|
||||
kwargs=kwargs)
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_unique_ips: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_unique_ips: %s." % e)
|
||||
return default_return
|
||||
|
||||
results = query['result']
|
||||
|
|
@ -308,7 +308,7 @@ class Users(object):
|
|||
try:
|
||||
monitor_db.upsert('users', value_dict, key_dict)
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for set_config: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for set_config: %s." % e)
|
||||
|
||||
def get_details(self, user_id=None, user=None, email=None):
|
||||
default_return = {'user_id': 0,
|
||||
|
|
@ -358,7 +358,7 @@ class Users(object):
|
|||
else:
|
||||
result = []
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_details: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_details: %s." % e)
|
||||
result = []
|
||||
|
||||
user_details = {}
|
||||
|
|
@ -403,7 +403,7 @@ class Users(object):
|
|||
return user_details
|
||||
|
||||
else:
|
||||
logger.warn(u"Tautulli Users :: Unable to retrieve user %s from database. Requesting user list refresh."
|
||||
logger.warn("Tautulli Users :: Unable to retrieve user %s from database. Requesting user list refresh."
|
||||
% user_id if user_id else user)
|
||||
# Let's first refresh the user list to make sure the user isn't newly added and not in the db yet
|
||||
refresh_users()
|
||||
|
|
@ -414,7 +414,7 @@ class Users(object):
|
|||
return user_details
|
||||
|
||||
else:
|
||||
logger.warn(u"Tautulli Users :: Unable to retrieve user %s from database. Returning 'Local' user."
|
||||
logger.warn("Tautulli Users :: Unable to retrieve user %s from database. Returning 'Local' user."
|
||||
% user_id if user_id else user)
|
||||
# If there is no user data we must return something
|
||||
# Use "Local" user to retain compatibility with PlexWatch database value
|
||||
|
|
@ -458,7 +458,7 @@ class Users(object):
|
|||
else:
|
||||
result = []
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_watch_time_stats: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_watch_time_stats: %s." % e)
|
||||
result = []
|
||||
|
||||
for item in result:
|
||||
|
|
@ -503,7 +503,7 @@ class Users(object):
|
|||
else:
|
||||
result = []
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_player_stats: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_player_stats: %s." % e)
|
||||
result = []
|
||||
|
||||
for item in result:
|
||||
|
|
@ -549,7 +549,7 @@ class Users(object):
|
|||
else:
|
||||
result = []
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_recently_watched: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_recently_watched: %s." % e)
|
||||
result = []
|
||||
|
||||
for row in result:
|
||||
|
|
@ -591,7 +591,7 @@ class Users(object):
|
|||
'FROM users WHERE deleted_user = 0'
|
||||
result = monitor_db.select(query=query)
|
||||
except Exception as e:
|
||||
logger.warn(u"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)
|
||||
return None
|
||||
|
||||
users = []
|
||||
|
|
@ -625,7 +625,7 @@ class Users(object):
|
|||
|
||||
try:
|
||||
if str(user_id).isdigit():
|
||||
logger.info(u"Tautulli Users :: Deleting all history for user id %s from database." % user_id)
|
||||
logger.info("Tautulli Users :: Deleting all history for user id %s from database." % user_id)
|
||||
session_history_media_info_del = \
|
||||
monitor_db.action('DELETE FROM '
|
||||
'session_history_media_info '
|
||||
|
|
@ -649,7 +649,7 @@ class Users(object):
|
|||
else:
|
||||
return 'Unable to delete items. Input user_id not valid.'
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for delete_all_history: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for delete_all_history: %s." % e)
|
||||
|
||||
def delete(self, user_id=None):
|
||||
monitor_db = database.MonitorDatabase()
|
||||
|
|
@ -657,7 +657,7 @@ class Users(object):
|
|||
try:
|
||||
if str(user_id).isdigit():
|
||||
self.delete_all_history(user_id)
|
||||
logger.info(u"Tautulli Users :: Deleting user with id %s from database." % user_id)
|
||||
logger.info("Tautulli Users :: Deleting user with id %s from database." % user_id)
|
||||
monitor_db.action('UPDATE users SET deleted_user = 1 WHERE user_id = ?', [user_id])
|
||||
monitor_db.action('UPDATE users SET keep_history = 0 WHERE user_id = ?', [user_id])
|
||||
monitor_db.action('UPDATE users SET do_notify = 0 WHERE user_id = ?', [user_id])
|
||||
|
|
@ -666,7 +666,7 @@ class Users(object):
|
|||
else:
|
||||
return 'Unable to delete user, user_id not valid.'
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for delete: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for delete: %s." % e)
|
||||
|
||||
def undelete(self, user_id=None, username=None):
|
||||
monitor_db = database.MonitorDatabase()
|
||||
|
|
@ -676,7 +676,7 @@ class Users(object):
|
|||
query = 'SELECT * FROM users WHERE user_id = ?'
|
||||
result = monitor_db.select(query=query, args=[user_id])
|
||||
if result:
|
||||
logger.info(u"Tautulli Users :: Re-adding user with id %s to database." % user_id)
|
||||
logger.info("Tautulli Users :: Re-adding user with id %s to database." % user_id)
|
||||
monitor_db.action('UPDATE users SET deleted_user = 0 WHERE user_id = ?', [user_id])
|
||||
monitor_db.action('UPDATE users SET keep_history = 1 WHERE user_id = ?', [user_id])
|
||||
monitor_db.action('UPDATE users SET do_notify = 1 WHERE user_id = ?', [user_id])
|
||||
|
|
@ -688,7 +688,7 @@ class Users(object):
|
|||
query = 'SELECT * FROM users WHERE username = ?'
|
||||
result = monitor_db.select(query=query, args=[username])
|
||||
if result:
|
||||
logger.info(u"Tautulli Users :: Re-adding user with username %s to database." % username)
|
||||
logger.info("Tautulli Users :: Re-adding user with username %s to database." % username)
|
||||
monitor_db.action('UPDATE users SET deleted_user = 0 WHERE username = ?', [username])
|
||||
monitor_db.action('UPDATE users SET keep_history = 1 WHERE username = ?', [username])
|
||||
monitor_db.action('UPDATE users SET do_notify = 1 WHERE username = ?', [username])
|
||||
|
|
@ -697,7 +697,7 @@ class Users(object):
|
|||
return False
|
||||
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for undelete: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for undelete: %s." % e)
|
||||
|
||||
# Keep method for PlexWatch/Plexivity import
|
||||
def get_user_id(self, user=None):
|
||||
|
|
@ -731,7 +731,7 @@ class Users(object):
|
|||
|
||||
result = monitor_db.select(query)
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_user_names: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_user_names: %s." % e)
|
||||
return None
|
||||
|
||||
return session.friendly_name_to_username(result)
|
||||
|
|
@ -768,7 +768,7 @@ class Users(object):
|
|||
'WHERE user_id = ?'
|
||||
result = monitor_db.select_single(query, args=[user_id])
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_filters: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_filters: %s." % e)
|
||||
result = {}
|
||||
|
||||
filters_list = {}
|
||||
|
|
@ -804,7 +804,7 @@ class Users(object):
|
|||
try:
|
||||
monitor_db.upsert(table_name='user_login', key_dict=keys, value_dict=values)
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for set_login_log: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for set_login_log: %s." % e)
|
||||
|
||||
def get_datatables_user_login(self, user_id=None, kwargs=None):
|
||||
default_return = {'recordsFiltered': 0,
|
||||
|
|
@ -845,7 +845,7 @@ class Users(object):
|
|||
join_evals=[['user_login.user_id', 'users.user_id']],
|
||||
kwargs=kwargs)
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for get_datatables_user_login: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for get_datatables_user_login: %s." % e)
|
||||
return default_return
|
||||
|
||||
results = query['result']
|
||||
|
|
@ -880,10 +880,10 @@ class Users(object):
|
|||
monitor_db = database.MonitorDatabase()
|
||||
|
||||
try:
|
||||
logger.info(u"Tautulli Users :: Clearing login logs from database.")
|
||||
logger.info("Tautulli Users :: Clearing login logs from database.")
|
||||
monitor_db.action('DELETE FROM user_login')
|
||||
monitor_db.action('VACUUM')
|
||||
return True
|
||||
except Exception as e:
|
||||
logger.warn(u"Tautulli Users :: Unable to execute database query for delete_login_log: %s." % e)
|
||||
logger.warn("Tautulli Users :: Unable to execute database query for delete_login_log: %s." % e)
|
||||
return False
|
||||
Loading…
Add table
Add a link
Reference in a new issue