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

Implemented associated artists for artist charts

Browse Source
This commit is contained in:
krateng 2022-01-07 03:50:21 +01:00
parent 1824a8e5dc
commit 11bebce807
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maloja/database/__init__.py
View File

@ -51,8 +51,8 @@ class DatabaseNotBuilt(HTTPError):
def __init__(self): def __init__(self):
super().__init__( super().__init__(
status=503, status=503,
body="The Maloja Database is still being built. Try again in a few seconds.", body="The Maloja Database is being upgraded to Version 3. This could take several minutes.",
headers={"Retry-After":10} headers={"Retry-After":120}
) )

31
maloja/database/sqldb.py
View File

@ -44,6 +44,12 @@ DB['trackartists'] = sql.Table(
sql.Column('track_id',sql.Integer,sql.ForeignKey('tracks.id')) sql.Column('track_id',sql.Integer,sql.ForeignKey('tracks.id'))
) )
DB['associated_artists'] = sql.Table(
'associated_artists', meta,
sql.Column('source_artist',sql.Integer,sql.ForeignKey('artists.id')),
sql.Column('target_artist',sql.Integer,sql.ForeignKey('artists.id'))
)
meta.create_all(engine) meta.create_all(engine)
##### DB <-> Dict translations ##### DB <-> Dict translations
@ -353,15 +359,30 @@ def get_tracks():
### functions that count rows for parameters ### functions that count rows for parameters
def count_scrobbles_by_artist(since,to): def count_scrobbles_by_artist(since,to):
jointable = sql.join(DB['scrobbles'],DB['trackartists'],DB['scrobbles'].c.track_id == DB['trackartists'].c.track_id) jointable = sql.join(
DB['scrobbles'],
DB['trackartists'],
DB['scrobbles'].c.track_id == DB['trackartists'].c.track_id
)
jointable2 = sql.join(
jointable,
DB['associated_artists'],
DB['trackartists'].c.artist_id == DB['associated_artists'].c.source_artist,
isouter=True
)
with engine.begin() as conn: with engine.begin() as conn:
op = sql.select( op = sql.select(
sql.func.count(DB['scrobbles'].c.timestamp).label('count'), sql.func.count(sql.func.distinct(DB['scrobbles'].c.timestamp)).label('count'),
DB['trackartists'].c.artist_id # only count distinct scrobbles - because of artist replacement, we could end up
).select_from(jointable).where( # with two artists of the same scrobble counting it twice for the same artist
# e.g. Irene and Seulgi adding two scrobbles to Red Velvet for one real scrobble
sql.func.coalesce(DB['associated_artists'].c.target_artist,DB['trackartists'].c.artist_id).label('artist_id')
# use the replaced artist as artist to count if it exists, otherwise original one
).select_from(jointable2).where(
DB['scrobbles'].c.timestamp<=to, DB['scrobbles'].c.timestamp<=to,
DB['scrobbles'].c.timestamp>=since DB['scrobbles'].c.timestamp>=since
).group_by(DB['trackartists'].c.artist_id).order_by(sql.desc('count')) ).group_by(sql.func.coalesce(DB['associated_artists'].c.target_artist,DB['trackartists'].c.artist_id)).order_by(sql.desc('count'))
result = conn.execute(op).all() result = conn.execute(op).all()