[widgets] Fix import of live_charts

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):
+    def filter_by_count_attr(attr_name):
-        return sorted(
+        filtered = [item for item in items if getattr(item, attr_name) > 0]
-            [item for item in items if getattr(item, attr_name) > 0],
+        return sorted(filtered, key=lambda x: -getattr(x, attr_name))[:limit]
-            key=lambda x: -getattr(x, attr_name),
-        )[:limit]
 
     return {
-        "today": filter_by_count_attr(items, "num_scrobbles_today"),
+        "today": filter_by_count_attr("num_scrobbles_today"),
-        "last7": filter_by_count_attr(items, "num_scrobbles_last7"),
+        "last7": filter_by_count_attr("num_scrobbles_last7"),
-        "last30": filter_by_count_attr(items, "num_scrobbles_last30"),
+        "last30": filter_by_count_attr("num_scrobbles_last30"),
-        "year": filter_by_count_attr(items, "num_scrobbles_year"),
+        "year": filter_by_count_attr("num_scrobbles_year"),
-        "all": items,
+        "all": filter_by_count_attr("num_scrobbles"),
     }

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,