diff --git a/src/lib/components/views/ArtistDetailView.svelte b/src/lib/components/views/ArtistDetailView.svelte index 33146912b..8e8b9f5bc 100644 --- a/src/lib/components/views/ArtistDetailView.svelte +++ b/src/lib/components/views/ArtistDetailView.svelte @@ -52,6 +52,10 @@ onAlbumShareQobuz?: (albumId: string) => void; onAlbumShareSonglink?: (albumId: string) => void; onAlbumDownload?: (albumId: string) => void; + onOpenAlbumFolder?: (albumId: string) => void; + onReDownloadAlbum?: (albumId: string) => void; + checkAlbumFullyDownloaded?: (albumId: string) => Promise; + downloadStateVersion?: number; onLoadMore?: () => void; isLoadingMore?: boolean; onPlaylistClick?: (playlistId: number) => void; @@ -76,6 +80,10 @@ onAlbumShareQobuz, onAlbumShareSonglink, onAlbumDownload, + onOpenAlbumFolder, + onReDownloadAlbum, + checkAlbumFullyDownloaded, + downloadStateVersion, onLoadMore, isLoadingMore = false, onPlaylistClick, @@ -110,6 +118,25 @@ let activeJumpSection = $state('about'); let jumpObserver: IntersectionObserver | null = null; + // Download status tracking + let albumDownloadStatuses = $state>(new Map()); + + async function loadAlbumDownloadStatus(albumId: string) { + if (!checkAlbumFullyDownloaded) return false; + try { + const isDownloaded = await checkAlbumFullyDownloaded(albumId); + albumDownloadStatuses.set(albumId, isDownloaded); + return isDownloaded; + } catch { + return false; + } + } + + function isAlbumDownloaded(albumId: string): boolean { + void downloadStateVersion; + return albumDownloadStatuses.get(albumId) || false; + } + interface SimilarArtistsPage { items: QobuzArtist[]; total: number; @@ -578,7 +605,10 @@ onShareQobuz={onAlbumShareQobuz ? () => onAlbumShareQobuz(album.id) : undefined} onShareSonglink={onAlbumShareSonglink ? () => onAlbumShareSonglink(album.id) : undefined} onDownload={onAlbumDownload ? () => onAlbumDownload(album.id) : undefined} - onclick={() => onAlbumClick?.(album.id)} + isAlbumFullyDownloaded={isAlbumDownloaded(album.id)} + onOpenContainingFolder={onOpenAlbumFolder ? () => onOpenAlbumFolder(album.id) : undefined} + onReDownloadAlbum={onReDownloadAlbum ? () => onReDownloadAlbum(album.id) : undefined} + onclick={() => { onAlbumClick?.(album.id); loadAlbumDownloadStatus(album.id); }} /> {/each} @@ -616,7 +646,10 @@ onShareQobuz={onAlbumShareQobuz ? () => onAlbumShareQobuz(album.id) : undefined} onShareSonglink={onAlbumShareSonglink ? () => onAlbumShareSonglink(album.id) : undefined} onDownload={onAlbumDownload ? () => onAlbumDownload(album.id) : undefined} - onclick={() => onAlbumClick?.(album.id)} + isAlbumFullyDownloaded={isAlbumDownloaded(album.id)} + onOpenContainingFolder={onOpenAlbumFolder ? () => onOpenAlbumFolder(album.id) : undefined} + onReDownloadAlbum={onReDownloadAlbum ? () => onReDownloadAlbum(album.id) : undefined} + onclick={() => { onAlbumClick?.(album.id); loadAlbumDownloadStatus(album.id); }} /> {/each} @@ -642,7 +675,10 @@ onShareQobuz={onAlbumShareQobuz ? () => onAlbumShareQobuz(album.id) : undefined} onShareSonglink={onAlbumShareSonglink ? () => onAlbumShareSonglink(album.id) : undefined} onDownload={onAlbumDownload ? () => onAlbumDownload(album.id) : undefined} - onclick={() => onAlbumClick?.(album.id)} + isAlbumFullyDownloaded={isAlbumDownloaded(album.id)} + onOpenContainingFolder={onOpenAlbumFolder ? () => onOpenAlbumFolder(album.id) : undefined} + onReDownloadAlbum={onReDownloadAlbum ? () => onReDownloadAlbum(album.id) : undefined} + onclick={() => { onAlbumClick?.(album.id); loadAlbumDownloadStatus(album.id); }} /> {/each} @@ -668,7 +704,10 @@ onShareQobuz={onAlbumShareQobuz ? () => onAlbumShareQobuz(album.id) : undefined} onShareSonglink={onAlbumShareSonglink ? () => onAlbumShareSonglink(album.id) : undefined} onDownload={onAlbumDownload ? () => onAlbumDownload(album.id) : undefined} - onclick={() => onAlbumClick?.(album.id)} + isAlbumFullyDownloaded={isAlbumDownloaded(album.id)} + onOpenContainingFolder={onOpenAlbumFolder ? () => onOpenAlbumFolder(album.id) : undefined} + onReDownloadAlbum={onReDownloadAlbum ? () => onReDownloadAlbum(album.id) : undefined} + onclick={() => { onAlbumClick?.(album.id); loadAlbumDownloadStatus(album.id); }} /> {/each} diff --git a/src/lib/components/views/FavoritesView.svelte b/src/lib/components/views/FavoritesView.svelte index 8bf9a0390..d886865f6 100644 --- a/src/lib/components/views/FavoritesView.svelte +++ b/src/lib/components/views/FavoritesView.svelte @@ -43,6 +43,10 @@ onAlbumShareQobuz?: (albumId: string) => void; onAlbumShareSonglink?: (albumId: string) => void; onAlbumDownload?: (albumId: string) => void; + onOpenAlbumFolder?: (albumId: string) => void; + onReDownloadAlbum?: (albumId: string) => void; + checkAlbumFullyDownloaded?: (albumId: string) => Promise; + downloadStateVersion?: number; onTrackPlay?: (track: DisplayTrack) => void; onArtistClick?: (artistId: number) => void; onTrackPlayNext?: (track: DisplayTrack) => void; @@ -56,7 +60,6 @@ onTrackDownload?: (track: DisplayTrack) => void; onTrackRemoveDownload?: (trackId: number) => void; getTrackDownloadStatus?: (trackId: number) => { status: DownloadStatus; progress: number }; - downloadStateVersion?: number; } interface DisplayTrack { @@ -84,6 +87,10 @@ onAlbumShareQobuz, onAlbumShareSonglink, onAlbumDownload, + onOpenAlbumFolder, + onReDownloadAlbum, + checkAlbumFullyDownloaded, + downloadStateVersion, onTrackPlay, onArtistClick, onTrackPlayNext, @@ -96,8 +103,7 @@ onTrackGoToArtist, onTrackDownload, onTrackRemoveDownload, - getTrackDownloadStatus, - downloadStateVersion + getTrackDownloadStatus }: Props = $props(); type TabType = 'tracks' | 'albums' | 'artists'; @@ -108,6 +114,26 @@ let favoriteArtists = $state([]); let loading = $state(false); + + // Download status tracking + let albumDownloadStatuses = $state>(new Map()); + + async function loadAlbumDownloadStatus(albumId: string) { + if (!checkAlbumFullyDownloaded) return false; + try { + const isDownloaded = await checkAlbumFullyDownloaded(albumId); + albumDownloadStatuses.set(albumId, isDownloaded); + return isDownloaded; + } catch { + return false; + } + } + + function isAlbumDownloaded(albumId: string): boolean { + void downloadStateVersion; + return albumDownloadStatuses.get(albumId) || false; + } + let error = $state(null); // Search state for each tab @@ -940,7 +966,10 @@ onShareQobuz={onAlbumShareQobuz ? () => onAlbumShareQobuz(album.id) : undefined} onShareSonglink={onAlbumShareSonglink ? () => onAlbumShareSonglink(album.id) : undefined} onDownload={onAlbumDownload ? () => onAlbumDownload(album.id) : undefined} - onclick={() => onAlbumClick?.(album.id)} + isAlbumFullyDownloaded={isAlbumDownloaded(album.id)} + onOpenContainingFolder={onOpenAlbumFolder ? () => onOpenAlbumFolder(album.id) : undefined} + onReDownloadAlbum={onReDownloadAlbum ? () => onReDownloadAlbum(album.id) : undefined} + onclick={() => { onAlbumClick?.(album.id); loadAlbumDownloadStatus(album.id); }} /> {/each} @@ -1007,7 +1036,10 @@ onShareQobuz={onAlbumShareQobuz ? () => onAlbumShareQobuz(album.id) : undefined} onShareSonglink={onAlbumShareSonglink ? () => onAlbumShareSonglink(album.id) : undefined} onDownload={onAlbumDownload ? () => onAlbumDownload(album.id) : undefined} - onclick={() => onAlbumClick?.(album.id)} + isAlbumFullyDownloaded={isAlbumDownloaded(album.id)} + onOpenContainingFolder={onOpenAlbumFolder ? () => onOpenAlbumFolder(album.id) : undefined} + onReDownloadAlbum={onReDownloadAlbum ? () => onReDownloadAlbum(album.id) : undefined} + onclick={() => { onAlbumClick?.(album.id); loadAlbumDownloadStatus(album.id); }} /> {/each} diff --git a/src/lib/components/views/SearchView.svelte b/src/lib/components/views/SearchView.svelte index ead6356b4..904ab88e9 100644 --- a/src/lib/components/views/SearchView.svelte +++ b/src/lib/components/views/SearchView.svelte @@ -35,6 +35,10 @@ onAlbumShareQobuz?: (albumId: string) => void; onAlbumShareSonglink?: (albumId: string) => void; onAlbumDownload?: (albumId: string) => void; + onOpenAlbumFolder?: (albumId: string) => void; + onReDownloadAlbum?: (albumId: string) => void; + checkAlbumFullyDownloaded?: (albumId: string) => Promise; + downloadStateVersion?: number; onTrackPlay?: (track: Track) => void; onTrackPlayNext?: (track: Track) => void; onTrackPlayLater?: (track: Track) => void; @@ -55,6 +59,10 @@ onAlbumShareQobuz, onAlbumShareSonglink, onAlbumDownload, + onOpenAlbumFolder, + onReDownloadAlbum, + checkAlbumFullyDownloaded, + downloadStateVersion, onTrackPlay, onTrackPlayNext, onTrackPlayLater, @@ -155,6 +163,25 @@ }); }); + // Download status tracking + let albumDownloadStatuses = $state>(new Map()); + + async function loadAlbumDownloadStatus(albumId: string) { + if (!checkAlbumFullyDownloaded) return false; + try { + const isDownloaded = await checkAlbumFullyDownloaded(albumId); + albumDownloadStatuses.set(albumId, isDownloaded); + return isDownloaded; + } catch { + return false; + } + } + + function isAlbumDownloaded(albumId: string): boolean { + void downloadStateVersion; + return albumDownloadStatuses.get(albumId) || false; + } + async function performSearch() { if (!query.trim()) return; @@ -370,7 +397,10 @@ onShareQobuz={onAlbumShareQobuz ? () => onAlbumShareQobuz(album.id) : undefined} onShareSonglink={onAlbumShareSonglink ? () => onAlbumShareSonglink(album.id) : undefined} onDownload={onAlbumDownload ? () => onAlbumDownload(album.id) : undefined} - onclick={() => onAlbumClick?.(album.id)} + isAlbumFullyDownloaded={isAlbumDownloaded(album.id)} + onOpenContainingFolder={onOpenAlbumFolder ? () => onOpenAlbumFolder(album.id) : undefined} + onReDownloadAlbum={onReDownloadAlbum ? () => onReDownloadAlbum(album.id) : undefined} + onclick={() => { onAlbumClick?.(album.id); loadAlbumDownloadStatus(album.id); }} /> {/each}