refactor(favorites): centralize track favorites in favoritesStore
- Create favoritesStore.ts for centralized favorites state management - Refactor TrackRow to be self-sufficient with internal favorites handling - TrackRow now subscribes to store and toggles favorites internally - Remove redundant favoriteTrackIds state from AlbumDetailView and PlaylistDetailView - Remove manual onAddFavorite prop drilling from all views - Add trackId prop to TrackRow for store lookup (optional for local tracks) - Add hideFavorite prop for local tracks that don't have Qobuz IDs - Load favorites once on app init in +page.svelte
This commit is contained in:
1 parent
48a010c597
commit
1b90a45212
8 files changed
+229
-67
No files matched your search
@@ -89,16 +89,13 @@
|
||||
let isFavorite = $state(false);
|
||||
let isFavoriteLoading = $state(false);
|
||||
let playBtnHovered = $state(false);
|
||||
let favoriteTrackIds = $state<Set<number>>(new Set());
|
||||
|
||||
interface FavoritesResponse {
|
||||
albums?: { items: Array<{ id: string }>; total: number };
|
||||
tracks?: { items: Array<{ id: number }>; total: number };
|
||||
}
|
||||
|
||||
// Check if album and tracks are in favorites on mount
|
||||
// Check if album is in favorites on mount
|
||||
onMount(async () => {
|
||||
// Fetch album favorites
|
||||
try {
|
||||
const response = await invoke<FavoritesResponse>('get_favorites', {
|
||||
favType: 'albums',
|
||||
@@ -111,20 +108,6 @@
|
||||
} catch (err) {
|
||||
console.error('Failed to check album favorite status:', err);
|
||||
}
|
||||
|
||||
// Fetch track favorites
|
||||
try {
|
||||
const response = await invoke<FavoritesResponse>('get_favorites', {
|
||||
favType: 'tracks',
|
||||
limit: 500,
|
||||
offset: 0
|
||||
});
|
||||
if (response.tracks?.items) {
|
||||
favoriteTrackIds = new Set(response.tracks.items.map(item => item.id));
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Failed to check track favorite status:', err);
|
||||
}
|
||||
});
|
||||
|
||||
async function toggleFavorite() {
|
||||
@@ -223,13 +206,13 @@
|
||||
{#each album.tracks as track (`${track.id}-${downloadStateVersion}`)}
|
||||
{@const downloadInfo = getTrackDownloadStatus?.(track.id) ?? { status: 'none' as const, progress: 0 }}
|
||||
<TrackRow
|
||||
trackId={track.id}
|
||||
number={track.number}
|
||||
title={track.title}
|
||||
artist={track.artist}
|
||||
duration={track.duration}
|
||||
quality={track.quality}
|
||||
isPlaying={currentTrack === track.id}
|
||||
isFavorite={favoriteTrackIds.has(track.id)}
|
||||
downloadStatus={downloadInfo.status}
|
||||
downloadProgress={downloadInfo.progress}
|
||||
onPlay={() => {
|
||||
@@ -245,7 +228,6 @@
|
||||
},
|
||||
onPlayNext: onTrackPlayNext ? () => onTrackPlayNext(track) : undefined,
|
||||
onPlayLater: onTrackPlayLater ? () => onTrackPlayLater(track) : undefined,
|
||||
onAddFavorite: onTrackAddFavorite ? () => onTrackAddFavorite(track.id) : undefined,
|
||||
onAddToPlaylist: onAddTrackToPlaylist ? () => onAddTrackToPlaylist(track.id) : undefined,
|
||||
onShareQobuz: onTrackShareQobuz ? () => onTrackShareQobuz(track.id) : undefined,
|
||||
onShareSonglink: onTrackShareSonglink ? () => onTrackShareSonglink(track) : undefined,
|
||||
|
||||
@@ -377,12 +377,13 @@
|
||||
{@const displayTrack = buildDisplayTrack(track, index)}
|
||||
{@const downloadInfo = getTrackDownloadStatus?.(track.id) ?? { status: 'none' as const, progress: 0 }}
|
||||
<TrackRow
|
||||
trackId={track.id}
|
||||
number={index + 1}
|
||||
title={track.title}
|
||||
artist={track.performer?.name}
|
||||
duration={formatDuration(track.duration)}
|
||||
quality={track.hires ? 'Hi-Res' : undefined}
|
||||
isFavorite={true}
|
||||
isFavoriteOverride={true}
|
||||
downloadStatus={downloadInfo.status}
|
||||
downloadProgress={downloadInfo.progress}
|
||||
onPlay={() => handleTrackClick(track, index)}
|
||||
@@ -392,7 +393,6 @@
|
||||
onPlayNow: () => handleTrackClick(track, index),
|
||||
onPlayNext: onTrackPlayNext ? () => onTrackPlayNext(displayTrack) : undefined,
|
||||
onPlayLater: onTrackPlayLater ? () => onTrackPlayLater(displayTrack) : undefined,
|
||||
onAddFavorite: onTrackAddFavorite ? () => onTrackAddFavorite(track.id) : undefined,
|
||||
onAddToPlaylist: onTrackAddToPlaylist ? () => onTrackAddToPlaylist(track.id) : undefined,
|
||||
onShareQobuz: onTrackShareQobuz ? () => onTrackShareQobuz(track.id) : undefined,
|
||||
onShareSonglink: onTrackShareSonglink ? () => onTrackShareSonglink(displayTrack) : undefined,
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
import TrackRow from '../TrackRow.svelte';
|
||||
import HomeSettingsModal from '../HomeSettingsModal.svelte';
|
||||
import { formatDuration, formatQuality, getQobuzImage } from '$lib/adapters/qobuzAdapters';
|
||||
import { handleAddToFavorites } from '$lib/services/trackActions';
|
||||
import {
|
||||
subscribe as subscribeHomeSettings,
|
||||
getSettings,
|
||||
@@ -587,6 +586,7 @@
|
||||
<div class="track-list">
|
||||
{#each continueTracks as track, index}
|
||||
<TrackRow
|
||||
trackId={track.id}
|
||||
number={index + 1}
|
||||
title={track.title}
|
||||
artist={track.artist}
|
||||
@@ -595,8 +595,7 @@
|
||||
hideDownload={true}
|
||||
onPlay={() => onTrackPlay?.(track)}
|
||||
menuActions={{
|
||||
onPlayNow: () => onTrackPlay?.(track),
|
||||
onAddFavorite: () => handleAddToFavorites(track.id)
|
||||
onPlayNow: () => onTrackPlay?.(track)
|
||||
}}
|
||||
/>
|
||||
{/each}
|
||||
|
||||
@@ -486,6 +486,7 @@
|
||||
duration={formatDuration(track.duration_secs)}
|
||||
quality={getQualityBadge(track)}
|
||||
hideDownload={true}
|
||||
hideFavorite={true}
|
||||
onPlay={() => handleTrackPlay(track)}
|
||||
menuActions={{
|
||||
onPlayNow: () => handleTrackPlay(track),
|
||||
@@ -698,6 +699,7 @@
|
||||
duration={formatDuration(track.duration_secs)}
|
||||
quality={getQualityBadge(track)}
|
||||
hideDownload={true}
|
||||
hideFavorite={true}
|
||||
onPlay={() => handleTrackPlay(track)}
|
||||
menuActions={{
|
||||
onPlayNow: () => handleTrackPlay(track),
|
||||
|
||||
@@ -129,7 +129,6 @@
|
||||
let loading = $state(true);
|
||||
let error = $state<string | null>(null);
|
||||
let playBtnHovered = $state(false);
|
||||
let favoriteTrackIds = $state<Set<number>>(new Set());
|
||||
|
||||
// Local settings state
|
||||
let searchQuery = $state('');
|
||||
@@ -138,14 +137,9 @@
|
||||
let customArtworkPath = $state<string | null>(null);
|
||||
let showSortMenu = $state(false);
|
||||
|
||||
interface FavoritesResponse {
|
||||
tracks?: { items: Array<{ id: number }>; total: number };
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
loadPlaylist();
|
||||
loadSettings();
|
||||
loadFavorites();
|
||||
loadLocalTracks();
|
||||
});
|
||||
|
||||
@@ -160,21 +154,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function loadFavorites() {
|
||||
try {
|
||||
const response = await invoke<FavoritesResponse>('get_favorites', {
|
||||
favType: 'tracks',
|
||||
limit: 500,
|
||||
offset: 0
|
||||
});
|
||||
if (response.tracks?.items) {
|
||||
favoriteTrackIds = new Set(response.tracks.items.map(item => item.id));
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Failed to load favorite tracks:', err);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadPlaylist() {
|
||||
loading = true;
|
||||
error = null;
|
||||
@@ -659,12 +638,13 @@
|
||||
</div>
|
||||
{/if}
|
||||
<TrackRow
|
||||
trackId={track.isLocal ? undefined : track.id}
|
||||
number={idx + 1}
|
||||
title={track.title}
|
||||
artist={track.artist}
|
||||
duration={track.duration}
|
||||
quality={track.hires ? 'Hi-Res' : undefined}
|
||||
isFavorite={!track.isLocal && favoriteTrackIds.has(track.id)}
|
||||
hideFavorite={track.isLocal}
|
||||
hideDownload={track.isLocal}
|
||||
downloadStatus={downloadInfo.status}
|
||||
downloadProgress={downloadInfo.progress}
|
||||
@@ -675,7 +655,6 @@
|
||||
onPlayNow: () => handleTrackClick(track),
|
||||
onPlayNext: track.isLocal ? () => handleTrackPlayNext(track) : (onTrackPlayNext ? () => onTrackPlayNext(track) : undefined),
|
||||
onPlayLater: track.isLocal ? () => handleTrackPlayLater(track) : (onTrackPlayLater ? () => onTrackPlayLater(track) : undefined),
|
||||
onAddFavorite: !track.isLocal && onTrackAddFavorite ? () => onTrackAddFavorite(track.id) : undefined,
|
||||
onAddToPlaylist: !track.isLocal && onTrackAddToPlaylist ? () => onTrackAddToPlaylist(track.id) : undefined,
|
||||
onShareQobuz: !track.isLocal && onTrackShareQobuz ? () => onTrackShareQobuz(track.id) : undefined,
|
||||
onShareSonglink: !track.isLocal && onTrackShareSonglink ? () => onTrackShareSonglink(track) : undefined,
|
||||
|
||||
Reference in new issue
Block a user