From 407fd18b69851564e0f7104a7012b5cc437e9ac3 Mon Sep 17 00:00:00 2001
From: Harvey <harvey.bragg@tuta.com>
Date: Tue, 14 Apr 2026 12:33:02 +0100
Subject: [PATCH] Various FE fixes

---
 backend/repositories/lidarr/history.py                   | 4 ++--
 backend/services/artist_service.py                       | 2 +-
 backend/tests/services/test_artist_release_pagination.py | 2 +-
 frontend/src/lib/components/SidebarVisualiser.svelte     | 2 +-
 frontend/src/lib/queries/artist/ArtistQueries.svelte.ts  | 1 +
 frontend/src/routes/artist/[id]/+page.svelte             | 9 +++++++--
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/backend/repositories/lidarr/history.py b/backend/repositories/lidarr/history.py
index 510ace7..0adfdef 100644
--- a/backend/repositories/lidarr/history.py
+++ b/backend/repositories/lidarr/history.py
@@ -147,6 +147,6 @@ class LidarrHistoryRepository(LidarrBase):
                     artist_mbid=artist_mbid,
                     date_added=date_added,
                 )
-                )
+            )
 
-            return out
+        return out
diff --git a/backend/services/artist_service.py b/backend/services/artist_service.py
index 2fb67d4..afed4db 100644
--- a/backend/services/artist_service.py
+++ b/backend/services/artist_service.py
@@ -595,7 +595,7 @@ class ArtistService:
             )
 
         _SCAN_BATCH = 100
-        _MAX_SCAN_BATCHES = 20
+        _MAX_SCAN_BATCHES = 2
         seen_mbids: set[str] = set()
         all_albums: list[ReleaseItem] = []
         all_singles: list[ReleaseItem] = []
diff --git a/backend/tests/services/test_artist_release_pagination.py b/backend/tests/services/test_artist_release_pagination.py
index ddde951..c45f7be 100644
--- a/backend/tests/services/test_artist_release_pagination.py
+++ b/backend/tests/services/test_artist_release_pagination.py
@@ -310,4 +310,4 @@ class TestFilterAwarePagination:
 
         assert result.has_more is True
         assert result.next_offset is not None
-        assert result.next_offset == 20
+        assert result.next_offset == 2
diff --git a/frontend/src/lib/components/SidebarVisualiser.svelte b/frontend/src/lib/components/SidebarVisualiser.svelte
index 894ea32..3d69bca 100644
--- a/frontend/src/lib/components/SidebarVisualiser.svelte
+++ b/frontend/src/lib/components/SidebarVisualiser.svelte
@@ -8,7 +8,7 @@
 	};
 </script>
 
-{#if nowPlayingMerged.primarySession}
+{#if nowPlayingMerged.primarySession && !nowPlayingMerged.primarySession._isLocal}
 	{@const session = nowPlayingMerged.primarySession}
 	{@const isPaused = session.is_paused}
 	{@const href = sourceHub[session.source ?? ''] ?? '#'}
diff --git a/frontend/src/lib/queries/artist/ArtistQueries.svelte.ts b/frontend/src/lib/queries/artist/ArtistQueries.svelte.ts
index 883c18f..3e16dd4 100644
--- a/frontend/src/lib/queries/artist/ArtistQueries.svelte.ts
+++ b/frontend/src/lib/queries/artist/ArtistQueries.svelte.ts
@@ -106,6 +106,7 @@ const BATCH_SIZE = 50;
 
 export const getArtistReleasesInfiniteQuery = (getArtistId: Getter<string>) =>
 	createInfiniteQuery(() => ({
+		staleTime: CACHE_TTL.ARTIST_DETAIL_BASIC,
 		queryKey: ArtistQueryKeyFactory.releases(getArtistId()),
 		initialPageParam: 0,
 		queryFn: async ({ pageParam = 0, signal }) => {
diff --git a/frontend/src/routes/artist/[id]/+page.svelte b/frontend/src/routes/artist/[id]/+page.svelte
index 1c7c53d..1537eeb 100644
--- a/frontend/src/routes/artist/[id]/+page.svelte
+++ b/frontend/src/routes/artist/[id]/+page.svelte
@@ -128,6 +128,8 @@
 		releasesQuery.data?.pages.flatMap((page) => [...page.albums, ...page.singles, ...page.eps])
 			.length || 0
 	);
+	const initialReleasesLoading = $derived(releasesQuery.isLoading);
+	const sourceTotalCount = $derived(releasesQuery.data?.pages[0]?.source_total_count ?? null);
 
 	$effect(() => {
 		if (hasMoreReleases && !releasesQuery.isFetchingNextPage) {
@@ -328,7 +330,9 @@
 					/>
 				</section>
 
-				{#if hasMoreReleases || loadingMoreReleases}
+				{#if initialReleasesLoading}
+					<AlbumGridSkeleton title="Discography" count={12} />
+				{:else if hasMoreReleases || loadingMoreReleases}
 					<div
 						class="flex items-center justify-center gap-3 p-4 bg-base-300 rounded-box mb-6"
 						style="border: 2px solid {colors.accent};"
@@ -338,7 +342,8 @@
 							<span class="font-semibold text-base" style="color: {colors.accent};"
 								>Loading releases...</span
 							>
-							<span class="text-sm text-base-content/70">Loading {loadedReleaseCount} releases</span
+							<span class="text-sm text-base-content/70"
+								>{#if sourceTotalCount}Loaded {loadedReleaseCount} of {sourceTotalCount} releases{:else}Loading {loadedReleaseCount} releases{/if}</span
 							>
 						</div>
 					</div>