mirror
/
maloja
mirror of https://github.com/krateng/maloja.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Consistency fixes

This commit is contained in:
krateng 2022-02-27 00:33:55 +01:00
parent 86c4261a96
commit fe0d06af7e
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maloja/database/__init__.py
View File

@ -141,11 +141,11 @@ def get_scrobbles_num(dbconn=None,**keys):
return len(get_scrobbles(dbconn=dbconn,**keys))
@waitfordb
def get_tracks(dbconn=None,artist=None):
if artist is None:
def get_tracks(dbconn=None,**keys):
if keys.get('artist') is None:
result = sqldb.get_tracks(dbconn=dbconn)
else:
result = sqldb.get_tracks_of_artist(artist,dbconn=dbconn)
result = sqldb.get_tracks_of_artist(keys.get('artist'),dbconn=dbconn)
return result
@waitfordb
@ -240,7 +240,9 @@ def get_top_tracks(dbconn=None,**keys):
return results
@waitfordb
def artist_info(artist,dbconn=None):
def artist_info(dbconn=None,**keys):
artist = keys.get('artist')
artist = sqldb.get_artist(sqldb.get_artist_id(artist,dbconn=dbconn),dbconn=dbconn)
alltimecharts = get_charts_artists(timerange=alltime(),dbconn=dbconn)
@ -274,7 +276,9 @@ def artist_info(artist,dbconn=None):
@waitfordb
def track_info(track,dbconn=None):
def track_info(dbconn=None,**keys):
track = keys.get('track')
track = sqldb.get_track(sqldb.get_track_id(track,dbconn=dbconn),dbconn=dbconn)
alltimecharts = get_charts_tracks(timerange=alltime(),dbconn=dbconn)

2
maloja/web/jinja/artist.jinja
View File

@ -9,7 +9,7 @@
{% endblock %}
{% set artist = filterkeys.artist %}
{% set info = db.artist_info(artist) %}
{% set info = db.artist_info(artist=artist) %}
{% set credited = info.get('replace') %}
{% set included = info.get('associated') %}

2
maloja/web/jinja/partials/awards_track.jinja
View File

@ -53,7 +53,7 @@
<!-- CERTS -->
{% set info = db.track_info(track) %}
{% set info = db.track_info(track=track) %}
{% if info.certification is not none %}
<img class="certrecord"
src="/media/record_{{ info.certification }}.png"

2
maloja/web/jinja/start.jinja
View File

@ -68,7 +68,7 @@
{% for range in xcurrent %}
<span class="stats">{{ range.localisation }}</span>
<a href='/scrobbles?in={{ range.identifier }}'>{{ db.get_scrobbles_num(timerange=range.range) }}</a>
<a href='/scrobbles?in={{ range.identifier }}'>{{ dbc.get_scrobbles_num({'timerange':range.range}) }}</a>
{% endfor %}
<br/><br/>

2
maloja/web/jinja/track.jinja
View File

@ -13,7 +13,7 @@
{% endblock %}
{% set track = filterkeys.track %}
{% set info = db.track_info(track) %}
{% set info = dbc.track_info({'track':track}) %}
{% set initialrange ='month' %}