From 7d709ef6d9032d00544c8c519fde55d9d45c62c8 Mon Sep 17 00:00:00 2001 From: krateng Date: Sun, 29 Oct 2023 01:38:58 +0200 Subject: [PATCH] Fixed album charts --- maloja/database/__init__.py | 1 + maloja/web/jinja/charts_albums.jinja | 2 +- maloja/web/jinja/partials/charts_albums.jinja | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/maloja/database/__init__.py b/maloja/database/__init__.py index 1bc6eb1..d35f456 100644 --- a/maloja/database/__init__.py +++ b/maloja/database/__init__.py @@ -436,6 +436,7 @@ def get_charts_albums(dbconn=None,resolve_ids=True,only_own_albums=False,**keys) if 'artist' in keys: result = sqldb.count_scrobbles_by_album_combined(since=since,to=to,artist=keys['artist'],associated=keys.get('associated',False),resolve_ids=resolve_ids,dbconn=dbconn) if only_own_albums: + # TODO: this doesnt take associated into account and doesnt change ranks result = [e for e in result if keys['artist'] in (e['album']['artists'] or [])] else: result = sqldb.count_scrobbles_by_album(since=since,to=to,resolve_ids=resolve_ids,dbconn=dbconn) diff --git a/maloja/web/jinja/charts_albums.jinja b/maloja/web/jinja/charts_albums.jinja index e49be2e..73fcceb 100644 --- a/maloja/web/jinja/charts_albums.jinja +++ b/maloja/web/jinja/charts_albums.jinja @@ -8,7 +8,7 @@ {% endblock %} -{% set charts = dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':True}) %} +{% set charts = dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':False}) %} {% set pages = math.ceil(charts.__len__() / amountkeys.perpage) %} {% if charts[0] is defined %} {% set topalbum = charts[0].album %} diff --git a/maloja/web/jinja/partials/charts_albums.jinja b/maloja/web/jinja/partials/charts_albums.jinja index 8ed758a..c594c0f 100644 --- a/maloja/web/jinja/partials/charts_albums.jinja +++ b/maloja/web/jinja/partials/charts_albums.jinja @@ -2,7 +2,7 @@ {% import 'snippets/entityrow.jinja' as entityrow %} {% if charts is undefined %} - {% set charts = dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':True}) %} + {% set charts = dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':False}) %} {% endif %} {% if compare %} {% if compare is true %}