[release] Bump to version 58.7

- Split up chart page between tables and maloja
- Fix CI so we don't double run deploys and builds

.gitea/workflows/build.yml

@@ -1,68 +0,0 @@
-name: build
-
-on:
-  push:
-    branches: ["**"]
-  pull_request:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    env:
-      VROBBLER_DATABASE_URL: sqlite:///test.db
-      VROBBLER_USDA_API_KEY: ${{ vars.VROBBLER_USDA_API_KEY }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Cache pip/poetry
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/pip
-            ~/.cache/pypoetry
-          key: ${{ runner.os }}-py311-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-py311-
-
-      - name: Install Poetry
-        run: |
-          python -m pip install --upgrade pip
-          pip install poetry
-
-      - name: Install deps
-        run: |
-          cp vrobbler.conf.test vrobbler.conf
-          poetry install --with test
-
-      - name: Pytest with coverage
-        run: |
-          poetry run pytest -n 5 --cov-report term:skip-covered --cov=vrobbler tests
-
-      - name: Notify success (ntfy)
-        if: success()
-        run: |
-          curl -fsS \
-            -H "Title: vrobbler CI success" \
-            -H "Priority: low" \
-            -H "Tags: success,vrobbler" \
-            -H "Actions: view, Changes, ${{ gitea.server_url }}/${{ gitea.repository }}/commit/${{ gitea.sha }}; view, Build, ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}" \
-            -d "✅ Build succeeded: ${{ gitea.repository }} @ ${{ gitea.sha }}" \
-            https://ntfy.unbl.ink/drone
-
-      - name: Notify failure (ntfy)
-        if: failure()
-        run: |
-          curl -fsS \
-            -H "Title: vrobbler CI failure" \
-            -H "Priority: high" \
-            -H "Tags: failure,vrobbler" \
-            -H "Actions: view, Changes, ${{ gitea.server_url }}/${{ gitea.repository }}/commit/${{ gitea.sha }}; view, Build, ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}" \
-            -d "❌ Build failed: ${{ gitea.repository }} @ ${{ gitea.sha }}" \
-            https://ntfy.unbl.ink/drone

.gitea/workflows/ci.yml

@@ -1,8 +1,14 @@
-name: deploy
+name: ci
 
 on:
   push:
+    branches: ["**"]
     tags: ["*"]
+  pull_request:
+
+concurrency:
+  group: ${{ gitea.workflow }}
+  cancel-in-progress: false
 
 jobs:
   test:
@@ -68,6 +74,7 @@ jobs:
 
   build-and-deploy:
     needs: [test]
+    if: startsWith(gitea.ref, 'refs/tags/')
     runs-on: ubuntu-latest
 
     steps:

PROJECT.org

@@ -88,7 +88,7 @@ fetching and simple saving.
 *** Metadata sources
 **** Scraper
 
-* Backlog [0/22] :vrobbler:project:personal:
+* Backlog [0/23] :vrobbler:project:personal:
 ** TODO [#C] After transition to linux add curl_cffi as webpage scrapper again :webpages:metadata:
 ** TODO [#C] Create small utility to clean up tracks scrobbled with wonky playback times :bug:music:scrobbles:
 :PROPERTIES:
@@ -605,6 +605,38 @@ independent of the email flow it was originally creatdd for
 
 ** TODO [#B] Is there way to create unique slugs for media instances :media_types:
 
+* Version 58.7 [2/2]
+** DONE [#B] Split up chart page between tables and maloja :charts:templates:
+:PROPERTIES:
+:ID:       103ab084-2016-cfa4-c677-3c5fdc54cce0
+:END:
+** DONE [#A] Fix CI so we don't double run deploys and builds :ci:
+:PROPERTIES:
+:ID:       1a93e7cb-b883-aae5-2bd5-fcdd6e16f8ab
+:END:
+
+* Version 58.6 [1/1]
+** DONE [#B] Cleanup commands should check for broken images :metadata:cleanup:
+:PROPERTIES:
+:ID:       bacce321-73c7-ae1f-bfa7-c3ee517b5441
+:END:
+
+* Version 58.5 [1/1]
+** DONE [#A] The maloja style charts are messed up :templates:charts:
+:PROPERTIES:
+:ID:       987397a2-7e74-4eb1-87cc-4c8bbe1c7b23
+:END:
+
+* Version 58.4 [2/2]
+** DONE [#B] Allow people all trends or individual trends :trends:profiles:
+:PROPERTIES:
+:ID:       1d081152-abd1-73c2-a625-903565a10c6c
+:END:
+** DONE [#A] Fix a bug in board game scorelog data :boardgames:logdata:
+:PROPERTIES:
+:ID:       014bab30-13bf-fae7-e678-4666a8d38ae4
+:END:
+
 * Version 58.3 [1/1]
 ** DONE [#A] Remove curl-cffi as it doesn't work on FreeBSD :webpages:deps:
 :PROPERTIES:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vrobbler"
-version = "58.3"
+version = "58.7"
 description = ""
 authors = ["Colin Powell <colin@unbl.ink>"]
 

vrobbler/apps/boardgames/models.py

@@ -120,7 +120,12 @@ class BoardGameLogData(BaseLogData, LongPlayLogData):
     def player_log(self) -> str:
         if self.players:
             return ", ".join(
-                [BoardGameScoreLogData(**player).__str__() for player in self.players]
+                [
+                    BoardGameScoreLogData(
+                        **{k: v for k, v in player.items() if k in BoardGameScoreLogData.__dataclass_fields__}
+                    ).__str__()
+                    for player in self.players
+                ]
             )
         return ""
 
@@ -136,7 +141,9 @@ class BoardGameLogData(BaseLogData, LongPlayLogData):
         if self.players:
             players_html = []
             for player_data in self.players:
-                player = BoardGameScoreLogData(**player_data)
+                player = BoardGameScoreLogData(
+                    **{k: v for k, v in player_data.items() if k in BoardGameScoreLogData.__dataclass_fields__}
+                )
                 player_info = player.name
                 if player.score:
                     player_info += f" ({player.score})"

vrobbler/apps/books/management/commands/cleanup_book_metadata.py

@@ -18,8 +18,17 @@ MISSING_ALL = [
     "publish_year",
 ]
 
+def _cover_missing_or_broken(book) -> bool:
+    if not bool(book.cover):
+        return True
+    try:
+        return not book.cover.storage.exists(book.cover.name)
+    except Exception:
+        return True
+
+
 MISSING_GROUPS = {
-    "cover": lambda b: not bool(b.cover),
+    "cover": _cover_missing_or_broken,
     "summary": lambda b: not b.summary,
     "isbn": lambda b: not b.isbn_13 and not b.isbn_10,
     "pages": lambda b: b.pages is None,

vrobbler/apps/charts/urls.py

@@ -3,6 +3,7 @@ from charts.views import (
     BirdsChartView,
     ChartDetailView,
     ChartRecordView,
+    MalojaChartsView,
     SpotifyTracksView,
 )
 from django.urls import path
@@ -11,6 +12,7 @@ app_name = "charts"
 
 urlpatterns = [
     path("charts/", ChartRecordView.as_view(), name="charts-home"),
+    path("charts/maloja/", MalojaChartsView.as_view(), name="maloja-charts"),
     path("charts/spotify/", SpotifyTracksView.as_view(), name="spotify-tracks"),
     path("charts/bandcamp/", BandcampTracksView.as_view(), name="bandcamp-tracks"),
     path("charts/birds/", BirdsChartView.as_view(), name="birds-chart"),

vrobbler/apps/charts/views.py

@@ -114,175 +114,13 @@ class ChartRecordView(TemplateView):
         context["current_week"] = current_week
         context["current_day"] = current_day
 
-        context["chart_keys"] = {
+        # Resolve date parameters
-            "today": "Today",
+        if date_param:
-            "week": "This Week",
-            "month": "This Month",
-            "year": "This Year",
-            "all": "All Time",
-        }
-
-        context["maloja_charts"] = {
-            "artist": {
-                "today": list(
-                    self.get_charts_for_period(
-                        user,
-                        "artist",
-                        year=current_year,
-                        month=current_month,
-                        day=current_day,
-                    )
-                ),
-                "week": list(
-                    self.get_charts_for_period(
-                        user,
-                        "artist",
-                        year=current_year,
-                        week=current_week,
-                    )
-                ),
-                "month": list(
-                    self.get_charts_for_period(
-                        user,
-                        "artist",
-                        year=current_year,
-                        month=current_month,
-                    )
-                ),
-                "year": list(
-                    self.get_charts_for_period(user, "artist", year=current_year)
-                ),
-                "all": list(self.get_charts_for_period(user, "artist")),
-            },
-            "album": {
-                "today": list(
-                    self.get_charts_for_period(
-                        user,
-                        "album",
-                        year=current_year,
-                        month=current_month,
-                        day=current_day,
-                    )
-                ),
-                "week": list(
-                    self.get_charts_for_period(
-                        user, "album", year=current_year, week=current_week
-                    )
-                ),
-                "month": list(
-                    self.get_charts_for_period(
-                        user,
-                        "album",
-                        year=current_year,
-                        month=current_month,
-                    )
-                ),
-                "year": list(
-                    self.get_charts_for_period(user, "album", year=current_year)
-                ),
-                "all": list(self.get_charts_for_period(user, "album")),
-            },
-            "tv_series": {
-                "today": list(
-                    self.get_charts_for_period(
-                        user,
-                        "tv_series",
-                        year=current_year,
-                        month=current_month,
-                        day=current_day,
-                    )
-                ),
-                "week": list(
-                    self.get_charts_for_period(
-                        user,
-                        "tv_series",
-                        year=current_year,
-                        week=current_week,
-                    )
-                ),
-                "month": list(
-                    self.get_charts_for_period(
-                        user,
-                        "tv_series",
-                        year=current_year,
-                        month=current_month,
-                    )
-                ),
-                "year": list(
-                    self.get_charts_for_period(user, "tv_series", year=current_year)
-                ),
-                "all": list(self.get_charts_for_period(user, "tv_series")),
-            },
-        }
-
-        if not date_param:
-            context["period"] = "current"
-            context["year"] = current_year
-            context["month"] = current_month
-            context["month_name"] = calendar.month_name[current_month]
-            context["week"] = current_week
-            context["day"] = current_day
-
-            context["charts"] = {
-                "artist": list(
-                    self.get_charts_for_period(
-                        user, "artist", year=current_year, limit=20
-                    )
-                ),
-                "album": list(
-                    self.get_charts_for_period(
-                        user, "album", year=current_year, limit=20
-                    )
-                ),
-                "track": list(
-                    self.get_charts_for_period(
-                        user, "track", year=current_year, limit=20
-                    )
-                ),
-                "tv_series": list(
-                    self.get_charts_for_period(
-                        user, "tv_series", year=current_year, limit=20
-                    )
-                ),
-                "video": list(
-                    self.get_charts_for_period(
-                        user, "video", year=current_year, limit=20
-                    )
-                ),
-                "board_game": list(
-                    self.get_charts_for_period(
-                        user, "board_game", year=current_year, limit=20
-                    )
-                ),
-                "book": list(
-                    self.get_charts_for_period(
-                        user, "book", year=current_year, limit=20
-                    )
-                ),
-                "food": list(
-                    self.get_charts_for_period(
-                        user, "food", year=current_year, limit=20
-                    )
-                ),
-                "podcast": list(
-                    self.get_charts_for_period(
-                        user, "podcast", year=current_year, limit=20
-                    )
-                ),
-                "trail": list(
-                    self.get_charts_for_period(
-                        user, "trail", year=current_year, limit=20
-                    )
-                ),
-            }
-        else:
             parts = date_param.split("-")
             year = int(parts[0])
-
             week = None
             month = None
             day = None
-
             if len(parts) >= 2 and parts[1].startswith("W"):
                 week = int(parts[1].lstrip("W"))
             elif len(parts) >= 2 and parts[1]:
@@ -290,20 +128,17 @@ class ChartRecordView(TemplateView):
                     month = int(parts[1])
                 except ValueError:
                     pass
-
             if len(parts) >= 3:
                 if parts[2].startswith("W"):
                     week = int(parts[2].lstrip("W"))
                 elif not parts[2].startswith("W"):
                     day = int(parts[2])
-
             context["period"] = "historical"
             context["year"] = year
             context["month"] = month
             context["month_name"] = calendar.month_name[month] if month else None
             context["week"] = week
             context["day"] = day
-
             period_str = str(year)
             if month:
                 period_str = f"{calendar.month_name[month]} {period_str}"
@@ -312,109 +147,82 @@ class ChartRecordView(TemplateView):
             if day:
                 period_str = f"{calendar.month_name[month]} {day}, {year}"
             context["period_str"] = period_str
+        else:
+            year = current_year
+            month = current_month
+            week = current_week
+            day = current_day
+            context["period"] = "current"
+            context["year"] = current_year
+            context["month"] = current_month
+            context["month_name"] = calendar.month_name[current_month]
+            context["week"] = current_week
+            context["day"] = current_day
 
-            context["charts"] = {
+        # List-group tables default to week-level when no date param (matches active tab)
-                "artist": list(
+        if not date_param:
-                    self.get_charts_for_period(
+            list_year = current_year
-                        user,
+            list_month = None
-                        "artist",
+            list_week = current_week
-                        year=year,
+            list_day = None
-                        month=month,
+        else:
-                        week=week,
+            list_year = year
-                        day=day,
+            list_month = month
-                    )
+            list_week = week
-                ),
+            list_day = day
-                "album": list(
+
-                    self.get_charts_for_period(
+        context["charts"] = {
-                        user,
+            "artist": list(
-                        "album",
+                self.get_charts_for_period(
-                        year=year,
+                    user, "artist", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                        month=month,
+                )
-                        week=week,
+            ),
-                        day=day,
+            "album": list(
-                    )
+                self.get_charts_for_period(
-                ),
+                    user, "album", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                "track": list(
+                )
-                    self.get_charts_for_period(
+            ),
-                        user,
+            "track": list(
-                        "track",
+                self.get_charts_for_period(
-                        year=year,
+                    user, "track", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                        month=month,
+                )
-                        week=week,
+            ),
-                        day=day,
+            "tv_series": list(
-                    )
+                self.get_charts_for_period(
-                ),
+                    user, "tv_series", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                "tv_series": list(
+                )
-                    self.get_charts_for_period(
+            ),
-                        user,
+            "video": list(
-                        "tv_series",
+                self.get_charts_for_period(
-                        year=year,
+                    user, "video", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                        month=month,
+                )
-                        week=week,
+            ),
-                        day=day,
+            "board_game": list(
-                    )
+                self.get_charts_for_period(
-                ),
+                    user, "board_game", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                "video": list(
+                )
-                    self.get_charts_for_period(
+            ),
-                        user,
+            "book": list(
-                        "video",
+                self.get_charts_for_period(
-                        year=year,
+                    user, "book", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                        month=month,
+                )
-                        week=week,
+            ),
-                        day=day,
+            "food": list(
-                    )
+                self.get_charts_for_period(
-                ),
+                    user, "food", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                "board_game": list(
+                )
-                    self.get_charts_for_period(
+            ),
-                        user,
+            "podcast": list(
-                        "board_game",
+                self.get_charts_for_period(
-                        year=year,
+                    user, "podcast", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                        month=month,
+                )
-                        week=week,
+            ),
-                        day=day,
+            "trail": list(
-                    )
+                self.get_charts_for_period(
-                ),
+                    user, "trail", year=list_year, month=list_month, week=list_week, day=list_day, limit=20
-                "book": list(
+                )
-                    self.get_charts_for_period(
+            ),
-                        user,
+        }
-                        "book",
-                        year=year,
-                        month=month,
-                        week=week,
-                        day=day,
-                    )
-                ),
-                "food": list(
-                    self.get_charts_for_period(
-                        user,
-                        "food",
-                        year=year,
-                        month=month,
-                        week=week,
-                        day=day,
-                    )
-                ),
-                "podcast": list(
-                    self.get_charts_for_period(
-                        user,
-                        "podcast",
-                        year=year,
-                        month=month,
-                        week=week,
-                        day=day,
-                    )
-                ),
-                "trail": list(
-                    self.get_charts_for_period(
-                        user,
-                        "trail",
-                        year=year,
-                        month=month,
-                        week=week,
-                        day=day,
-                    )
-                ),
-            }
 
         bird_data = self.get_bird_chart_data(
             user,
@@ -628,6 +436,53 @@ class ChartRecordView(TemplateView):
         }
 
 
+class MalojaChartsView(ChartRecordView):
+    """Three maloja-themed image grid widgets (artists, albums, TV series)
+    with Today/Week/Month/Year/All tabs. Each tab computes its own period
+    from the current date — no query param needed."""
+
+    template_name = "charts/maloja_charts.html"
+
+    def get_context_data(self, **kwargs):
+        context = super(ChartRecordView, self).get_context_data(**kwargs)
+        user = self.request.user
+
+        now = timezone.now()
+        if user.is_authenticated:
+            now = now_user_timezone(user.profile)
+        today = now.date()
+
+        context["chart_keys"] = {
+            "today": "Today",
+            "week": "This Week",
+            "month": "This Month",
+            "year": "This Year",
+            "all": "All Time",
+        }
+
+        tab_params = {
+            "today": {"year": today.year, "month": today.month, "day": today.day},
+            "week": {"year": today.year, "week": today.isocalendar()[1]},
+            "month": {"year": today.year, "month": today.month},
+            "year": {"year": today.year},
+        }
+
+        maloja_charts = {}
+        for media_type in ("artist", "album", "tv_series"):
+            tabs = {}
+            for key in ("today", "week", "month", "year"):
+                tabs[key] = list(
+                    self.get_charts_for_period(user, media_type, **tab_params[key])
+                )
+            tabs["all"] = list(
+                self.get_charts_for_period(user, media_type)
+            )
+            maloja_charts[media_type] = tabs
+
+        context["maloja_charts"] = maloja_charts
+        return context
+
+
 MEDIA_TYPE_LABELS = {
     "artist": ("🎤", "Top Artists"),
     "album": ("💿", "Top Albums"),

vrobbler/apps/music/management/commands/cleanup_music_metadata.py

@@ -0,0 +1,202 @@
+import logging
+
+from django.core.management.base import BaseCommand
+from django.db import models, transaction
+
+logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+    help = "Enrich artist and album metadata (covers, thumbnails) from MusicBrainz and TheAudioDB"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--force",
+            action="store_true",
+            help="Overwrite existing cover image and metadata",
+        )
+        parser.add_argument(
+            "--dry-run",
+            action="store_true",
+            help="Show what would be done without making changes",
+        )
+        parser.add_argument(
+            "--artists",
+            action="store_true",
+            help="Only process artists",
+        )
+        parser.add_argument(
+            "--albums",
+            action="store_true",
+            help="Only process albums",
+        )
+        parser.add_argument(
+            "--needs-metadata",
+            action="store_true",
+            help="Only process items missing metadata or with broken images",
+        )
+
+    def _has_broken_image(self, obj, field_name: str) -> bool:
+        field = getattr(obj, field_name, None)
+        if not field or not field.name:
+            return False
+        try:
+            return not field.storage.exists(field.name)
+        except Exception:
+            return True
+
+    def handle(self, *args, **options):
+        from music.models import Album, Artist
+
+        force = options["force"]
+        dry_run = options["dry_run"]
+        only_artists = options["artists"]
+        only_albums = options["albums"]
+        needs_metadata = options["needs_metadata"]
+
+        if not only_artists and not only_albums:
+            only_artists = only_albums = True
+
+        updated_total = 0
+        errors_total = 0
+
+        if only_artists:
+            updated_total += self._process_artists(force, dry_run, needs_metadata)
+        errors_total = 0  # reset per section
+
+        if only_albums:
+            updated_total += self._process_albums(force, dry_run, needs_metadata)
+
+        self.stdout.write(
+            self.style.SUCCESS(f"\nDone! {updated_total} items processed")
+        )
+
+    def _get_artists(self, needs_metadata: bool):
+        from music.models import Artist
+
+        qs = Artist.objects.all()
+        if needs_metadata:
+            qs = qs.filter(
+                models.Q(theaudiodb_id__isnull=True)
+                | models.Q(theaudiodb_id="")
+                | models.Q(thumbnail__isnull=True)
+                | models.Q(thumbnail="")
+            )
+
+        broken = []
+        if needs_metadata:
+            broken_qs = Artist.objects.exclude(
+                models.Q(thumbnail__isnull=True) | models.Q(thumbnail=""),
+            )
+            for artist in broken_qs.iterator():
+                if self._has_broken_image(artist, "thumbnail"):
+                    broken.append(artist)
+
+        return list(qs) + broken
+
+    def _get_albums(self, needs_metadata: bool):
+        from music.models import Album
+
+        qs = Album.objects.all()
+        if needs_metadata:
+            qs = qs.filter(
+                models.Q(cover_image__isnull=True)
+                | models.Q(cover_image="")
+                | models.Q(cover_image="default-image-replace-me")
+            )
+
+        broken = []
+        if needs_metadata:
+            broken_qs = Album.objects.exclude(
+                models.Q(cover_image__isnull=True) | models.Q(cover_image=""),
+            )
+            for album in broken_qs.iterator():
+                if self._has_broken_image(album, "cover_image"):
+                    broken.append(album)
+
+        return list(qs) + broken
+
+    def _process_artists(self, force, dry_run, needs_metadata):
+        from music.models import Artist
+
+        artists = self._get_artists(needs_metadata) if needs_metadata else list(Artist.objects.all())
+        total = len(artists)
+        self.stdout.write(f"Processing {total} artists")
+
+        if dry_run:
+            for artist in artists:
+                has_tadb = bool(artist.theaudiodb_id)
+                has_thumb = bool(artist.thumbnail)
+                thumb_broken = self._has_broken_image(artist, "thumbnail")
+                status = f"theaudiodb_id={'✓' if has_tadb else '✗'}"
+                if thumb_broken:
+                    status += ", thumbnail=BROKEN"
+                elif has_thumb:
+                    status += ", thumbnail=✓"
+                else:
+                    status += ", thumbnail=✗"
+                self.stdout.write(f"  [DRY RUN] Would fix {artist.name} ({status})")
+            return 0
+
+        updated = 0
+        errors = 0
+        for artist in artists:
+            try:
+                with transaction.atomic():
+                    artist.fix_metadata(
+                        force_update=force or self._has_broken_image(artist, "thumbnail")
+                    )
+                updated += 1
+                self.stdout.write(f"  [ARTIST {updated}/{total}] {artist.name}")
+            except Exception as e:
+                errors += 1
+                self.stdout.write(
+                    self.style.ERROR(f"  Error updating artist {artist.name}: {e}")
+                )
+
+        self.stdout.write(
+            self.style.SUCCESS(f"\nArtists done! {updated} updated, {errors} errors")
+        )
+        return updated
+
+    def _process_albums(self, force, dry_run, needs_metadata):
+        from music.models import Album
+
+        albums = self._get_albums(needs_metadata) if needs_metadata else list(Album.objects.all())
+        total = len(albums)
+        self.stdout.write(f"Processing {total} albums")
+
+        if dry_run:
+            for album in albums:
+                has_cover = bool(album.cover_image)
+                cover_broken = self._has_broken_image(album, "cover_image")
+                if cover_broken:
+                    status = "cover=BROKEN"
+                elif has_cover:
+                    status = "cover=✓"
+                else:
+                    status = "cover=✗"
+                self.stdout.write(f"  [DRY RUN] Would fix {album.name} ({status})")
+            return 0
+
+        updated = 0
+        errors = 0
+        for album in albums:
+            try:
+                with transaction.atomic():
+                    if self._has_broken_image(album, "cover_image") or force:
+                        album.fetch_artwork(force=True)
+                    else:
+                        album.fix_metadata()
+                updated += 1
+                self.stdout.write(f"  [ALBUM {updated}/{total}] {album.name}")
+            except Exception as e:
+                errors += 1
+                self.stdout.write(
+                    self.style.ERROR(f"  Error updating album {album.name}: {e}")
+                )
+
+        self.stdout.write(
+            self.style.SUCCESS(f"\nAlbums done! {updated} updated, {errors} errors")
+        )
+        return updated

vrobbler/apps/profiles/forms.py

@@ -42,6 +42,7 @@ class UserProfileForm(forms.ModelForm):
             "home_scrobble_limit",
             "live_now_playing",
             "weigh_in_units",
+            "trends_disabled",
         ]
         widgets = {
             "lastfm_password": forms.PasswordInput(render_value=True),

vrobbler/apps/profiles/migrations/0040_userprofile_trends_disabled.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.29 on 2026-06-25 20:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("profiles", "0039_userprofile_live_now_playing"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userprofile",
+            name="disabled_trends",
+            field=models.JSONField(
+                blank=True,
+                default=list,
+                help_text="List of trend slugs the user has disabled",
+            ),
+        ),
+        migrations.AddField(
+            model_name="userprofile",
+            name="trends_disabled",
+            field=models.BooleanField(default=False),
+        ),
+    ]

vrobbler/apps/profiles/models.py

@@ -106,6 +106,14 @@ class UserProfile(TimeStampedModel):
         default=WeighUnit.METRIC,
     )
 
+    trends_disabled = models.BooleanField(default=False)
+
+    disabled_trends = models.JSONField(
+        default=list,
+        blank=True,
+        help_text="List of trend slugs the user has disabled",
+    )
+
     def __str__(self):
         return f"User profile for {self.user}"
 

vrobbler/apps/trends/management/commands/compute_trends.py

@@ -38,15 +38,36 @@ class Command(BaseCommand):
         overall_start = timezone.now()
         ok_count = 0
         fail_count = 0
+        skipped_count = 0
 
         for user in users:
-            total_trends = len(TREND_REGISTRY)
+            try:
-            self.stdout.write(f"  {user} ({user.id}): {total_trends} trends...")
+                profile = user.profile
+                if profile.trends_disabled:
+                    self.stdout.write(
+                        self.style.WARNING(
+                            f"  {user} ({user.id}): trends disabled globally, skipping"
+                        )
+                    )
+                    skipped_count += len(TREND_REGISTRY)
+                    continue
+                disabled_trends = set(profile.disabled_trends or [])
+            except Exception:
+                disabled_trends = set()
+
+            active_slugs = [
+                s for s in TREND_REGISTRY if s not in disabled_trends
+            ]
+            total_trends = len(active_slugs)
+            self.stdout.write(
+                f"  {user} ({user.id}): {total_trends} trends ("
+                f"{len(disabled_trends & set(TREND_REGISTRY.keys()))} disabled)..."
+            )
             user_start = timezone.now()
             user_ok = 0
             user_fail = 0
 
-            for idx, (slug, _) in enumerate(TREND_REGISTRY.items(), start=1):
+            for idx, slug in enumerate(active_slugs, start=1):
                 periods = get_supported_periods(slug)
                 self.stdout.write(f"    [{idx}/{total_trends}] {slug}...\n")
                 for period in periods:
@@ -76,7 +97,7 @@ class Command(BaseCommand):
         overall_elapsed = (timezone.now() - overall_start).total_seconds()
         self.stdout.write(
             self.style.SUCCESS(
-                f"Done! {ok_count} OK, {fail_count} failed "
+                f"Done! {ok_count} OK, {fail_count} failed, {skipped_count} skipped "
                 f"({overall_elapsed:.1f}s across {total_users} user(s))"
             )
         )

vrobbler/apps/trends/tasks.py

@@ -26,7 +26,17 @@ def compute_user_trends(user_id):
         logger.warning("User %s not found, skipping trends", user_id)
         return
 
-    total = len(TREND_REGISTRY)
+    try:
+        profile = user.profile
+        if profile.trends_disabled:
+            logger.info("User %s (%d) has trends disabled, skipping", user, user_id)
+            return
+        disabled = set(profile.disabled_trends or [])
+    except Exception:
+        disabled = set()
+
+    active_slugs = [s for s in TREND_REGISTRY if s not in disabled]
+    total = len(active_slugs)
     logger.info(
         "Computing %d trends for user %s (%d)",
         total,
@@ -34,7 +44,7 @@ def compute_user_trends(user_id):
         user_id,
     )
 
-    for idx, (slug, _) in enumerate(TREND_REGISTRY.items(), start=1):
+    for idx, slug in enumerate(active_slugs, start=1):
         compute_single_trend.delay(user_id, slug)
 
     logger.info("Dispatched all %d trends for user %s (%d)", total, user, user_id)
@@ -52,6 +62,21 @@ def compute_single_trend(user_id, slug):
         logger.warning("Unknown trend slug '%s' for user %d", slug, user_id)
         return
 
+    try:
+        profile = user.profile
+        if profile.trends_disabled:
+            logger.info(
+                "User %d has trends disabled, skipping '%s'", user_id, slug
+            )
+            return
+        if slug in (profile.disabled_trends or []):
+            logger.info(
+                "User %d has trend '%s' disabled, skipping", user_id, slug
+            )
+            return
+    except Exception:
+        pass
+
     periods = get_supported_periods(slug)
 
     for period in periods:

vrobbler/apps/trends/templates/trends/trend_detail.html

@@ -3,6 +3,10 @@
 {% block title %}{{ trend.title }}{% endblock %}
 
 {% block lists %}
+{% if trend_not_found %}
+<div class="alert alert-warning">Trend not found.</div>
+
+{% else %}
 <div class="row mb-3">
   <div class="col-12">
     <a href="{% url 'trends:trends-home' %}" class="btn btn-sm btn-outline-secondary mb-2">&larr; All Trends</a>
@@ -35,13 +39,21 @@
     {% if computed_at %}
     <small class="text-muted">Last computed: {{ computed_at|date:"F j, Y H:i" }}</small>
     {% endif %}
+
+    <div class="mt-2">
+      <form method="post" action="{% url 'trends:trend-toggle-disabled' trend.slug %}" class="d-inline">
+        {% csrf_token %}
+        {% if trend_disabled %}
+        <button type="submit" class="btn btn-sm btn-outline-success">Enable this trend</button>
+        {% else %}
+        <button type="submit" class="btn btn-sm btn-outline-danger">Disable this trend</button>
+        {% endif %}
+      </form>
+    </div>
   </div>
 </div>
 
-{% if trend_not_found %}
+{% if data is None %}
-<div class="alert alert-warning">Trend not found.</div>
-
-{% elif data is None %}
 <div class="alert alert-info">
   No data computed yet for this period. Trends are updated once daily, check back later.
 </div>
@@ -85,5 +97,6 @@
 {% elif trend.slug == "mood-weather" %}
   {% include "trends/_mood_weather.html" %}
 
+{% endif %}
 {% endif %}
 {% endblock %}

vrobbler/apps/trends/templates/trends/trend_list.html

@@ -25,11 +25,23 @@
           </a>
         </h5>
         <p class="card-text text-muted">{{ trend.description }}</p>
-        {% if trend.computed_at %}
+        <div class="d-flex justify-content-between align-items-center">
-        <small class="text-muted">Last computed: {{ trend.computed_at|date:"M j, Y H:i" }}</small>
+          <div>
-        {% else %}
+            {% if trend.computed_at %}
-        <span class="badge bg-warning text-dark">Pending</span>
+            <small class="text-muted">Last computed: {{ trend.computed_at|date:"M j, Y H:i" }}</small>
-        {% endif %}
+            {% else %}
+            <span class="badge bg-warning text-dark">Pending</span>
+            {% endif %}
+          </div>
+          <form method="post" action="{% url 'trends:trend-toggle-disabled' trend.slug %}" class="m-0">
+            {% csrf_token %}
+            {% if trend.disabled %}
+            <button type="submit" class="btn btn-sm btn-outline-success">Enable</button>
+            {% else %}
+            <button type="submit" class="btn btn-sm btn-outline-danger">Disable</button>
+            {% endif %}
+          </form>
+        </div>
       </div>
     </div>
   </div>

vrobbler/apps/trends/urls.py

@@ -1,9 +1,18 @@
 from django.urls import path
-from trends.views import TrendDetailView, TrendListView
+from trends.views import (
+    ToggleTrendDisabledView,
+    TrendDetailView,
+    TrendListView,
+)
 
 app_name = "trends"
 
 urlpatterns = [
     path("trends/", TrendListView.as_view(), name="trends-home"),
     path("trends/<slug:trend_slug>/", TrendDetailView.as_view(), name="trend-detail"),
+    path(
+        "trends/<slug:trend_slug>/toggle/",
+        ToggleTrendDisabledView.as_view(),
+        name="trend-toggle-disabled",
+    ),
 ]

vrobbler/apps/trends/utils.py

@@ -3,6 +3,7 @@ from datetime import timedelta
 
 from django.utils import timezone
 from trends.models import PERIOD_CHOICES, TrendResult
+from trends.trends import TREND_REGISTRY
 
 logger = logging.getLogger(__name__)
 
@@ -35,6 +36,13 @@ TREND_PERIOD_OVERRIDES = {
 }
 
 
+def get_disabled_trends(user):
+    profile = user.profile
+    if profile.trends_disabled:
+        return set(TREND_REGISTRY.keys())
+    return set(profile.disabled_trends or [])
+
+
 def get_supported_periods(trend_slug):
     if trend_slug in TREND_PERIOD_OVERRIDES:
         slugs = TREND_PERIOD_OVERRIDES[trend_slug]

vrobbler/apps/trends/views.py

@@ -1,8 +1,11 @@
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.views.generic import TemplateView
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from django.views.generic import TemplateView, View
 from trends.models import TrendResult
 from trends.trends import TREND_REGISTRY
-from trends.utils import get_period_nav, get_supported_periods
+from trends.utils import get_disabled_trends, get_period_nav, get_supported_periods
 
 TREND_METADATA = {
     "activity-distribution": {
@@ -78,6 +81,8 @@ class TrendListView(LoginRequiredMixin, TemplateView):
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
+        disabled = get_disabled_trends(self.request.user)
+
         results = TrendResult.objects.filter(
             user=self.request.user,
         ).order_by("trend_slug", "-computed_at")
@@ -89,8 +94,11 @@ class TrendListView(LoginRequiredMixin, TemplateView):
 
         trends = []
         for slug in TREND_REGISTRY:
+            if slug in disabled:
+                continue
             meta = TREND_METADATA.get(slug, {})
             result = latest_by_slug.get(slug)
+            is_disabled = slug in (self.request.user.profile.disabled_trends or [])
             trends.append(
                 {
                     "slug": slug,
@@ -99,6 +107,7 @@ class TrendListView(LoginRequiredMixin, TemplateView):
                     "icon": meta.get("icon", ""),
                     "computed_at": result.computed_at if result else None,
                     "has_data": result is not None,
+                    "disabled": is_disabled,
                 }
             )
         ctx["trends"] = trends
@@ -148,4 +157,25 @@ class TrendDetailView(LoginRequiredMixin, TemplateView):
             ctx["computed_at"] = None
             ctx["data"] = None
 
+        disabled = get_disabled_trends(self.request.user)
+        ctx["trend_disabled"] = slug in disabled
+        ctx["globally_disabled"] = self.request.user.profile.trends_disabled
+
         return ctx
+
+
+class ToggleTrendDisabledView(LoginRequiredMixin, View):
+    def post(self, request, trend_slug):
+        profile = request.user.profile
+        disabled = set(profile.disabled_trends or [])
+        if trend_slug in disabled:
+            disabled.discard(trend_slug)
+            messages.success(request, f"Trend re-enabled.")
+        else:
+            disabled.add(trend_slug)
+            messages.success(request, f"Trend disabled.")
+        profile.disabled_trends = list(disabled)
+        profile.save(update_fields=["disabled_trends"])
+        return HttpResponseRedirect(
+            request.META.get("HTTP_REFERER", reverse("trends:trends-home"))
+        )

vrobbler/apps/videogames/management/commands/cleanup_videogame_metadata.py

@@ -17,8 +17,8 @@ MISSING_ALL = [
 ]
 
 MISSING_GROUPS = {
-    "cover": lambda g: not bool(g.cover),
+    "cover": lambda g: _image_missing_or_broken(g, "cover"),
-    "screenshot": lambda g: not bool(g.screenshot),
+    "screenshot": lambda g: _image_missing_or_broken(g, "screenshot"),
     "summary": lambda g: not g.summary,
     "rating": lambda g: g.rating is None,
     "release_date": lambda g: g.release_date is None,
@@ -28,6 +28,16 @@ MISSING_GROUPS = {
 }
 
 
+def _image_missing_or_broken(game, field_name) -> bool:
+    field = getattr(game, field_name)
+    if not bool(field):
+        return True
+    try:
+        return not field.storage.exists(field.name)
+    except Exception:
+        return True
+
+
 def _game_matches(game, flags):
     if not flags:
         return False
@@ -103,6 +113,7 @@ class Command(BaseCommand):
 
         if all_missing:
             flags = MISSING_ALL
+            fix_broken_images = True
 
         if not flags and not game_id and not force and not fix_broken_images:
             self.stdout.write(

vrobbler/apps/videos/management/commands/cleanup_channel_metadata.py

@@ -30,6 +30,19 @@ class Command(BaseCommand):
             action="store_true",
             help="Only process channels with a twitch_id",
         )
+        parser.add_argument(
+            "--needs-metadata",
+            action="store_true",
+            help="Only process channels missing youtube_id, twitch_id, cover image, or with broken cover image",
+        )
+
+    def _has_broken_image(self, channel) -> bool:
+        if not channel.cover_image or not channel.cover_image.name:
+            return False
+        try:
+            return not channel.cover_image.storage.exists(channel.cover_image.name)
+        except Exception:
+            return True
 
     def handle(self, *args, **options):
         from videos.models import Channel
@@ -38,6 +51,7 @@ class Command(BaseCommand):
         dry_run = options["dry_run"]
         youtube_only = options["youtube_only"]
         twitch_only = options["twitch_only"]
+        needs_metadata = options["needs_metadata"]
 
         qs = Channel.objects.all()
 
@@ -45,29 +59,61 @@ class Command(BaseCommand):
             qs = qs.exclude(youtube_id__isnull=True).exclude(youtube_id="")
         elif twitch_only:
             qs = qs.exclude(twitch_id__isnull=True).exclude(twitch_id="")
+        elif needs_metadata:
+            no_id = models.Q(youtube_id__isnull=True) & models.Q(twitch_id__isnull=True)
+            no_id |= models.Q(youtube_id="") & models.Q(twitch_id="")
+            no_id |= models.Q(youtube_id__isnull=True) & models.Q(twitch_id="")
+            no_id |= models.Q(youtube_id="") & models.Q(twitch_id__isnull=True)
+            qs = qs.filter(
+                no_id
+                | models.Q(cover_image__isnull=True)
+                | models.Q(cover_image="")
+            )
         else:
             qs = qs.filter(
                 models.Q(youtube_id__isnull=False) | models.Q(twitch_id__isnull=False)
             ).exclude(youtube_id="", twitch_id="")
 
         total = qs.count()
-        self.stdout.write(f"Processing {total} channels")
+        self.stdout.write(f"Processing {total} channels from DB filter")
+
+        broken_channels = []
+        if needs_metadata:
+            broken_qs = Channel.objects.filter(
+                cover_image__isnull=False,
+            ).exclude(
+                cover_image="",
+            )
+            if youtube_only:
+                broken_qs = broken_qs.exclude(youtube_id__isnull=True).exclude(youtube_id="")
+            elif twitch_only:
+                broken_qs = broken_qs.exclude(twitch_id__isnull=True).exclude(twitch_id="")
+            for channel in broken_qs.iterator():
+                if self._has_broken_image(channel):
+                    broken_channels.append(channel)
+
+        all_channels = list(qs) + broken_channels
+        total = len(all_channels)
+        self.stdout.write(f"Total channels to process: {total}")
 
         if dry_run:
-            for channel in qs.iterator():
+            for channel in all_channels:
                 source = "youtube" if channel.youtube_id else "twitch"
                 identifier = channel.youtube_id or channel.twitch_id
+                status = f"({source}: {identifier})"
+                if self._has_broken_image(channel):
+                    status += " [image BROKEN]"
                 self.stdout.write(
-                    f"  [DRY RUN] Would fix {channel.name} ({source}: {identifier})"
+                    f"  [DRY RUN] Would fix {channel.name} {status}"
                 )
             return
 
         updated = 0
         errors = 0
-        for channel in qs.iterator():
+        for channel in all_channels:
             try:
                 with transaction.atomic():
-                    channel.fix_metadata(force=force)
+                    channel.fix_metadata(force=force or self._has_broken_image(channel))
                 updated += 1
                 source = "youtube" if channel.youtube_id else "twitch"
                 self.stdout.write(f"  [{updated}/{total}] {channel.name} ({source})")

vrobbler/apps/videos/management/commands/cleanup_series_metadata.py

@@ -1,4 +1,5 @@
 import logging
+import os
 
 from django.core.management.base import BaseCommand
 from django.db import models, transaction
@@ -28,9 +29,18 @@ class Command(BaseCommand):
         parser.add_argument(
             "--needs-metadata",
             action="store_true",
-            help="Only process series missing imdb_id or cover image",
+            help="Only process series missing imdb_id or with broken cover image",
         )
 
+    def _has_broken_image(self, series) -> bool:
+        """Check if a series has a cover_image set but the file is missing."""
+        if not series.cover_image:
+            return False
+        try:
+            return not os.path.exists(series.cover_image.path)
+        except Exception:
+            return True
+
     def handle(self, *args, **options):
         from videos.models import Series
 
@@ -51,25 +61,50 @@ class Command(BaseCommand):
             )
 
         total = qs.count()
-        self.stdout.write(f"Processing {total} series")
+        self.stdout.write(f"Processing {total} series from DB filter")
+
+        # Also find series with broken cover images
+        broken_image_series = []
+        if needs_metadata:
+            broken_qs = Series.objects.filter(
+                cover_image__isnull=False,
+            ).exclude(
+                models.Q(imdb_id__isnull=True)
+                | models.Q(imdb_id="")
+                | models.Q(cover_image__isnull=True)
+                | models.Q(cover_image=""),
+            )
+            if imdb_id:
+                broken_qs = broken_qs.filter(imdb_id=imdb_id)
+            for series in broken_qs.iterator():
+                if self._has_broken_image(series):
+                    broken_image_series.append(series)
+
+        all_series = list(qs) + broken_image_series
+        total = len(all_series)
+        self.stdout.write(f"Total series to process: {total}")
 
         if dry_run:
-            for series in qs.iterator():
+            for series in all_series:
                 has_imdb = bool(series.imdb_id)
                 has_image = bool(series.cover_image)
-                self.stdout.write(
+                image_broken = self._has_broken_image(series)
-                    f"  [DRY RUN] Would fix {series.name}"
+                status = f"imdb_id={'✓' if has_imdb else '✗'}"
-                    f" (imdb_id={'✓' if has_imdb else '✗'}"
+                if image_broken:
-                    f", image={'✓' if has_image else '✗'})"
+                    status += ", image=BROKEN"
-                )
+                elif has_image:
+                    status += ", image=✓"
+                else:
+                    status += ", image=✗"
+                self.stdout.write(f"  [DRY RUN] Would fix {series.name} ({status})")
             return
 
         updated = 0
         errors = 0
-        for series in qs.iterator():
+        for series in all_series:
             try:
                 with transaction.atomic():
-                    series.fix_metadata(force_update=force)
+                    series.fix_metadata(force_update=force or self._has_broken_image(series))
                 updated += 1
                 self.stdout.write(f"  [{updated}/{total}] {series.name}")
             except Exception as e:

vrobbler/templates/charts/chart_index.html

@@ -120,9 +120,67 @@
 </div>
 {% endif %}
 
-{% include "scrobbles/_top_charts.html" %}
+<div class="row mb-3">
+    <div class="col-12">
+        <a href="{% url 'charts:maloja-charts' %}" class="btn btn-sm btn-outline-secondary">🎨 Maloja Widgets</a>
+    </div>
+</div>
+
+<div class="row mt-4">
+    {% if charts.artist %}
+    <div class="col-md-6 col-lg-4 chart-section">
+        <h3>🎤 Top Artists</h3>
+        <ul class="list-group">
+            {% for chart in charts.artist|slice:":20" %}
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+                <span class="me-2"><strong>#{{chart.rank}}</strong></span>
+                <a href="{{chart.artist.get_absolute_url}}">{{chart.artist.name}}</a>
+                <span class="badge bg-primary rounded-pill">{{chart.count}}</span>
+            </li>
+            {% endfor %}
+            <li class="list-group-item">
+                <a href="{% url 'charts:chart-detail' 'artist' %}">View all &raquo;</a>
+            </li>
+        </ul>
+    </div>
+    {% endif %}
+
+    {% if charts.album %}
+    <div class="col-md-6 col-lg-4 chart-section">
+        <h3>💿 Top Albums</h3>
+        <ul class="list-group">
+            {% for chart in charts.album|slice:":20" %}
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+                <span class="me-2"><strong>#{{chart.rank}}</strong></span>
+                <a href="{{chart.album.get_absolute_url}}">{{chart.album.name}}</a>
+                <span class="badge bg-primary rounded-pill">{{chart.count}}</span>
+            </li>
+            {% endfor %}
+            <li class="list-group-item">
+                <a href="{% url 'charts:chart-detail' 'album' %}">View all &raquo;</a>
+            </li>
+        </ul>
+    </div>
+    {% endif %}
+
+    {% if charts.tv_series %}
+    <div class="col-md-6 col-lg-4 chart-section">
+        <h3>📺 Top TV Series</h3>
+        <ul class="list-group">
+            {% for chart in charts.tv_series|slice:":20" %}
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+                <span class="me-2"><strong>#{{chart.rank}}</strong></span>
+                <a href="{{chart.tv_series.get_absolute_url}}">{{chart.tv_series.name}}</a>
+                <span class="badge bg-primary rounded-pill">{{chart.count}}</span>
+            </li>
+            {% endfor %}
+            <li class="list-group-item">
+                <a href="{% url 'charts:chart-detail' 'tv_series' %}">View all &raquo;</a>
+            </li>
+        </ul>
+    </div>
+    {% endif %}
 
-<div class="row">
     {% if charts.track %}
     <div class="col-md-6 col-lg-4 chart-section">
         <h3>🎵 Top Tracks</h3>

vrobbler/templates/charts/maloja_charts.html

@@ -0,0 +1,45 @@
+{% extends "base_list.html" %}
+{% load static %}
+
+{% block title %}Maloja Widgets{% endblock %}
+
+{% block head_extra %}
+<style>
+    .container { margin-bottom: 100px; }
+    h2 { padding-top: 20px; }
+    .nav-tabs { cursor: pointer; }
+    .image-wrapper { contain: content; }
+    .image-wrapper :hover { background: rgba(0,0,0,0.3); }
+    .caption {
+        position: fixed; top: 5px; left: 5px;
+        padding: 3px; font-size: 90%;
+        color: white; background: rgba(0,0,0,0.4);
+    }
+    .caption-medium {
+        position: fixed; top: 5px; left: 5px;
+        padding: 3px; font-size: 75%;
+        color: white; background: rgba(0,0,0,0.4);
+    }
+    .caption-small {
+        position: fixed; top: 5px; left: 5px;
+        padding: 3px; font-size: 60%;
+        color: white; background: rgba(0,0,0,0.4);
+    }
+</style>
+{% endblock %}
+
+{% block lists %}
+
+{% block grid_view_button %}{% endblock %}
+
+<div class="row mb-3">
+    <div class="col-12">
+        <a href="{% url 'charts:charts-home' %}" class="btn btn-sm btn-outline-secondary">&larr; Full Charts</a>
+        <a href="{% url 'charts:spotify-tracks' %}" class="btn btn-sm btn-outline-secondary">🎵 Spotify Tracks</a>
+        <a href="{% url 'charts:bandcamp-tracks' %}" class="btn btn-sm btn-outline-secondary">🎵 Bandcamp Tracks</a>
+    </div>
+</div>
+
+{% include "scrobbles/_top_charts.html" %}
+
+{% endblock %}

vrobbler/templates/profiles/settings_form.html

@@ -130,6 +130,11 @@
                 </ul>
             </div>
             {% endif %}
+        {% elif field.name == "trends_disabled" %}
+            <p class="checkbox-row">
+                {{ field }}
+                {{ field.label_tag }}
+            </p>
         {% elif field.name == "home_scrobble_limit" %}
             <p>
                 {{ field.label_tag }}

vrobbler/templates/scrobbles/_top_charts.html

@@ -49,11 +49,12 @@
                 </div>
                 <div style="float:left; width:300px;">
                     <div style="display:flex; flex-wrap: wrap;">
-                        {% for i in "67891011121314" %}
+                        {% for i in "123456789" %}
-                        {% with artists|get_item:forloop.counter|add:5 as artist %}
+                        {% with forloop.counter|add:4 as idx %}
+                        {% with artists|get_item:idx as artist %}
                         {% if artist %}
                         <div class="image-wrapper" style="width:33%">
-                            <div class="caption-small">#{{forloop.counter|add:6}} {{artist.artist.name}}</div>
+                            <div class="caption-small">#{{forloop.counter|add:5}} {{artist.artist.name}}</div>
                             {% if artist.artist.thumbnail %}
                             <a href="{{artist.artist.get_absolute_url}}"><img src="{{artist.artist.thumbnail_medium.url}}" width="100px"></a>
                             {% else %}
@@ -62,6 +63,7 @@
                         </div>
                         {% endif %}
                         {% endwith %}
+                        {% endwith %}
                         {% endfor %}
                     </div>
                 </div>
@@ -95,7 +97,7 @@
             <div style="display:block">
                 <div style="float:left;">
                     <div class="image-wrapper" style="display:flex; flex-wrap: wrap; margin:0">
-                        <div class="caption">#1 {{albums.0.album.title}}</div>
+                        <div class="caption">#1 {{albums.0.album.name}}</div>
                         {% if albums.0.album.cover_image %}
                         <a href="{{albums.0.album.get_absolute_url}}"><img src="{{albums.0.album.cover_image_medium.url}}" width="300px"></a>
                         {% else %}
@@ -109,7 +111,7 @@
                         {% with albums|get_item:forloop.counter as album %}
                         {% if album %}
                         <div class="image-wrapper" style="width:50%">
-                            <div class="caption-medium">#{{forloop.counter|add:1}} {{album.album.title}}</div>
+                            <div class="caption-medium">#{{forloop.counter|add:1}} {{album.album.name}}</div>
                             {% if album.album.cover_image %}
                             <a href="{{album.album.get_absolute_url}}"><img src="{{album.album.cover_image_medium.url}}" width="150px"></a>
                             {% else %}
@@ -123,11 +125,12 @@
                 </div>
                 <div style="float:left; width:300px;">
                     <div style="display:flex; flex-wrap: wrap;">
-                        {% for i in "67891011121314" %}
+                        {% for i in "123456789" %}
-                        {% with albums|get_item:forloop.counter|add:5 as album %}
+                        {% with forloop.counter|add:4 as idx %}
+                        {% with albums|get_item:idx as album %}
                         {% if album %}
                         <div class="image-wrapper" style="width:33%">
-                            <div class="caption-small">#{{forloop.counter|add:6}} {{album.album.title}}</div>
+                            <div class="caption-small">#{{forloop.counter|add:5}} {{album.album.name}}</div>
                             {% if album.album.cover_image %}
                             <a href="{{album.album.get_absolute_url}}"><img src="{{album.album.cover_image_medium.url}}" width="100px"></a>
                             {% else %}
@@ -136,6 +139,7 @@
                         </div>
                         {% endif %}
                         {% endwith %}
+                        {% endwith %}
                         {% endfor %}
                     </div>
                 </div>
@@ -197,11 +201,12 @@
                 </div>
                 <div style="float:left; width:300px;">
                     <div style="display:flex; flex-wrap: wrap;">
-                        {% for i in "67891011121314" %}
+                        {% for i in "123456789" %}
-                        {% with shows|get_item:forloop.counter|add:5 as show %}
+                        {% with forloop.counter|add:4 as idx %}
+                        {% with shows|get_item:idx as show %}
                         {% if show %}
                         <div class="image-wrapper" style="width:33%">
-                            <div class="caption-small">#{{forloop.counter|add:6}} {{show.tv_series.name}}</div>
+                            <div class="caption-small">#{{forloop.counter|add:5}} {{show.tv_series.name}}</div>
                             {% if show.tv_series.cover_image %}
                             <a href="{{show.tv_series.get_absolute_url}}"><img src="{{show.tv_series.cover_small.url}}" width="100px" height="100px" style="object-fit: cover"></a>
                             {% else %}
@@ -210,6 +215,7 @@
                         </div>
                         {% endif %}
                         {% endwith %}
+                        {% endwith %}
                         {% endfor %}
                     </div>
                 </div>

vrobbler/templates/scrobbles/scrobble_list.html

@@ -76,9 +76,11 @@
             <div class="btn-group me-2">
               <a href="{% url 'scrobbles:scrobble-list' %}" class="btn btn-sm btn-outline-secondary">Live</a>
             </div>
+            {% if not user.profile.trends_disabled %}
             <div class="btn-group me-2">
               <a href="{% url 'trends:trends-home' %}" class="btn btn-sm btn-outline-secondary">Trends</a>
             </div>
+            {% endif %}
             <div class="btn-group me-2">
                 {% if user.profile.lastfm_username and not user.profile.lastfm_auto_import %}
                 <form action="{% url 'scrobbles:lastfm-import' %}" method="get">