github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-14 17:22:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unicode strings

Browse source
This commit is contained in:
JonnyWong16 2019-11-23 14:37:26 -08:00
parent 1c18e72539
commit c279057f91
28 changed files with 834 additions and 847 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plexpy/database.py
View file

@ -39,7 +39,7 @@ def drop_session_db():
def clear_history_tables():
logger.debug(u"Tautulli Database :: Deleting all session_history records... No turning back now bub.")
logger.debug("Tautulli Database :: Deleting all session_history records... No turning back now bub.")
monitor_db = MonitorDatabase()
monitor_db.action('DELETE FROM session_history')
monitor_db.action('DELETE FROM session_history_media_info')
@ -48,7 +48,7 @@ def clear_history_tables():
def delete_sessions():
logger.debug(u"Tautulli Database :: Clearing temporary sessions from database.")
logger.debug("Tautulli Database :: Clearing temporary sessions from database.")
monitor_db = MonitorDatabase()
try:
@ -56,7 +56,7 @@ def delete_sessions():
monitor_db.action('VACUUM')
return True
except Exception as e:
logger.warn(u"Tautulli Database :: Unable to clear temporary sessions from database: %s." % e)
logger.warn("Tautulli Database :: Unable to clear temporary sessions from database: %s." % e)
return False
@ -103,13 +103,13 @@ def make_backup(cleanup=False, scheduler=False):
try:
os.remove(file_)
except OSError as e:
logger.error(u"Tautulli Database :: Failed to delete %s from the backup folder: %s" % (file_, e))
logger.error("Tautulli Database :: Failed to delete %s from the backup folder: %s" % (file_, e))
if backup_file in os.listdir(backup_folder):
logger.debug(u"Tautulli Database :: Successfully backed up %s to %s" % (db_filename(), backup_file))
logger.debug("Tautulli Database :: Successfully backed up %s to %s" % (db_filename(), backup_file))
return True
else:
logger.error(u"Tautulli Database :: Failed to backup %s to %s" % (db_filename(), backup_file))
logger.error("Tautulli Database :: Failed to backup %s to %s" % (db_filename(), backup_file))
return False
@ -162,15 +162,15 @@ class MonitorDatabase(object):
except sqlite3.OperationalError as e:
if "unable to open database file" in e or "database is locked" in e:
logger.warn(u"Tautulli Database :: Database Error: %s", e)
logger.warn("Tautulli Database :: Database Error: %s", e)
attempts += 1
time.sleep(1)
else:
logger.error(u"Tautulli Database :: Database error: %s", e)
logger.error("Tautulli Database :: Database error: %s", e)
raise
except sqlite3.DatabaseError as e:
logger.error(u"Tautulli Database :: Fatal Error executing %s :: %s", query, e)
logger.error("Tautulli Database :: Fatal Error executing %s :: %s", query, e)
raise
return sql_result
@ -214,7 +214,7 @@ class MonitorDatabase(object):
try:
self.action(insert_query, value_dict.values() + key_dict.values())
except sqlite3.IntegrityError:
logger.info(u"Tautulli Database :: Queries failed: %s and %s", update_query, insert_query)
logger.info("Tautulli Database :: Queries failed: %s and %s", update_query, insert_query)
# We want to know if it was an update or insert
return trans_type