From a36abacfbda5f6009305e5cea6c19d7f5dada0bf Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Sat, 21 Mar 2026 14:17:20 -0400 Subject: [PATCH] [widgets] Fix import of live_charts --- vrobbler/apps/music/aggregators.py | 20 +++++++++----------- vrobbler/apps/scrobbles/views.py | 1 + 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/vrobbler/apps/music/aggregators.py b/vrobbler/apps/music/aggregators.py index 6805689..b046772 100644 --- a/vrobbler/apps/music/aggregators.py +++ b/vrobbler/apps/music/aggregators.py @@ -346,20 +346,18 @@ def batch_live_charts( ), ) - items = list(queryset.order_by("-num_scrobbles")[:limit]) + items = list(queryset) for item in items: item.count = item.num_scrobbles - def filter_by_count_attr(qs, attr_name): - return sorted( - [item for item in items if getattr(item, attr_name) > 0], - key=lambda x: -getattr(x, attr_name), - )[:limit] + def filter_by_count_attr(attr_name): + filtered = [item for item in items if getattr(item, attr_name) > 0] + return sorted(filtered, key=lambda x: -getattr(x, attr_name))[:limit] return { - "today": filter_by_count_attr(items, "num_scrobbles_today"), - "last7": filter_by_count_attr(items, "num_scrobbles_last7"), - "last30": filter_by_count_attr(items, "num_scrobbles_last30"), - "year": filter_by_count_attr(items, "num_scrobbles_year"), - "all": items, + "today": filter_by_count_attr("num_scrobbles_today"), + "last7": filter_by_count_attr("num_scrobbles_last7"), + "last30": filter_by_count_attr("num_scrobbles_last30"), + "year": filter_by_count_attr("num_scrobbles_year"), + "all": filter_by_count_attr("num_scrobbles"), } diff --git a/vrobbler/apps/scrobbles/views.py b/vrobbler/apps/scrobbles/views.py index b9731c7..c1a925e 100644 --- a/vrobbler/apps/scrobbles/views.py +++ b/vrobbler/apps/scrobbles/views.py @@ -30,6 +30,7 @@ from moods.models import Mood from music.aggregators import ( artist_scrobble_count, batch_live_charts, + live_charts, live_tv_charts, live_youtube_channel_charts, scrobble_counts,