fix(playlists): add local tracks to playlists correctly

- PlaylistModal now uses playlist_add_local_track command for local tracks
  instead of the Qobuz-only add_tracks_to_playlist command
- Added isLocalTracks prop to PlaylistModal and wired it through uiStore
- Updated LocalLibraryView to pass isLocal=true when adding tracks to playlists
- Added HardDrive icon indicator next to quality badge for local tracks in TrackRow

cc
This commit is contained in:
vicrodh committed 2026-01-16 06:03:09 -06:00
1 parent 81d2bdcf33
commit 3915abd3bb
5 files changed
+155 -50

No files matched your search

+36 -12
View File
@@ -19,6 +19,7 @@
onSuccess?: (playlist?: Playlist) => void; onSuccess?: (playlist?: Playlist) => void;
onDelete?: (playlistId: number) => void; onDelete?: (playlistId: number) => void;
isHidden?: boolean; isHidden?: boolean;
isLocalTracks?: boolean;
} }
let { let {
@@ -30,7 +31,8 @@
onClose, onClose,
onSuccess, onSuccess,
onDelete, onDelete,
isHidden = false isHidden = false,
isLocalTracks = false
}: Props = $props(); }: Props = $props();
// Form state // Form state
@@ -154,11 +156,22 @@
error = null; error = null;
try { try {
await invoke('add_tracks_to_playlist', { if (isLocalTracks) {
playlistId: selectedPlaylistId, // Add local tracks one by one
trackIds for (let i = 0; i < trackIds.length; i++) {
}); await invoke('playlist_add_local_track', {
void logPlaylistAdd(trackIds, selectedPlaylistId); playlistId: selectedPlaylistId,
localTrackId: trackIds[i],
position: i
});
}
} else {
await invoke('add_tracks_to_playlist', {
playlistId: selectedPlaylistId,
trackIds
});
void logPlaylistAdd(trackIds, selectedPlaylistId);
}
onSuccess?.(); onSuccess?.();
onClose(); onClose();
} catch (err) { } catch (err) {
@@ -188,11 +201,22 @@
// Then add tracks // Then add tracks
if (trackIds.length > 0) { if (trackIds.length > 0) {
await invoke('add_tracks_to_playlist', { if (isLocalTracks) {
playlistId: newPlaylist.id, // Add local tracks one by one
trackIds for (let i = 0; i < trackIds.length; i++) {
}); await invoke('playlist_add_local_track', {
void logPlaylistAdd(trackIds, newPlaylist.id); playlistId: newPlaylist.id,
localTrackId: trackIds[i],
position: i
});
}
} else {
await invoke('add_tracks_to_playlist', {
playlistId: newPlaylist.id,
trackIds
});
void logPlaylistAdd(trackIds, newPlaylist.id);
}
} }
onSuccess?.(newPlaylist); onSuccess?.(newPlaylist);
@@ -261,7 +285,7 @@
{#if mode === 'addTrack'} {#if mode === 'addTrack'}
<div class="track-info"> <div class="track-info">
Adding {trackIds.length} track{trackIds.length !== 1 ? 's' : ''} Adding {trackIds.length} {isLocalTracks ? 'local ' : ''}track{trackIds.length !== 1 ? 's' : ''}
</div> </div>
<div class="form-group"> <div class="form-group">
+22 -2
View File
@@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { Play, Heart } from 'lucide-svelte'; import { Play, Heart, HardDrive } from 'lucide-svelte';
import TrackMenu from './TrackMenu.svelte'; import TrackMenu from './TrackMenu.svelte';
import DownloadButton from './DownloadButton.svelte'; import DownloadButton from './DownloadButton.svelte';
import { import {
@@ -20,6 +20,7 @@
duration: string; duration: string;
quality?: string; quality?: string;
isPlaying?: boolean; isPlaying?: boolean;
isLocal?: boolean; // Whether this is a local library track
isFavoriteOverride?: boolean; // Optional override for favorite state isFavoriteOverride?: boolean; // Optional override for favorite state
downloadStatus?: DownloadStatus; downloadStatus?: DownloadStatus;
downloadProgress?: number; downloadProgress?: number;
@@ -54,6 +55,7 @@
duration, duration,
quality, quality,
isPlaying = false, isPlaying = false,
isLocal = false,
isFavoriteOverride, isFavoriteOverride,
downloadStatus = 'none', downloadStatus = 'none',
downloadProgress = 0, downloadProgress = 0,
@@ -174,7 +176,14 @@
<div class="track-duration">{duration}</div> <div class="track-duration">{duration}</div>
<!-- Quality (always render to maintain column alignment) --> <!-- Quality (always render to maintain column alignment) -->
<div class="track-quality">{quality ?? ''}</div> <div class="track-quality">
{#if isLocal}
<span class="local-icon" title="Local library track">
<HardDrive size={12} />
</span>
{/if}
{quality ?? ''}
</div>
<!-- Favorite Button --> <!-- Favorite Button -->
{#if !hideFavorite} {#if !hideFavorite}
@@ -382,12 +391,23 @@
} }
.track-quality { .track-quality {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 4px;
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
width: 80px; width: 80px;
text-align: right; text-align: right;
} }
.local-icon {
display: flex;
align-items: center;
color: var(--text-muted);
opacity: 0.7;
}
.favorite-btn { .favorite-btn {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import { invoke, convertFileSrc } from '@tauri-apps/api/core'; import { invoke, convertFileSrc } from '@tauri-apps/api/core';
import { open } from '@tauri-apps/plugin-dialog'; import { open, ask } from '@tauri-apps/plugin-dialog';
import { onMount, onDestroy } from 'svelte'; import { onMount, onDestroy } from 'svelte';
import { import {
HardDrive, Music, Disc3, Mic2, FolderPlus, Trash2, RefreshCw, HardDrive, Music, Disc3, Mic2, FolderPlus, Trash2, RefreshCw,
@@ -534,27 +534,38 @@
let clearingLibrary = $state(false); let clearingLibrary = $state(false);
function handleClearLibrary(event: MouseEvent) { async function handleClearLibrary(event: MouseEvent) {
// Prevent double execution
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
if (clearingLibrary) return; if (clearingLibrary) return;
const firstConfirm = confirm( // First confirmation using Tauri dialog (async, properly sequential)
'Clear entire library?\n\n' + const firstConfirm = await ask(
'This will remove ALL indexed tracks from the database.\n' + 'This will remove ALL indexed tracks from the database.\n' +
'Your audio files will NOT be deleted.\n\n' + 'Your audio files will NOT be deleted.\n\n' +
'You will need to re-scan your folders after this.' 'You will need to re-scan your folders after this.',
{
title: 'Clear entire library?',
kind: 'warning',
okLabel: 'Continue',
cancelLabel: 'Cancel'
}
); );
if (!firstConfirm) { if (!firstConfirm) {
return; return;
} }
const secondConfirm = confirm( // Second confirmation - only shown after first is confirmed
'Are you absolutely sure?\n\n' + const secondConfirm = await ask(
'This action cannot be undone.' 'This action cannot be undone.',
{
title: 'Are you absolutely sure?',
kind: 'warning',
okLabel: 'Clear Library',
cancelLabel: 'Cancel'
}
); );
if (!secondConfirm) { if (!secondConfirm) {
@@ -564,20 +575,18 @@
// Only proceed if both confirmations passed // Only proceed if both confirmations passed
clearingLibrary = true; clearingLibrary = true;
invoke('library_clear') try {
.then(() => loadLibraryData()) await invoke('library_clear');
.then(() => { await loadLibraryData();
albums = []; albums = [];
artists = []; artists = [];
tracks = []; tracks = [];
}) } catch (err) {
.catch((err) => { console.error('Failed to clear library:', err);
console.error('Failed to clear library:', err); alert(`Failed to clear library: ${err}`);
alert(`Failed to clear library: ${err}`); } finally {
}) clearingLibrary = false;
.finally(() => { }
clearingLibrary = false;
});
} }
async function handleFetchMissingArtwork() { async function handleFetchMissingArtwork() {
@@ -1379,15 +1388,6 @@
<Play size={16} fill="white" /> <Play size={16} fill="white" />
<span>Play All</span> <span>Play All</span>
</button> </button>
<button
class="secondary-btn"
onclick={handleSetAlbumArtwork}
disabled={updatingArtwork}
title="Set album artwork"
>
<Upload size={14} />
<span>{updatingArtwork ? 'Updating...' : 'Set Cover'}</span>
</button>
</div> </div>
</div> </div>
</div> </div>
@@ -1404,6 +1404,7 @@
artist={track.artist !== selectedAlbum?.artist ? track.artist : undefined} artist={track.artist !== selectedAlbum?.artist ? track.artist : undefined}
duration={formatDuration(track.duration_secs)} duration={formatDuration(track.duration_secs)}
quality={getQualityBadge(track)} quality={getQualityBadge(track)}
isLocal={true}
hideDownload={true} hideDownload={true}
hideFavorite={true} hideFavorite={true}
onArtistClick={track.artist && track.artist !== selectedAlbum?.artist onArtistClick={track.artist && track.artist !== selectedAlbum?.artist
@@ -2043,6 +2044,7 @@
artist={track.artist} artist={track.artist}
duration={formatDuration(track.duration_secs)} duration={formatDuration(track.duration_secs)}
quality={getQualityBadge(track)} quality={getQualityBadge(track)}
isLocal={true}
hideDownload={true} hideDownload={true}
hideFavorite={true} hideFavorite={true}
onArtistClick={track.artist ? () => handleLocalArtistClick(track.artist) : undefined} onArtistClick={track.artist ? () => handleLocalArtistClick(track.artist) : undefined}
@@ -2065,6 +2067,7 @@
artist={track.artist} artist={track.artist}
duration={formatDuration(track.duration_secs)} duration={formatDuration(track.duration_secs)}
quality={getQualityBadge(track)} quality={getQualityBadge(track)}
isLocal={true}
hideDownload={true} hideDownload={true}
hideFavorite={true} hideFavorite={true}
onArtistClick={track.artist ? () => handleLocalArtistClick(track.artist) : undefined} onArtistClick={track.artist ? () => handleLocalArtistClick(track.artist) : undefined}
@@ -2131,6 +2134,31 @@
<p class="form-hint">Album title editing coming soon</p> <p class="form-hint">Album title editing coming soon</p>
</div> </div>
<div class="form-group">
<label>Album Artwork</label>
<div class="artwork-row">
{#if selectedAlbum.artwork_path}
<img
src={getArtworkUrl(selectedAlbum.artwork_path)}
alt="Current artwork"
class="artwork-preview"
/>
{:else}
<div class="artwork-preview artwork-placeholder-mini">
<Disc3 size={24} />
</div>
{/if}
<button
class="secondary-btn"
onclick={handleSetAlbumArtwork}
disabled={updatingArtwork}
>
<Upload size={14} />
<span>{updatingArtwork ? 'Updating...' : 'Change Cover'}</span>
</button>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="toggle-label"> <label class="toggle-label">
<input <input
@@ -3445,6 +3473,27 @@
color: var(--text-muted); color: var(--text-muted);
} }
.artwork-row {
display: flex;
align-items: center;
gap: 16px;
}
.artwork-preview {
width: 64px;
height: 64px;
border-radius: 6px;
object-fit: cover;
background: var(--bg-tertiary);
}
.artwork-placeholder-mini {
display: flex;
align-items: center;
justify-content: center;
color: var(--text-muted);
}
.modal-footer { .modal-footer {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
+10 -1
View File
@@ -14,6 +14,7 @@ let isCastPickerOpen = false;
let isPlaylistModalOpen = false; let isPlaylistModalOpen = false;
let playlistModalMode: 'create' | 'edit' | 'addTrack' = 'create'; let playlistModalMode: 'create' | 'edit' | 'addTrack' = 'create';
let playlistModalTrackIds: number[] = []; let playlistModalTrackIds: number[] = [];
let playlistModalTracksAreLocal = false;
let isPlaylistImportOpen = false; let isPlaylistImportOpen = false;
// Listeners // Listeners
@@ -132,16 +133,22 @@ export function getPlaylistModalTrackIds(): number[] {
return playlistModalTrackIds; return playlistModalTrackIds;
} }
export function openPlaylistModal(mode: 'create' | 'edit' | 'addTrack', trackIds: number[] = []): void { export function getPlaylistModalTracksAreLocal(): boolean {
return playlistModalTracksAreLocal;
}
export function openPlaylistModal(mode: 'create' | 'edit' | 'addTrack', trackIds: number[] = [], isLocal = false): void {
isPlaylistModalOpen = true; isPlaylistModalOpen = true;
playlistModalMode = mode; playlistModalMode = mode;
playlistModalTrackIds = trackIds; playlistModalTrackIds = trackIds;
playlistModalTracksAreLocal = isLocal;
notifyListeners(); notifyListeners();
} }
export function closePlaylistModal(): void { export function closePlaylistModal(): void {
isPlaylistModalOpen = false; isPlaylistModalOpen = false;
playlistModalTrackIds = []; playlistModalTrackIds = [];
playlistModalTracksAreLocal = false;
notifyListeners(); notifyListeners();
} }
@@ -205,6 +212,7 @@ export interface UIState {
isPlaylistModalOpen: boolean; isPlaylistModalOpen: boolean;
playlistModalMode: 'create' | 'edit' | 'addTrack'; playlistModalMode: 'create' | 'edit' | 'addTrack';
playlistModalTrackIds: number[]; playlistModalTrackIds: number[];
playlistModalTracksAreLocal: boolean;
isPlaylistImportOpen: boolean; isPlaylistImportOpen: boolean;
} }
@@ -217,6 +225,7 @@ export function getUIState(): UIState {
isPlaylistModalOpen, isPlaylistModalOpen,
playlistModalMode, playlistModalMode,
playlistModalTrackIds, playlistModalTrackIds,
playlistModalTracksAreLocal,
isPlaylistImportOpen isPlaylistImportOpen
}; };
} }
+6 -3
View File
@@ -289,6 +289,7 @@
let isPlaylistModalOpen = $state(false); let isPlaylistModalOpen = $state(false);
let playlistModalMode = $state<'create' | 'edit' | 'addTrack'>('create'); let playlistModalMode = $state<'create' | 'edit' | 'addTrack'>('create');
let playlistModalTrackIds = $state<number[]>([]); let playlistModalTrackIds = $state<number[]>([]);
let playlistModalTracksAreLocal = $state(false);
let isPlaylistImportOpen = $state(false); let isPlaylistImportOpen = $state(false);
let isAboutModalOpen = $state(false); let isAboutModalOpen = $state(false);
let userPlaylists = $state<{ id: number; name: string; tracks_count: number }[]>([]); let userPlaylists = $state<{ id: number; name: string; tracks_count: number }[]>([]);
@@ -1221,9 +1222,9 @@
openPlaylistModal('create', []); openPlaylistModal('create', []);
} }
function openAddToPlaylist(trackIds: number[]) { function openAddToPlaylist(trackIds: number[], isLocal = false) {
userPlaylists = sidebarRef?.getPlaylists() ?? []; userPlaylists = sidebarRef?.getPlaylists() ?? [];
openPlaylistModal('addTrack', trackIds); openPlaylistModal('addTrack', trackIds, isLocal);
} }
function handlePlaylistCreated() { function handlePlaylistCreated() {
@@ -1590,6 +1591,7 @@
isPlaylistModalOpen = uiState.isPlaylistModalOpen; isPlaylistModalOpen = uiState.isPlaylistModalOpen;
playlistModalMode = uiState.playlistModalMode; playlistModalMode = uiState.playlistModalMode;
playlistModalTrackIds = uiState.playlistModalTrackIds; playlistModalTrackIds = uiState.playlistModalTrackIds;
playlistModalTracksAreLocal = uiState.playlistModalTracksAreLocal;
isPlaylistImportOpen = uiState.isPlaylistImportOpen; isPlaylistImportOpen = uiState.isPlaylistImportOpen;
}); });
@@ -1986,7 +1988,7 @@
onTrackPlay={handleLocalTrackPlay} onTrackPlay={handleLocalTrackPlay}
onTrackPlayNext={queueLocalTrackNext} onTrackPlayNext={queueLocalTrackNext}
onTrackPlayLater={queueLocalTrackLater} onTrackPlayLater={queueLocalTrackLater}
onTrackAddToPlaylist={(trackId) => openAddToPlaylist([trackId])} onTrackAddToPlaylist={(trackId) => openAddToPlaylist([trackId], true)}
onSetLocalQueue={handleSetLocalQueue} onSetLocalQueue={handleSetLocalQueue}
onQobuzArtistClick={handleArtistClick} onQobuzArtistClick={handleArtistClick}
/> />
@@ -2229,6 +2231,7 @@
isOpen={isPlaylistModalOpen} isOpen={isPlaylistModalOpen}
mode={playlistModalMode} mode={playlistModalMode}
trackIds={playlistModalTrackIds} trackIds={playlistModalTrackIds}
isLocalTracks={playlistModalTracksAreLocal}
{userPlaylists} {userPlaylists}
onClose={closePlaylistModal} onClose={closePlaylistModal}
onSuccess={handlePlaylistCreated} onSuccess={handlePlaylistCreated}