diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py index 561bd5e..4922029 100644 --- a/maloja/database/__init__.py +++ b/maloja/database/__init__.py @@ -605,7 +605,10 @@ def artist_info(dbconn=None,**keys): cert = None own_track_charts = get_charts_tracks(timerange=alltime(),resolve_ids=False,artist=artist,dbconn=dbconn) - own_album_charts = get_charts_albums(timerange=alltime(),resolve_ids=False,artist=artist,dbconn=dbconn) + own_album_charts = get_charts_albums(timerange=alltime(),resolve_ids=True,artist=artist,dbconn=dbconn) + # we resolve ids here which we don't need to. however, on the jinja page we make that same call + # later again with resolve ids, so its a cache miss and it doubles page load time + # TODO: find better solution if own_track_charts: c = own_track_charts[0] scrobbles = c["scrobbles"] diff --git a/maloja/web/jinja/partials/album_showcase.jinja b/maloja/web/jinja/partials/album_showcase.jinja index 6fa167c..1596781 100644 --- a/maloja/web/jinja/partials/album_showcase.jinja +++ b/maloja/web/jinja/partials/album_showcase.jinja @@ -4,7 +4,7 @@
-{% for entry in dbc.get_charts_albums(filterkeys,limitkeys,{'appearing':False}) %} +{% for entry in dbc.get_charts_albums(filterkeys,limitkeys) %} {%- set cert = None -%} {%- if entry.scrobbles >= settings.scrobbles_gold_album -%}{% set cert = 'gold' %}{%- endif -%} diff --git a/maloja/web/jinja/partials/awards_artist.jinja b/maloja/web/jinja/partials/awards_artist.jinja index fe8da39..338cce9 100644 --- a/maloja/web/jinja/partials/awards_artist.jinja +++ b/maloja/web/jinja/partials/awards_artist.jinja @@ -57,7 +57,8 @@ -{% set albumcharts = dbc.get_charts_albums({'artist':artist,'timerange':malojatime.alltime()}) %} +{% set albumcharts = dbc.get_charts_albums({'artist':artist,'timerange':malojatime.alltime(),'resolve_ids':True}) %} +{# TODO: find better solution, we just resolve ids here because we have that in the cache anyway #} {% for e in albumcharts -%} {%- if e.scrobbles >= settings.scrobbles_gold_album -%}{% set cert = 'gold' %}{%- endif -%} {%- if e.scrobbles >= settings.scrobbles_platinum_album -%}{% set cert = 'platinum' %}{%- endif -%}