refactor(playlists): unify track row appearance and add remove option
- Move local track indicator from quality column to favorite button position for consistent row alignment with Qobuz tracks - Remove explicit delete button from playlist track rows (was easy to accidentally click) - Add "Remove from playlist" option to TrackMenu for all tracks (local and Qobuz) - Qobuz track removal uses playlist_track_id from API response - Clean up unused CSS and imports from PlaylistDetailView cc
This commit is contained in:
1 parent
3915abd3bb
commit
d731805eca
3 files changed
+55
-73
No files matched your search
@@ -11,7 +11,8 @@
|
|||||||
Share2,
|
Share2,
|
||||||
Disc3,
|
Disc3,
|
||||||
User,
|
User,
|
||||||
Link
|
Link,
|
||||||
|
Trash2
|
||||||
} from 'lucide-svelte';
|
} from 'lucide-svelte';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -20,6 +21,7 @@
|
|||||||
onPlayLater?: () => void;
|
onPlayLater?: () => void;
|
||||||
onAddFavorite?: () => void;
|
onAddFavorite?: () => void;
|
||||||
onAddToPlaylist?: () => void;
|
onAddToPlaylist?: () => void;
|
||||||
|
onRemoveFromPlaylist?: () => void;
|
||||||
onShareQobuz?: () => void;
|
onShareQobuz?: () => void;
|
||||||
onShareSonglink?: () => void;
|
onShareSonglink?: () => void;
|
||||||
onGoToAlbum?: () => void;
|
onGoToAlbum?: () => void;
|
||||||
@@ -32,6 +34,7 @@
|
|||||||
onPlayLater,
|
onPlayLater,
|
||||||
onAddFavorite,
|
onAddFavorite,
|
||||||
onAddToPlaylist,
|
onAddToPlaylist,
|
||||||
|
onRemoveFromPlaylist,
|
||||||
onShareQobuz,
|
onShareQobuz,
|
||||||
onShareSonglink,
|
onShareSonglink,
|
||||||
onGoToAlbum,
|
onGoToAlbum,
|
||||||
@@ -49,7 +52,7 @@
|
|||||||
let submenuStyle = $state('');
|
let submenuStyle = $state('');
|
||||||
|
|
||||||
const hasPlayback = $derived(!!(onPlayNow || onPlayNext || onPlayLater));
|
const hasPlayback = $derived(!!(onPlayNow || onPlayNext || onPlayLater));
|
||||||
const hasLibrary = $derived(!!(onAddFavorite || onAddToPlaylist));
|
const hasLibrary = $derived(!!(onAddFavorite || onAddToPlaylist || onRemoveFromPlaylist));
|
||||||
const hasShare = $derived(!!(onShareQobuz || onShareSonglink));
|
const hasShare = $derived(!!(onShareQobuz || onShareSonglink));
|
||||||
const hasNav = $derived(!!(onGoToAlbum || onGoToArtist));
|
const hasNav = $derived(!!(onGoToAlbum || onGoToArtist));
|
||||||
const hasMenu = $derived(hasPlayback || hasLibrary || hasShare || hasNav);
|
const hasMenu = $derived(hasPlayback || hasLibrary || hasShare || hasNav);
|
||||||
@@ -205,6 +208,12 @@
|
|||||||
<span>Add to playlist</span>
|
<span>Add to playlist</span>
|
||||||
</button>
|
</button>
|
||||||
{/if}
|
{/if}
|
||||||
|
{#if onRemoveFromPlaylist}
|
||||||
|
<button class="menu-item danger" onclick={() => handleAction(onRemoveFromPlaylist)}>
|
||||||
|
<Trash2 size={14} />
|
||||||
|
<span>Remove from playlist</span>
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if hasLibrary && (hasShare || hasNav)}
|
{#if hasLibrary && (hasShare || hasNav)}
|
||||||
@@ -333,6 +342,15 @@
|
|||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.menu-item.danger {
|
||||||
|
color: #ef4444;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-item.danger:hover {
|
||||||
|
background-color: rgba(239, 68, 68, 0.1);
|
||||||
|
color: #ef4444;
|
||||||
|
}
|
||||||
|
|
||||||
.separator {
|
.separator {
|
||||||
height: 1px;
|
height: 1px;
|
||||||
background-color: var(--bg-hover);
|
background-color: var(--bg-hover);
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
onPlayNext?: () => void;
|
onPlayNext?: () => void;
|
||||||
onPlayLater?: () => void;
|
onPlayLater?: () => void;
|
||||||
onAddToPlaylist?: () => void;
|
onAddToPlaylist?: () => void;
|
||||||
|
onRemoveFromPlaylist?: () => void;
|
||||||
onShareQobuz?: () => void;
|
onShareQobuz?: () => void;
|
||||||
onShareSonglink?: () => void;
|
onShareSonglink?: () => void;
|
||||||
onGoToAlbum?: () => void;
|
onGoToAlbum?: () => void;
|
||||||
@@ -176,17 +177,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">
|
<div class="track-quality">{quality ?? ''}</div>
|
||||||
{#if isLocal}
|
|
||||||
<span class="local-icon" title="Local library track">
|
|
||||||
<HardDrive size={12} />
|
|
||||||
</span>
|
|
||||||
{/if}
|
|
||||||
{quality ?? ''}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Favorite Button -->
|
<!-- Favorite Button / Local Indicator -->
|
||||||
{#if !hideFavorite}
|
{#if isLocal}
|
||||||
|
<div class="local-indicator" title="Local library track">
|
||||||
|
<HardDrive size={14} />
|
||||||
|
</div>
|
||||||
|
{:else if !hideFavorite}
|
||||||
<button
|
<button
|
||||||
class="favorite-btn"
|
class="favorite-btn"
|
||||||
class:is-favorite={isFavorite}
|
class:is-favorite={isFavorite}
|
||||||
@@ -221,6 +219,7 @@
|
|||||||
onPlayLater={menuActions?.onPlayLater}
|
onPlayLater={menuActions?.onPlayLater}
|
||||||
onAddFavorite={trackId !== undefined ? () => toggleTrackFavorite(trackId) : undefined}
|
onAddFavorite={trackId !== undefined ? () => toggleTrackFavorite(trackId) : undefined}
|
||||||
onAddToPlaylist={menuActions?.onAddToPlaylist}
|
onAddToPlaylist={menuActions?.onAddToPlaylist}
|
||||||
|
onRemoveFromPlaylist={menuActions?.onRemoveFromPlaylist}
|
||||||
onShareQobuz={menuActions?.onShareQobuz}
|
onShareQobuz={menuActions?.onShareQobuz}
|
||||||
onShareSonglink={menuActions?.onShareSonglink}
|
onShareSonglink={menuActions?.onShareSonglink}
|
||||||
onGoToAlbum={menuActions?.onGoToAlbum}
|
onGoToAlbum={menuActions?.onGoToAlbum}
|
||||||
@@ -391,21 +390,20 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.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 {
|
.local-indicator {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 28px;
|
||||||
|
height: 28px;
|
||||||
color: var(--text-muted);
|
color: var(--text-muted);
|
||||||
opacity: 0.7;
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
.favorite-btn {
|
.favorite-btn {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { ArrowLeft, Play, Shuffle, ListMusic, Search, X, ChevronDown, ChevronRight, ImagePlus, HardDrive, Info, Edit3, BarChart2, WifiOff } from 'lucide-svelte';
|
import { ArrowLeft, Play, Shuffle, ListMusic, Search, X, ChevronDown, ChevronRight, ImagePlus, Info, Edit3, BarChart2, WifiOff } from 'lucide-svelte';
|
||||||
import AlbumMenu from '../AlbumMenu.svelte';
|
import AlbumMenu from '../AlbumMenu.svelte';
|
||||||
import PlaylistCollage from '../PlaylistCollage.svelte';
|
import PlaylistCollage from '../PlaylistCollage.svelte';
|
||||||
import PlaylistModal from '../PlaylistModal.svelte';
|
import PlaylistModal from '../PlaylistModal.svelte';
|
||||||
@@ -27,6 +27,7 @@
|
|||||||
maximum_bit_depth?: number;
|
maximum_bit_depth?: number;
|
||||||
maximum_sampling_rate?: number;
|
maximum_sampling_rate?: number;
|
||||||
isrc?: string;
|
isrc?: string;
|
||||||
|
playlist_track_id?: number; // Qobuz playlist-specific ID for removal
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Playlist {
|
interface Playlist {
|
||||||
@@ -59,6 +60,7 @@
|
|||||||
isLocal?: boolean;
|
isLocal?: boolean;
|
||||||
localTrackId?: number;
|
localTrackId?: number;
|
||||||
artworkPath?: string;
|
artworkPath?: string;
|
||||||
|
playlistTrackId?: number; // Qobuz playlist-specific ID for removal
|
||||||
}
|
}
|
||||||
|
|
||||||
// Local library track from backend
|
// Local library track from backend
|
||||||
@@ -262,6 +264,7 @@
|
|||||||
bitDepth: t.maximum_bit_depth,
|
bitDepth: t.maximum_bit_depth,
|
||||||
samplingRate: t.maximum_sampling_rate,
|
samplingRate: t.maximum_sampling_rate,
|
||||||
isrc: t.isrc,
|
isrc: t.isrc,
|
||||||
|
playlistTrackId: t.playlist_track_id,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -471,13 +474,22 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function removeLocalTrack(track: DisplayTrack) {
|
async function removeTrackFromPlaylist(track: DisplayTrack) {
|
||||||
if (!track.localTrackId) return;
|
|
||||||
try {
|
try {
|
||||||
await invoke('playlist_remove_local_track', { playlistId, localTrackId: track.localTrackId });
|
if (track.isLocal && track.localTrackId) {
|
||||||
await loadLocalTracks(); // Refresh
|
// Remove local track
|
||||||
|
await invoke('playlist_remove_local_track', { playlistId, localTrackId: track.localTrackId });
|
||||||
|
await loadLocalTracks();
|
||||||
|
} else if (track.playlistTrackId) {
|
||||||
|
// Remove Qobuz track using playlist_track_id
|
||||||
|
await invoke('remove_tracks_from_playlist', {
|
||||||
|
playlistId,
|
||||||
|
playlistTrackIds: [track.playlistTrackId]
|
||||||
|
});
|
||||||
|
await loadPlaylist();
|
||||||
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to remove local track:', err);
|
console.error('Failed to remove track from playlist:', err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -784,15 +796,10 @@
|
|||||||
{@const available = isTrackAvailable(track)}
|
{@const available = isTrackAvailable(track)}
|
||||||
<div
|
<div
|
||||||
class="track-row-wrapper"
|
class="track-row-wrapper"
|
||||||
class:is-local={track.isLocal}
|
|
||||||
class:unavailable={!available}
|
class:unavailable={!available}
|
||||||
title={!available ? $t('offline.trackNotAvailable') : undefined}
|
title={!available ? $t('offline.trackNotAvailable') : undefined}
|
||||||
>
|
>
|
||||||
{#if track.isLocal}
|
{#if !available && !track.isLocal}
|
||||||
<div class="local-indicator" title="Local track">
|
|
||||||
<HardDrive size={12} />
|
|
||||||
</div>
|
|
||||||
{:else if !available}
|
|
||||||
<div class="unavailable-indicator" title={$t('offline.trackNotAvailable')}>
|
<div class="unavailable-indicator" title={$t('offline.trackNotAvailable')}>
|
||||||
<WifiOff size={12} />
|
<WifiOff size={12} />
|
||||||
</div>
|
</div>
|
||||||
@@ -810,6 +817,7 @@
|
|||||||
? 'Hi-Res'
|
? 'Hi-Res'
|
||||||
: '-'}
|
: '-'}
|
||||||
isPlaying={isActiveTrack}
|
isPlaying={isActiveTrack}
|
||||||
|
isLocal={track.isLocal}
|
||||||
hideFavorite={track.isLocal || !available}
|
hideFavorite={track.isLocal || !available}
|
||||||
hideDownload={track.isLocal || !available}
|
hideDownload={track.isLocal || !available}
|
||||||
downloadStatus={downloadInfo.status}
|
downloadStatus={downloadInfo.status}
|
||||||
@@ -822,17 +830,13 @@
|
|||||||
onPlayNext: track.isLocal ? () => handleTrackPlayNext(track) : (onTrackPlayNext ? () => onTrackPlayNext(track) : undefined),
|
onPlayNext: track.isLocal ? () => handleTrackPlayNext(track) : (onTrackPlayNext ? () => onTrackPlayNext(track) : undefined),
|
||||||
onPlayLater: track.isLocal ? () => handleTrackPlayLater(track) : (onTrackPlayLater ? () => onTrackPlayLater(track) : undefined),
|
onPlayLater: track.isLocal ? () => handleTrackPlayLater(track) : (onTrackPlayLater ? () => onTrackPlayLater(track) : undefined),
|
||||||
onAddToPlaylist: !track.isLocal && onTrackAddToPlaylist ? () => onTrackAddToPlaylist(track.id) : undefined,
|
onAddToPlaylist: !track.isLocal && onTrackAddToPlaylist ? () => onTrackAddToPlaylist(track.id) : undefined,
|
||||||
|
onRemoveFromPlaylist: () => removeTrackFromPlaylist(track),
|
||||||
onShareQobuz: !track.isLocal && onTrackShareQobuz ? () => onTrackShareQobuz(track.id) : undefined,
|
onShareQobuz: !track.isLocal && onTrackShareQobuz ? () => onTrackShareQobuz(track.id) : undefined,
|
||||||
onShareSonglink: !track.isLocal && onTrackShareSonglink ? () => onTrackShareSonglink(track) : undefined,
|
onShareSonglink: !track.isLocal && onTrackShareSonglink ? () => onTrackShareSonglink(track) : undefined,
|
||||||
onGoToAlbum: !track.isLocal && track.albumId && onTrackGoToAlbum ? () => onTrackGoToAlbum(track.albumId!) : undefined,
|
onGoToAlbum: !track.isLocal && track.albumId && onTrackGoToAlbum ? () => onTrackGoToAlbum(track.albumId!) : undefined,
|
||||||
onGoToArtist: !track.isLocal && track.artistId && onTrackGoToArtist ? () => onTrackGoToArtist(track.artistId!) : 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>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
|
|
||||||
@@ -1387,24 +1391,10 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.track-row-wrapper.is-local {
|
|
||||||
padding-left: 24px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.track-row-wrapper :global(.track-row) {
|
.track-row-wrapper :global(.track-row) {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.local-indicator {
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 20px;
|
|
||||||
color: var(--accent-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Unavailable track styles (offline mode) */
|
/* Unavailable track styles (offline mode) */
|
||||||
.track-row-wrapper.unavailable {
|
.track-row-wrapper.unavailable {
|
||||||
padding-left: 24px;
|
padding-left: 24px;
|
||||||
@@ -1427,28 +1417,4 @@
|
|||||||
color: var(--text-muted);
|
color: var(--text-muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
.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>
|
||||||
Reference in new issue
Block a user