From 2ffd9df13334b258d601cfd8f4f7f7563ddc570a Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Sat, 31 Jan 2026 16:45:23 -0600 Subject: [PATCH] feat: add "Find available version" option for unavailable tracks - Add TrackReplacementModal to search for replacement tracks - Add onFindReplacement action to TrackMenu context menu - Show replacement option only for owned playlists with unavailable tracks - Replacement searches by track title + artist - Shows quality info (bit depth, sample rate) to help user choose - Supports preview playback before confirming - Replace old track with new one in playlist Also fix tooltip for unavailable tracks to show a complete message instead of "is no longer available" (now shows "Track no longer available in Qobuz library") --- src/lib/components/TrackMenu.svelte | 13 +- .../components/TrackReplacementModal.svelte | 588 ++++++++++++++++++ .../views/PlaylistDetailView.svelte | 112 +++- src/lib/i18n/locales/en.json | 13 +- src/lib/i18n/locales/es.json | 13 +- 5 files changed, 730 insertions(+), 9 deletions(-) create mode 100644 src/lib/components/TrackReplacementModal.svelte diff --git a/src/lib/components/TrackMenu.svelte b/src/lib/components/TrackMenu.svelte index 9e7412800..773232c4b 100644 --- a/src/lib/components/TrackMenu.svelte +++ b/src/lib/components/TrackMenu.svelte @@ -16,7 +16,8 @@ CloudDownload, RefreshCw, Radio, - Info + Info, + Search } from 'lucide-svelte'; import { shouldHidePlaylistFeatures } from '$lib/utils/offlineHelpers'; import { @@ -37,6 +38,7 @@ onAddFavorite?: () => void; onAddToPlaylist?: () => void; onRemoveFromPlaylist?: () => void; + onFindReplacement?: () => void; onShareQobuz?: () => void; onShareSonglink?: () => void; onGoToAlbum?: () => void; @@ -58,6 +60,7 @@ onAddFavorite, onAddToPlaylist, onRemoveFromPlaylist, + onFindReplacement, onShareQobuz, onShareSonglink, onGoToAlbum, @@ -100,7 +103,7 @@ } const hasPlayback = $derived(!!(onPlayNow || onPlayTrackOnly || onPlayFromHere || onPlayNext || onPlayLater || onCreateRadio)); - const hasLibrary = $derived(!!(onAddFavorite || onAddToPlaylist || onRemoveFromPlaylist)); + const hasLibrary = $derived(!!(onAddFavorite || onAddToPlaylist || onRemoveFromPlaylist || onFindReplacement)); const hasShare = $derived(!!(onShareQobuz || onShareSonglink)); const hasDownload = $derived(!!onDownload || isTrackDownloaded); const hasNav = $derived(!!(onGoToAlbum || onGoToArtist || onShowInfo)); @@ -414,6 +417,12 @@ Remove from playlist {/if} + {#if onFindReplacement} + + {/if} {/if} {#if hasLibrary && (hasShare || hasNav)} diff --git a/src/lib/components/TrackReplacementModal.svelte b/src/lib/components/TrackReplacementModal.svelte new file mode 100644 index 000000000..23446c39f --- /dev/null +++ b/src/lib/components/TrackReplacementModal.svelte @@ -0,0 +1,588 @@ + + +{#if isOpen} + +{/if} + + diff --git a/src/lib/components/views/PlaylistDetailView.svelte b/src/lib/components/views/PlaylistDetailView.svelte index c5bd9cebb..4e14f9e01 100644 --- a/src/lib/components/views/PlaylistDetailView.svelte +++ b/src/lib/components/views/PlaylistDetailView.svelte @@ -3,6 +3,7 @@ import AlbumMenu from '../AlbumMenu.svelte'; import PlaylistCollage from '../PlaylistCollage.svelte'; import PlaylistModal from '../PlaylistModal.svelte'; + import TrackReplacementModal from '../TrackReplacementModal.svelte'; import ViewTransition from '../ViewTransition.svelte'; import { writeText } from '@tauri-apps/plugin-clipboard-manager'; import { invoke } from '@tauri-apps/api/core'; @@ -17,7 +18,8 @@ type OfflineStatus } from '$lib/stores/offlineStore'; import { consumeContextTrackFocus, setPlaybackContext } from '$lib/stores/playbackContextStore'; - import { isTrackUnavailable, subscribe as subscribeUnavailable } from '$lib/stores/unavailableTracksStore'; + import { isTrackUnavailable, clearTrackUnavailable, subscribe as subscribeUnavailable } from '$lib/stores/unavailableTracksStore'; + import { showToast } from '$lib/stores/toastStore'; import { t } from '$lib/i18n'; import { onMount, tick } from 'svelte'; @@ -250,6 +252,10 @@ let isCopying = $state(false); let isCopied = $state(false); + // Track replacement modal state + let replacementModalOpen = $state(false); + let trackToReplace = $state(null); + // Track copied playlists in localStorage const COPIED_PLAYLISTS_KEY = 'qbz_copied_playlists'; @@ -1235,6 +1241,95 @@ } } + // Open replacement modal for an unavailable track + function openReplacementModal(track: DisplayTrack) { + trackToReplace = track; + replacementModalOpen = true; + } + + // Handle track replacement selection + interface ReplacementTrack { + id: number; + title: string; + duration: number; + performer?: { id?: number; name: string }; + album?: { + id: string; + title: string; + image?: { small?: string; thumbnail?: string; large?: string }; + }; + hires: boolean; + maximum_bit_depth?: number; + maximum_sampling_rate?: number; + } + + async function handleTrackReplacement(newTrack: ReplacementTrack) { + if (!trackToReplace || !trackToReplace.playlistTrackId) { + console.error('No track to replace or missing playlist_track_id'); + return; + } + + try { + // Get the current position of the track being replaced + const currentIndex = displayTracks.findIndex(t => t.id === trackToReplace!.id); + + // Remove the old track + await invoke('remove_tracks_from_playlist', { + playlistId, + playlistTrackIds: [trackToReplace.playlistTrackId] + }); + + // Add the new track + await invoke('add_tracks_to_playlist', { + playlistId, + trackIds: [newTrack.id] + }); + + // Clear the unavailable status for the old track (if it was in the store) + clearTrackUnavailable(trackToReplace.id); + + // Reload the playlist to get updated data + await loadPlaylist(); + notifyParentOfCounts(); + onPlaylistUpdated?.(); + + // Show success message + showToast($t('playlist.trackReplaced'), 'success'); + + // Close modal + replacementModalOpen = false; + trackToReplace = null; + + console.log(`[Playlist] Track replaced: ${trackToReplace?.title} -> ${newTrack.title} at position ${currentIndex}`); + } catch (err) { + console.error('Failed to replace track:', err); + showToast($t('playlist.trackReplaceFailed'), 'error'); + } + } + + // Preview a replacement track + function handlePreviewReplacement(track: ReplacementTrack) { + if (!onTrackPlay) return; + + const displayTrack: DisplayTrack = { + id: track.id, + number: 0, + title: track.title, + artist: track.performer?.name, + album: track.album?.title, + albumArt: track.album?.image?.large || track.album?.image?.thumbnail, + albumId: track.album?.id, + artistId: track.performer?.id, + duration: formatDuration(track.duration), + durationSeconds: track.duration, + hires: track.hires, + bitDepth: track.maximum_bit_depth, + samplingRate: track.maximum_sampling_rate + }; + + onTrackPlay(displayTrack); + } + // Add a suggested track to the playlist async function handleAddSuggestedTrack(suggestedTrack: import('$lib/services/playlistSuggestionsService').SuggestedTrack) { try { @@ -1738,8 +1833,9 @@ onDownload={available && !track.isLocal && onTrackDownload ? () => onTrackDownload(track) : undefined} onRemoveDownload={available && !track.isLocal && onTrackRemoveDownload ? () => onTrackRemoveDownload(track.id) : undefined} menuActions={removedFromQobuz ? (isOwnPlaylist ? { - // Only allow remove from playlist for tracks removed from Qobuz (owned playlists only) - onRemoveFromPlaylist: () => removeTrackFromPlaylist(track) + // Only allow remove from playlist and find replacement for tracks removed from Qobuz (owned playlists only) + onRemoveFromPlaylist: () => removeTrackFromPlaylist(track), + onFindReplacement: () => openReplacementModal(track) } : {}) : available ? { onPlayNow: () => handleTrackClick(track, idx), onPlayNext: track.isLocal ? () => handleTrackPlayNext(track) : (onTrackPlayNext ? () => onTrackPlayNext(track) : undefined), @@ -1800,6 +1896,16 @@ /> {/if} + + { replacementModalOpen = false; trackToReplace = null; }} + onSelect={handleTrackReplacement} + onPreview={handlePreviewReplacement} +/> +