feat: add local library tracks to Qobuz playlists
- Create AddToPlaylistModal component for selecting playlists - Update PlaylistDetailView to merge local and Qobuz tracks - Add visual indicator (HardDrive icon) for local tracks - Show notice that local tracks are device-specific - Add "Add to Playlist" option in Local Library track menu - Connect local track play handlers for playlists - Hide download button for local tracks in playlists
This commit is contained in:
1 parent
93a6e9545a
commit
baa656a508
4 files changed
+576
-34
No files matched your search
@@ -0,0 +1,311 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { invoke } from '@tauri-apps/api/core';
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { X, Plus, ListMusic, Loader2 } from 'lucide-svelte';
|
||||||
|
|
||||||
|
interface Playlist {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
tracks_count: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
isOpen: boolean;
|
||||||
|
onClose: () => void;
|
||||||
|
onSelect: (playlistId: number) => Promise<void>;
|
||||||
|
trackTitle?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
let { isOpen, onClose, onSelect, trackTitle }: Props = $props();
|
||||||
|
|
||||||
|
let playlists = $state<Playlist[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let adding = $state<number | null>(null);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
if (isOpen) {
|
||||||
|
loadPlaylists();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
if (isOpen && playlists.length === 0) {
|
||||||
|
loadPlaylists();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
async function loadPlaylists() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
try {
|
||||||
|
const result = await invoke<{ items: Playlist[] }>('get_user_playlists', { limit: 100, offset: 0 });
|
||||||
|
playlists = result.items || [];
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to load playlists:', err);
|
||||||
|
error = String(err);
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleSelect(playlistId: number) {
|
||||||
|
adding = playlistId;
|
||||||
|
try {
|
||||||
|
await onSelect(playlistId);
|
||||||
|
onClose();
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to add to playlist:', err);
|
||||||
|
error = String(err);
|
||||||
|
} finally {
|
||||||
|
adding = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if isOpen}
|
||||||
|
<div class="overlay" onclick={onClose} onkeydown={(e) => e.key === 'Escape' && onClose()} role="presentation">
|
||||||
|
<div class="modal" onclick={(e) => e.stopPropagation()} onkeydown={(e) => e.stopPropagation()} role="dialog" tabindex="-1">
|
||||||
|
<div class="header">
|
||||||
|
<h3>Add to Playlist</h3>
|
||||||
|
<button class="close-btn" onclick={onClose}>
|
||||||
|
<X size={20} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if trackTitle}
|
||||||
|
<div class="track-info">
|
||||||
|
Adding: <span class="track-name">{trackTitle}</span>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="content">
|
||||||
|
{#if loading}
|
||||||
|
<div class="loading">
|
||||||
|
<Loader2 size={24} class="spin" />
|
||||||
|
<p>Loading playlists...</p>
|
||||||
|
</div>
|
||||||
|
{:else if error}
|
||||||
|
<div class="error">
|
||||||
|
<p>{error}</p>
|
||||||
|
<button class="retry-btn" onclick={loadPlaylists}>Retry</button>
|
||||||
|
</div>
|
||||||
|
{:else if playlists.length === 0}
|
||||||
|
<div class="empty">
|
||||||
|
<ListMusic size={32} />
|
||||||
|
<p>No playlists found</p>
|
||||||
|
<p class="hint">Create a playlist first in Qobuz</p>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="playlist-list">
|
||||||
|
{#each playlists as playlist}
|
||||||
|
<button
|
||||||
|
class="playlist-item"
|
||||||
|
disabled={adding !== null}
|
||||||
|
onclick={() => handleSelect(playlist.id)}
|
||||||
|
>
|
||||||
|
<div class="playlist-icon">
|
||||||
|
<ListMusic size={20} />
|
||||||
|
</div>
|
||||||
|
<div class="playlist-info">
|
||||||
|
<span class="playlist-name">{playlist.name}</span>
|
||||||
|
<span class="playlist-count">{playlist.tracks_count} tracks</span>
|
||||||
|
</div>
|
||||||
|
{#if adding === playlist.id}
|
||||||
|
<Loader2 size={16} class="spin" />
|
||||||
|
{:else}
|
||||||
|
<Plus size={16} class="add-icon" />
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.overlay {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
z-index: 200;
|
||||||
|
background-color: rgba(0, 0, 0, 0.6);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal {
|
||||||
|
width: 400px;
|
||||||
|
max-height: 500px;
|
||||||
|
background-color: var(--bg-secondary);
|
||||||
|
border-radius: 12px;
|
||||||
|
overflow: hidden;
|
||||||
|
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 16px 20px;
|
||||||
|
border-bottom: 1px solid var(--bg-tertiary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header h3 {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close-btn {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: var(--text-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 4px;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close-btn:hover {
|
||||||
|
color: var(--text-primary);
|
||||||
|
background-color: rgba(255, 255, 255, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-info {
|
||||||
|
padding: 12px 20px;
|
||||||
|
background-color: var(--bg-tertiary);
|
||||||
|
font-size: 13px;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-name {
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading, .empty, .error {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 32px;
|
||||||
|
gap: 12px;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading :global(.spin) {
|
||||||
|
animation: spin 1s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
from { transform: rotate(0deg); }
|
||||||
|
to { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.hint {
|
||||||
|
font-size: 12px;
|
||||||
|
color: #666666;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error {
|
||||||
|
color: #ff6b6b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.retry-btn {
|
||||||
|
margin-top: 8px;
|
||||||
|
padding: 8px 16px;
|
||||||
|
background-color: var(--accent-primary);
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 12px 16px;
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
border-radius: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background-color 150ms ease;
|
||||||
|
width: 100%;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-item:hover:not(:disabled) {
|
||||||
|
background-color: var(--bg-tertiary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-item:disabled {
|
||||||
|
opacity: 0.6;
|
||||||
|
cursor: wait;
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-icon {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
background-color: var(--bg-tertiary);
|
||||||
|
border-radius: 6px;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-info {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-name {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--text-primary);
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-count {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.add-icon {
|
||||||
|
color: var(--text-muted);
|
||||||
|
opacity: 0;
|
||||||
|
transition: opacity 150ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-item:hover .add-icon {
|
||||||
|
opacity: 1;
|
||||||
|
color: var(--accent-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.playlist-item :global(.spin) {
|
||||||
|
color: var(--accent-primary);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -4,10 +4,11 @@
|
|||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
import {
|
import {
|
||||||
HardDrive, Music, Disc3, Mic2, FolderPlus, Trash2, RefreshCw,
|
HardDrive, Music, Disc3, Mic2, FolderPlus, Trash2, RefreshCw,
|
||||||
Settings, X, Play, Plus, AlertCircle, Clock, ImageDown
|
Settings, X, Play, Plus, AlertCircle, Clock, ImageDown, ListPlus
|
||||||
} from 'lucide-svelte';
|
} from 'lucide-svelte';
|
||||||
import AlbumCard from '../AlbumCard.svelte';
|
import AlbumCard from '../AlbumCard.svelte';
|
||||||
import TrackRow from '../TrackRow.svelte';
|
import TrackRow from '../TrackRow.svelte';
|
||||||
|
import AddToPlaylistModal from '../AddToPlaylistModal.svelte';
|
||||||
|
|
||||||
// Backend types matching Rust models
|
// Backend types matching Rust models
|
||||||
interface LocalTrack {
|
interface LocalTrack {
|
||||||
@@ -111,6 +112,29 @@
|
|||||||
let selectedAlbum = $state<LocalAlbum | null>(null);
|
let selectedAlbum = $state<LocalAlbum | null>(null);
|
||||||
let albumTracks = $state<LocalTrack[]>([]);
|
let albumTracks = $state<LocalTrack[]>([]);
|
||||||
|
|
||||||
|
// Playlist modal state
|
||||||
|
let showPlaylistModal = $state(false);
|
||||||
|
let selectedTrackForPlaylist = $state<LocalTrack | null>(null);
|
||||||
|
|
||||||
|
async function handleAddToPlaylist(playlistId: number) {
|
||||||
|
if (!selectedTrackForPlaylist) return;
|
||||||
|
|
||||||
|
// Get the current count of local tracks to determine position
|
||||||
|
const existingTracks = await invoke<LocalTrack[]>('playlist_get_local_tracks', { playlistId });
|
||||||
|
const position = existingTracks.length;
|
||||||
|
|
||||||
|
await invoke('playlist_add_local_track', {
|
||||||
|
playlistId,
|
||||||
|
localTrackId: selectedTrackForPlaylist.id,
|
||||||
|
position
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function openPlaylistPicker(track: LocalTrack) {
|
||||||
|
selectedTrackForPlaylist = track;
|
||||||
|
showPlaylistModal = true;
|
||||||
|
}
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
loadLibraryData();
|
loadLibraryData();
|
||||||
loadFolders();
|
loadFolders();
|
||||||
@@ -466,7 +490,8 @@
|
|||||||
menuActions={{
|
menuActions={{
|
||||||
onPlayNow: () => handleTrackPlay(track),
|
onPlayNow: () => handleTrackPlay(track),
|
||||||
onPlayNext: onTrackPlayNext ? () => onTrackPlayNext(track) : undefined,
|
onPlayNext: onTrackPlayNext ? () => onTrackPlayNext(track) : undefined,
|
||||||
onPlayLater: onTrackPlayLater ? () => onTrackPlayLater(track) : undefined
|
onPlayLater: onTrackPlayLater ? () => onTrackPlayLater(track) : undefined,
|
||||||
|
onAddToPlaylist: () => openPlaylistPicker(track)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -677,7 +702,8 @@
|
|||||||
menuActions={{
|
menuActions={{
|
||||||
onPlayNow: () => handleTrackPlay(track),
|
onPlayNow: () => handleTrackPlay(track),
|
||||||
onPlayNext: onTrackPlayNext ? () => onTrackPlayNext(track) : undefined,
|
onPlayNext: onTrackPlayNext ? () => onTrackPlayNext(track) : undefined,
|
||||||
onPlayLater: onTrackPlayLater ? () => onTrackPlayLater(track) : undefined
|
onPlayLater: onTrackPlayLater ? () => onTrackPlayLater(track) : undefined,
|
||||||
|
onAddToPlaylist: () => openPlaylistPicker(track)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -688,6 +714,14 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Add to Playlist Modal -->
|
||||||
|
<AddToPlaylistModal
|
||||||
|
isOpen={showPlaylistModal}
|
||||||
|
onClose={() => { showPlaylistModal = false; selectedTrackForPlaylist = null; }}
|
||||||
|
onSelect={handleAddToPlaylist}
|
||||||
|
trackTitle={selectedTrackForPlaylist?.title}
|
||||||
|
/>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.library-view {
|
.library-view {
|
||||||
padding: 24px;
|
padding: 24px;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { ArrowLeft, Play, Shuffle, Plus, ListMusic, Search, X, ChevronDown, ImagePlus } from 'lucide-svelte';
|
import { ArrowLeft, Play, Shuffle, Plus, ListMusic, Search, X, ChevronDown, ImagePlus, HardDrive, Info } from 'lucide-svelte';
|
||||||
import { invoke } from '@tauri-apps/api/core';
|
import { invoke } from '@tauri-apps/api/core';
|
||||||
import { open } from '@tauri-apps/plugin-dialog';
|
import { open } from '@tauri-apps/plugin-dialog';
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
@@ -46,6 +46,23 @@
|
|||||||
bitDepth?: number;
|
bitDepth?: number;
|
||||||
samplingRate?: number;
|
samplingRate?: number;
|
||||||
isrc?: string;
|
isrc?: string;
|
||||||
|
isLocal?: boolean;
|
||||||
|
localTrackId?: number;
|
||||||
|
artworkPath?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Local library track from backend
|
||||||
|
interface LocalLibraryTrack {
|
||||||
|
id: number;
|
||||||
|
file_path: string;
|
||||||
|
title: string;
|
||||||
|
artist: string;
|
||||||
|
album: string;
|
||||||
|
duration_secs: number;
|
||||||
|
format: string;
|
||||||
|
bit_depth?: number;
|
||||||
|
sample_rate: number;
|
||||||
|
artwork_path?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface PlaylistSettings {
|
interface PlaylistSettings {
|
||||||
@@ -76,6 +93,9 @@
|
|||||||
onTrackRemoveDownload?: (trackId: number) => void;
|
onTrackRemoveDownload?: (trackId: number) => void;
|
||||||
getTrackDownloadStatus?: (trackId: number) => { status: DownloadStatus; progress: number };
|
getTrackDownloadStatus?: (trackId: number) => { status: DownloadStatus; progress: number };
|
||||||
downloadStateVersion?: number;
|
downloadStateVersion?: number;
|
||||||
|
onLocalTrackPlay?: (track: LocalLibraryTrack) => void;
|
||||||
|
onLocalTrackPlayNext?: (track: LocalLibraryTrack) => void;
|
||||||
|
onLocalTrackPlayLater?: (track: LocalLibraryTrack) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
let {
|
let {
|
||||||
@@ -93,11 +113,17 @@
|
|||||||
onTrackDownload,
|
onTrackDownload,
|
||||||
onTrackRemoveDownload,
|
onTrackRemoveDownload,
|
||||||
getTrackDownloadStatus,
|
getTrackDownloadStatus,
|
||||||
downloadStateVersion
|
downloadStateVersion,
|
||||||
|
onLocalTrackPlay,
|
||||||
|
onLocalTrackPlayNext,
|
||||||
|
onLocalTrackPlayLater
|
||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
|
|
||||||
let playlist = $state<Playlist | null>(null);
|
let playlist = $state<Playlist | null>(null);
|
||||||
let tracks = $state<DisplayTrack[]>([]);
|
let tracks = $state<DisplayTrack[]>([]);
|
||||||
|
let localTracks = $state<LocalLibraryTrack[]>([]);
|
||||||
|
let localTracksMap = $state<Map<number, LocalLibraryTrack>>(new Map());
|
||||||
|
let hasLocalTracks = $derived(localTracks.length > 0);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
let error = $state<string | null>(null);
|
let error = $state<string | null>(null);
|
||||||
let playBtnHovered = $state(false);
|
let playBtnHovered = $state(false);
|
||||||
@@ -118,8 +144,20 @@
|
|||||||
loadPlaylist();
|
loadPlaylist();
|
||||||
loadSettings();
|
loadSettings();
|
||||||
loadFavorites();
|
loadFavorites();
|
||||||
|
loadLocalTracks();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
async function loadLocalTracks() {
|
||||||
|
try {
|
||||||
|
const result = await invoke<LocalLibraryTrack[]>('playlist_get_local_tracks', { playlistId });
|
||||||
|
localTracks = result;
|
||||||
|
// Create a map for quick lookup
|
||||||
|
localTracksMap = new Map(result.map(t => [t.id, t]));
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to load local tracks:', err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function loadFavorites() {
|
async function loadFavorites() {
|
||||||
try {
|
try {
|
||||||
const response = await invoke<FavoritesResponse>('get_favorites', {
|
const response = await invoke<FavoritesResponse>('get_favorites', {
|
||||||
@@ -217,9 +255,31 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Filtered and sorted tracks
|
// Convert local tracks to DisplayTrack format
|
||||||
|
function localTrackToDisplay(track: LocalLibraryTrack, index: number): DisplayTrack {
|
||||||
|
return {
|
||||||
|
id: -track.id, // Negative ID to distinguish from Qobuz tracks
|
||||||
|
number: index + 1,
|
||||||
|
title: track.title,
|
||||||
|
artist: track.artist,
|
||||||
|
album: track.album,
|
||||||
|
albumArt: track.artwork_path ? `asset://localhost/${encodeURIComponent(track.artwork_path)}` : undefined,
|
||||||
|
duration: formatDuration(track.duration_secs),
|
||||||
|
durationSeconds: track.duration_secs,
|
||||||
|
hires: (track.bit_depth && track.bit_depth >= 24) || track.sample_rate > 48000,
|
||||||
|
bitDepth: track.bit_depth,
|
||||||
|
samplingRate: track.sample_rate,
|
||||||
|
isLocal: true,
|
||||||
|
localTrackId: track.id,
|
||||||
|
artworkPath: track.artwork_path
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filtered and sorted tracks (merged Qobuz + local)
|
||||||
let displayTracks = $derived.by(() => {
|
let displayTracks = $derived.by(() => {
|
||||||
let result = [...tracks];
|
// Combine Qobuz tracks with local tracks
|
||||||
|
const localDisplayTracks = localTracks.map((t, idx) => localTrackToDisplay(t, tracks.length + idx));
|
||||||
|
let result = [...tracks, ...localDisplayTracks];
|
||||||
|
|
||||||
// Filter by search query
|
// Filter by search query
|
||||||
if (searchQuery.trim()) {
|
if (searchQuery.trim()) {
|
||||||
@@ -295,11 +355,49 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleTrackClick(track: DisplayTrack) {
|
function handleTrackClick(track: DisplayTrack) {
|
||||||
if (onTrackPlay) {
|
if (track.isLocal && track.localTrackId) {
|
||||||
|
// Handle local track play
|
||||||
|
const localTrack = localTracksMap.get(track.localTrackId);
|
||||||
|
if (localTrack && onLocalTrackPlay) {
|
||||||
|
onLocalTrackPlay(localTrack);
|
||||||
|
}
|
||||||
|
} else if (onTrackPlay) {
|
||||||
onTrackPlay(track);
|
onTrackPlay(track);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleTrackPlayNext(track: DisplayTrack) {
|
||||||
|
if (track.isLocal && track.localTrackId) {
|
||||||
|
const localTrack = localTracksMap.get(track.localTrackId);
|
||||||
|
if (localTrack && onLocalTrackPlayNext) {
|
||||||
|
onLocalTrackPlayNext(localTrack);
|
||||||
|
}
|
||||||
|
} else if (onTrackPlayNext) {
|
||||||
|
onTrackPlayNext(track);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleTrackPlayLater(track: DisplayTrack) {
|
||||||
|
if (track.isLocal && track.localTrackId) {
|
||||||
|
const localTrack = localTracksMap.get(track.localTrackId);
|
||||||
|
if (localTrack && onLocalTrackPlayLater) {
|
||||||
|
onLocalTrackPlayLater(localTrack);
|
||||||
|
}
|
||||||
|
} else if (onTrackPlayLater) {
|
||||||
|
onTrackPlayLater(track);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function removeLocalTrack(track: DisplayTrack) {
|
||||||
|
if (!track.localTrackId) return;
|
||||||
|
try {
|
||||||
|
await invoke('playlist_remove_local_track', { playlistId, localTrackId: track.localTrackId });
|
||||||
|
await loadLocalTracks(); // Refresh
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to remove local track:', err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function handlePlayAll() {
|
async function handlePlayAll() {
|
||||||
if (tracks.length > 0 && onTrackPlay) {
|
if (tracks.length > 0 && onTrackPlay) {
|
||||||
// Set queue with all tracks and play first
|
// Set queue with all tracks and play first
|
||||||
@@ -489,10 +587,21 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span class="track-count">
|
<span class="track-count">
|
||||||
{displayTracks.length}{searchQuery ? ` / ${tracks.length}` : ''} tracks
|
{displayTracks.length}{searchQuery ? ` / ${tracks.length + localTracks.length}` : ''} tracks
|
||||||
|
{#if hasLocalTracks}
|
||||||
|
<span class="local-count">({localTracks.length} local)</span>
|
||||||
|
{/if}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Local tracks notice -->
|
||||||
|
{#if hasLocalTracks}
|
||||||
|
<div class="local-notice">
|
||||||
|
<Info size={14} />
|
||||||
|
<span>Local tracks are only available on this device</span>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<!-- Track List -->
|
<!-- Track List -->
|
||||||
<div class="track-list">
|
<div class="track-list">
|
||||||
<div class="track-list-header">
|
<div class="track-list-header">
|
||||||
@@ -503,31 +612,44 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#each displayTracks as track, idx (`${track.id}-${downloadStateVersion}`)}
|
{#each displayTracks as track, idx (`${track.id}-${downloadStateVersion}`)}
|
||||||
{@const downloadInfo = getTrackDownloadStatus?.(track.id) ?? { status: 'none' as const, progress: 0 }}
|
{@const downloadInfo = track.isLocal ? { status: 'none' as const, progress: 0 } : (getTrackDownloadStatus?.(track.id) ?? { status: 'none' as const, progress: 0 })}
|
||||||
<TrackRow
|
<div class="track-row-wrapper" class:is-local={track.isLocal}>
|
||||||
number={idx + 1}
|
{#if track.isLocal}
|
||||||
title={track.title}
|
<div class="local-indicator" title="Local track">
|
||||||
artist={track.artist}
|
<HardDrive size={12} />
|
||||||
duration={track.duration}
|
</div>
|
||||||
quality={track.hires ? 'Hi-Res' : undefined}
|
{/if}
|
||||||
isFavorite={favoriteTrackIds.has(track.id)}
|
<TrackRow
|
||||||
downloadStatus={downloadInfo.status}
|
number={idx + 1}
|
||||||
downloadProgress={downloadInfo.progress}
|
title={track.title}
|
||||||
onPlay={() => handleTrackClick(track)}
|
artist={track.artist}
|
||||||
onDownload={onTrackDownload ? () => onTrackDownload(track) : undefined}
|
duration={track.duration}
|
||||||
onRemoveDownload={onTrackRemoveDownload ? () => onTrackRemoveDownload(track.id) : undefined}
|
quality={track.hires ? 'Hi-Res' : undefined}
|
||||||
menuActions={{
|
isFavorite={!track.isLocal && favoriteTrackIds.has(track.id)}
|
||||||
onPlayNow: () => handleTrackClick(track),
|
hideDownload={track.isLocal}
|
||||||
onPlayNext: onTrackPlayNext ? () => onTrackPlayNext(track) : undefined,
|
downloadStatus={downloadInfo.status}
|
||||||
onPlayLater: onTrackPlayLater ? () => onTrackPlayLater(track) : undefined,
|
downloadProgress={downloadInfo.progress}
|
||||||
onAddFavorite: onTrackAddFavorite ? () => onTrackAddFavorite(track.id) : undefined,
|
onPlay={() => handleTrackClick(track)}
|
||||||
onAddToPlaylist: onTrackAddToPlaylist ? () => onTrackAddToPlaylist(track.id) : undefined,
|
onDownload={!track.isLocal && onTrackDownload ? () => onTrackDownload(track) : undefined}
|
||||||
onShareQobuz: onTrackShareQobuz ? () => onTrackShareQobuz(track.id) : undefined,
|
onRemoveDownload={!track.isLocal && onTrackRemoveDownload ? () => onTrackRemoveDownload(track.id) : undefined}
|
||||||
onShareSonglink: onTrackShareSonglink ? () => onTrackShareSonglink(track) : undefined,
|
menuActions={{
|
||||||
onGoToAlbum: track.albumId && onTrackGoToAlbum ? () => onTrackGoToAlbum(track.albumId) : undefined,
|
onPlayNow: () => handleTrackClick(track),
|
||||||
onGoToArtist: track.artistId && onTrackGoToArtist ? () => onTrackGoToArtist(track.artistId) : undefined
|
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,
|
||||||
|
onGoToAlbum: !track.isLocal && track.albumId && onTrackGoToAlbum ? () => onTrackGoToAlbum(track.albumId) : undefined,
|
||||||
|
onGoToArtist: !track.isLocal && track.artistId && onTrackGoToArtist ? () => onTrackGoToArtist(track.artistId) : undefined
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{#if track.isLocal}
|
||||||
|
<button class="remove-local-btn" onclick={() => removeLocalTrack(track)} title="Remove from playlist">
|
||||||
|
<X size={14} />
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
|
|
||||||
{#if displayTracks.length === 0 && searchQuery}
|
{#if displayTracks.length === 0 && searchQuery}
|
||||||
@@ -958,4 +1080,76 @@
|
|||||||
.no-results p {
|
.no-results p {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Local tracks styles */
|
||||||
|
.local-count {
|
||||||
|
color: var(--accent-primary);
|
||||||
|
margin-left: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.local-notice {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 10px 16px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
background-color: rgba(var(--accent-primary-rgb, 139, 92, 246), 0.1);
|
||||||
|
border: 1px solid rgba(var(--accent-primary-rgb, 139, 92, 246), 0.2);
|
||||||
|
border-radius: 8px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.local-notice :global(svg) {
|
||||||
|
color: var(--accent-primary);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-row-wrapper {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-row-wrapper.is-local {
|
||||||
|
padding-left: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-row-wrapper :global(.track-row) {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.local-indicator {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 20px;
|
||||||
|
color: var(--accent-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.remove-local-btn {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 28px;
|
||||||
|
height: 28px;
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: var(--text-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: 4px;
|
||||||
|
opacity: 0;
|
||||||
|
transition: all 150ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-row-wrapper:hover .remove-local-btn {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.remove-local-btn:hover {
|
||||||
|
color: #ff6b6b;
|
||||||
|
background-color: rgba(255, 107, 107, 0.1);
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -1656,6 +1656,9 @@
|
|||||||
onTrackRemoveDownload={handleTrackRemoveDownload}
|
onTrackRemoveDownload={handleTrackRemoveDownload}
|
||||||
getTrackDownloadStatus={getTrackDownloadStatus}
|
getTrackDownloadStatus={getTrackDownloadStatus}
|
||||||
{downloadStateVersion}
|
{downloadStateVersion}
|
||||||
|
onLocalTrackPlay={handleLocalTrackPlay}
|
||||||
|
onLocalTrackPlayNext={handleLocalTrackPlayNext}
|
||||||
|
onLocalTrackPlayLater={handleLocalTrackPlayLater}
|
||||||
/>
|
/>
|
||||||
{:else if activeView === 'favorites'}
|
{:else if activeView === 'favorites'}
|
||||||
<FavoritesView
|
<FavoritesView
|
||||||
|
|||||||
Reference in new issue
Block a user