mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Cleaned up database

Browse Source
This commit is contained in:
krateng 2021-12-09 06:35:43 +01:00
parent e110ed765f
commit e17002299b
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
maloja/database.py
View File

@ -46,7 +46,8 @@ import urllib
dblock = Lock() #global database lock dblock = Lock() #global database lock
dbstatus = { dbstatus = {
"healthy":False, "healthy":False,
"rebuildinprogress":False "rebuildinprogress":False,
"complete":False
} }
class DatabaseNotBuilt(HTTPError): class DatabaseNotBuilt(HTTPError):
def __init__(self): def __init__(self):
@ -268,7 +269,6 @@ def api_key_correct(request):
def get_scrobbles(**keys): def get_scrobbles(**keys):
if not dbstatus['healthy']: raise DatabaseNotBuilt()
r = db_query(**{k:keys[k] for k in keys if k in ["artist","artists","title","since","to","within","timerange","associated","track"]}) r = db_query(**{k:keys[k] for k in keys if k in ["artist","artists","title","since","to","within","timerange","associated","track"]})
#offset = (keys.get('page') * keys.get('perpage')) if keys.get('perpage') is not math.inf else 0 #offset = (keys.get('page') * keys.get('perpage')) if keys.get('perpage') is not math.inf else 0
#r = r[offset:] #r = r[offset:]
@ -277,7 +277,6 @@ def get_scrobbles(**keys):
def info(): def info():
if not dbstatus['healthy']: raise DatabaseNotBuilt()
totalscrobbles = get_scrobbles_num() totalscrobbles = get_scrobbles_num()
artists = {} artists = {}
@ -293,7 +292,6 @@ def info():
def get_scrobbles_num(**keys): def get_scrobbles_num(**keys):
if not dbstatus['healthy']: raise DatabaseNotBuilt()
r = db_query(**{k:keys[k] for k in keys if k in ["artist","track","artists","title","since","to","within","timerange","associated"]}) r = db_query(**{k:keys[k] for k in keys if k in ["artist","track","artists","title","since","to","within","timerange","associated"]})
return len(r) return len(r)
@ -332,7 +330,6 @@ def get_scrobbles_num(**keys):
def get_tracks(artist=None): def get_tracks(artist=None):
if not dbstatus['healthy']: raise DatabaseNotBuilt()
artistid = ARTISTS.index(artist) if artist is not None else None artistid = ARTISTS.index(artist) if artist is not None else None
# Option 1 # Option 1
@ -350,16 +347,13 @@ def get_artists():
def get_charts_artists(**keys): def get_charts_artists(**keys):
if not dbstatus['healthy']: raise DatabaseNotBuilt()
return db_aggregate(by="ARTIST",**{k:keys[k] for k in keys if k in ["since","to","within","timerange"]}) return db_aggregate(by="ARTIST",**{k:keys[k] for k in keys if k in ["since","to","within","timerange"]})
def get_charts_tracks(**keys): def get_charts_tracks(**keys):
if not dbstatus['healthy']: raise DatabaseNotBuilt()
return db_aggregate(by="TRACK",**{k:keys[k] for k in keys if k in ["since","to","within","timerange","artist"]}) return db_aggregate(by="TRACK",**{k:keys[k] for k in keys if k in ["since","to","within","timerange","artist"]})
def get_pulse(**keys): def get_pulse(**keys):
if not dbstatus['healthy']: raise DatabaseNotBuilt()
rngs = ranges(**{k:keys[k] for k in keys if k in ["since","to","within","timerange","step","stepn","trail"]}) rngs = ranges(**{k:keys[k] for k in keys if k in ["since","to","within","timerange","step","stepn","trail"]})
results = [] results = []
@ -371,7 +365,6 @@ def get_pulse(**keys):
def get_performance(**keys): def get_performance(**keys):
if not dbstatus['healthy']: raise DatabaseNotBuilt()
rngs = ranges(**{k:keys[k] for k in keys if k in ["since","to","within","timerange","step","stepn","trail"]}) rngs = ranges(**{k:keys[k] for k in keys if k in ["since","to","within","timerange","step","stepn","trail"]})
results = [] results = []
@ -397,7 +390,6 @@ def get_performance(**keys):
def get_top_artists(**keys): def get_top_artists(**keys):
if not dbstatus['healthy']: raise DatabaseNotBuilt()
rngs = ranges(**{k:keys[k] for k in keys if k in ["since","to","within","timerange","step","stepn","trail"]}) rngs = ranges(**{k:keys[k] for k in keys if k in ["since","to","within","timerange","step","stepn","trail"]})
results = [] results = []
@ -722,6 +714,7 @@ def build_db():
global dbstatus global dbstatus
dbstatus['healthy'] = False dbstatus['healthy'] = False
dbstatus['complete'] = False
dbstatus['rebuildinprogress'] = True dbstatus['rebuildinprogress'] = True
log("Building database...") log("Building database...")
@ -765,6 +758,8 @@ def build_db():
if n % m == 0: log(f"Loaded {n}/{scrobblenum}...") if n % m == 0: log(f"Loaded {n}/{scrobblenum}...")
if usebar: pbar.done() if usebar: pbar.done()
log("Database loaded, optimizing...") log("Database loaded, optimizing...")
# optimize database # optimize database
@ -785,6 +780,9 @@ def build_db():
# ARTISTS.append(artist) # ARTISTS.append(artist)
# coa.updateIDs(ARTISTS) # coa.updateIDs(ARTISTS)
dbstatus['healthy'] = True
#start regular tasks #start regular tasks
utilities.update_medals() utilities.update_medals()
utilities.update_weekly() utilities.update_weekly()
@ -794,7 +792,8 @@ def build_db():
global ISSUES global ISSUES
ISSUES = check_issues() ISSUES = check_issues()
dbstatus['healthy'] = True
dbstatus['complete'] = True
dbstatus['rebuildinprogress'] = False dbstatus['rebuildinprogress'] = False
log("Database fully built!") log("Database fully built!")