diff --git a/maloja/database/dbcache.py b/maloja/database/dbcache.py index 0ccdddf..af046cb 100644 --- a/maloja/database/dbcache.py +++ b/maloja/database/dbcache.py @@ -51,7 +51,7 @@ if malojaconfig['USE_GLOBAL_CACHE']: cache[key] = result return result - outer_func.__name__ = f"cache_wrap_{inner_func.__name__}" + outer_func.__name__ = f"CACHD_{inner_func.__name__}" return outer_func diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py index 59f29fc..ac4dff0 100644 --- a/maloja/database/sqldb.py +++ b/maloja/database/sqldb.py @@ -157,7 +157,7 @@ def connection_provider(func): return func(*args,**kwargs) wrapper.__innerfunc__ = func - wrapper.__name__ = f"connection_provider_{func.__name__}" + wrapper.__name__ = f"CONPR_{func.__name__}" return wrapper @connection_provider diff --git a/maloja/dev/profiler.py b/maloja/dev/profiler.py index af4e57c..c20db90 100644 --- a/maloja/dev/profiler.py +++ b/maloja/dev/profiler.py @@ -50,9 +50,9 @@ def profile(func): times.setdefault(realfunc,[]).append(seconds) if SINGLE_CALLS: - log(f"Executed {realfunc.__name__} ({args}, {kwargs}) in {seconds:.2f}s",module="debug_performance") + log(f"Executed {realfunc.__name__} ({args}, {kwargs}) in {seconds:.3f}s",module="debug_performance") else: - log(f"Executed {realfunc.__name__} ({args}, {kwargs}) in {seconds:.2f}s (Average: { sum(times[realfunc])/len(times[realfunc]):.2f}s)",module="debug_performance") + log(f"Executed {realfunc.__name__} ({args}, {kwargs}) in {seconds:.3f}s (Average: { sum(times[realfunc])/len(times[realfunc]):.3f}s)",module="debug_performance") if FULL_PROFILE: targetfilename = os.path.join(benchmarkfolder,f"{realfunc.__name__}.stats") diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja index cffe787..87f3e8b 100644 --- a/maloja/web/jinja/artist.jinja +++ b/maloja/web/jinja/artist.jinja @@ -9,7 +9,7 @@ {% endblock %} {% set artist = filterkeys.artist %} -{% set info = db.artist_info(artist=artist) %} +{% set info = dbc.artist_info({'artist':artist}) %} {% set credited = info.get('replace') %} {% set included = info.get('associated') %} diff --git a/maloja/web/jinja/partials/awards_artist.jinja b/maloja/web/jinja/partials/awards_artist.jinja index f545ea7..fe8da39 100644 --- a/maloja/web/jinja/partials/awards_artist.jinja +++ b/maloja/web/jinja/partials/awards_artist.jinja @@ -57,7 +57,7 @@ -{% set albumcharts = db.get_charts_albums(artist=artist,timerange=malojatime.alltime()) %} +{% set albumcharts = dbc.get_charts_albums({'artist':artist,'timerange':malojatime.alltime()}) %} {% 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 -%} @@ -72,7 +72,7 @@ {%- endfor %} -{% set charts = db.get_charts_tracks(artist=artist,timerange=malojatime.alltime()) %} +{% set charts = dbc.get_charts_tracks({'artist':artist,'timerange':malojatime.alltime()}) %} {% for e in charts -%} {%- if e.scrobbles >= settings.scrobbles_gold -%}{% set cert = 'gold' %}{%- endif -%} {%- if e.scrobbles >= settings.scrobbles_platinum -%}{% set cert = 'platinum' %}{%- endif -%} diff --git a/maloja/web/jinja/partials/info_album.jinja b/maloja/web/jinja/partials/info_album.jinja index 8119bc8..0f4d910 100644 --- a/maloja/web/jinja/partials/info_album.jinja +++ b/maloja/web/jinja/partials/info_album.jinja @@ -1,5 +1,5 @@ {% import 'snippets/links.jinja' as links %} -{% import 'partials/awards_album.jinja' as awards %} +{% import 'partials/awards_album.jinja' as awards with context %} {% set album = filterkeys.album %} {% set info = dbc.album_info({'album':album}) %} diff --git a/maloja/web/jinja/partials/info_artist.jinja b/maloja/web/jinja/partials/info_artist.jinja index 30d0026..4fed57d 100644 --- a/maloja/web/jinja/partials/info_artist.jinja +++ b/maloja/web/jinja/partials/info_artist.jinja @@ -1,9 +1,9 @@ {% import 'snippets/links.jinja' as links %} -{% import 'partials/awards_artist.jinja' as awards %} +{% import 'partials/awards_artist.jinja' as awards with context %} {% set artist = filterkeys.artist %} -{% set info = db.artist_info(artist=artist) %} +{% set info = dbc.artist_info({'artist':artist}) %} {% set encodedartist = mlj_uri.uriencode({'artist':artist}) %} {% set credited = info.get('replace') %} diff --git a/maloja/web/jinja/partials/info_track.jinja b/maloja/web/jinja/partials/info_track.jinja index 64233cb..1471022 100644 --- a/maloja/web/jinja/partials/info_track.jinja +++ b/maloja/web/jinja/partials/info_track.jinja @@ -4,7 +4,7 @@ {% set info = dbc.track_info({'track':track}) %} {% set encodedtrack = mlj_uri.uriencode({'track':track}) %} -{% import 'partials/awards_track.jinja' as awards %} +{% import 'partials/awards_track.jinja' as awards with context %}