feat(playlists): include local tracks in counts everywhere

- Add playlist_get_all_local_track_counts command to get local track
  counts for all playlists efficiently
- PlaylistDetailView: show combined track count and duration in header,
  style local count with muted color, remove redundant count below
- Sidebar: load and display local track counts in tooltips
- PlaylistModal: show combined counts when selecting playlist to add to
- PlaylistManagerView: show combined counts in both grid and list views
- TrackRow: move local indicator to download column position, add
  placeholder for favorite column to maintain alignment, update tooltip
- Remove local tracks notice banner (info now in tooltip)

cc
This commit is contained in:
vicrodh committed 2026-01-16 06:32:13 -06:00
1 parent d731805eca
commit 5f4cfa5888
8 files changed
+174 -61

No files matched your search

+2
View File
@@ -387,6 +387,7 @@ pub fn run() {
library::commands::playlist_add_local_track, library::commands::playlist_add_local_track,
library::commands::playlist_remove_local_track, library::commands::playlist_remove_local_track,
library::commands::playlist_get_local_tracks, library::commands::playlist_get_local_tracks,
library::commands::playlist_get_all_local_track_counts,
library::commands::playlist_clear_local_tracks, library::commands::playlist_clear_local_tracks,
// Playlist management commands // Playlist management commands
library::commands::playlist_get_all_settings, library::commands::playlist_get_all_settings,
@@ -478,6 +479,7 @@ pub fn run() {
download_cache::commands::move_downloads_to_path, download_cache::commands::move_downloads_to_path,
download_cache::commands::detect_legacy_downloads, download_cache::commands::detect_legacy_downloads,
download_cache::commands::start_legacy_migration, download_cache::commands::start_legacy_migration,
download_cache::commands::sync_downloads_to_library,
// Lyrics commands // Lyrics commands
lyrics::commands::lyrics_get, lyrics::commands::lyrics_get,
lyrics::commands::lyrics_clear_cache, lyrics::commands::lyrics_clear_cache,
+12
View File
@@ -1031,6 +1031,18 @@ pub async fn playlist_get_local_tracks(
.map_err(|e| e.to_string()) .map_err(|e| e.to_string())
} }
/// Get local track counts for all playlists
#[tauri::command]
pub async fn playlist_get_all_local_track_counts(
state: State<'_, LibraryState>,
) -> Result<std::collections::HashMap<u64, u32>, String> {
log::info!("Command: playlist_get_all_local_track_counts");
let db = state.db.lock().await;
db.get_all_playlist_local_track_counts()
.map_err(|e| e.to_string())
}
/// Clear all local tracks from a playlist /// Clear all local tracks from a playlist
#[tauri::command] #[tauri::command]
pub async fn playlist_clear_local_tracks( pub async fn playlist_clear_local_tracks(
+43 -3
View File
@@ -1561,6 +1561,29 @@ impl LibraryDatabase {
Ok(count) Ok(count)
} }
/// Get local track counts for all playlists
pub fn get_all_playlist_local_track_counts(&self) -> Result<std::collections::HashMap<u64, u32>, LibraryError> {
let mut stmt = self.conn.prepare(
"SELECT qobuz_playlist_id, COUNT(*) as count
FROM playlist_local_tracks
GROUP BY qobuz_playlist_id"
).map_err(|e| LibraryError::Database(format!("Failed to prepare query: {}", e)))?;
let rows = stmt.query_map([], |row| {
let playlist_id: i64 = row.get(0)?;
let count: u32 = row.get(1)?;
Ok((playlist_id as u64, count))
}).map_err(|e| LibraryError::Database(format!("Failed to query: {}", e)))?;
let mut result = std::collections::HashMap::new();
for row in rows {
let (playlist_id, count) = row.map_err(|e| LibraryError::Database(format!("Failed to read row: {}", e)))?;
result.insert(playlist_id, count);
}
Ok(result)
}
/// Update position of a local track in a playlist /// Update position of a local track in a playlist
pub fn update_local_track_position(&self, qobuz_playlist_id: u64, local_track_id: i64, new_position: i32) -> Result<(), LibraryError> { pub fn update_local_track_position(&self, qobuz_playlist_id: u64, local_track_id: i64, new_position: i32) -> Result<(), LibraryError> {
self.conn.execute( self.conn.execute(
@@ -1664,29 +1687,46 @@ impl LibraryDatabase {
bit_depth: Option<u32>, bit_depth: Option<u32>,
sample_rate: Option<f64>, sample_rate: Option<f64>,
) -> Result<(), LibraryError> { ) -> Result<(), LibraryError> {
use std::time::SystemTime;
// Get file size if file exists
let file_size_bytes = std::fs::metadata(file_path)
.map(|m| m.len() as i64)
.unwrap_or(0);
// Get current timestamp
let now = SystemTime::now()
.duration_since(SystemTime::UNIX_EPOCH)
.unwrap()
.as_secs() as i64;
self.conn.execute( self.conn.execute(
r#" r#"
INSERT INTO local_tracks ( INSERT INTO local_tracks (
file_path, title, artist, album, album_artist, file_path, title, artist, album, album_artist,
track_number, disc_number, year, duration_secs, track_number, disc_number, year, duration_secs,
format, bit_depth, sample_rate, channels, format, bit_depth, sample_rate, channels,
file_size_bytes, last_modified, indexed_at,
source, qobuz_track_id source, qobuz_track_id
) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, 'qobuz_download', ?14) ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, 'qobuz_download', ?17)
"#, "#,
params![ params![
file_path, file_path,
title, title,
artist, artist,
album.unwrap_or("Unknown Album"), album.unwrap_or("Unknown Album"),
album.unwrap_or("Unknown Album"), // Use album as album_artist artist, // Use artist as album_artist for proper grouping
0, // track_number - will be updated if metadata is available 0, // track_number - will be updated if metadata is available
None::<u32>, // disc_number None::<u32>, // disc_number
None::<u32>, // year None::<u32>, // year
duration_secs as i64, duration_secs as i64,
"flac", // Default format for downloads "flac", // Default format for downloads
bit_depth.map(|v| v as i64), bit_depth.map(|v| v as i64),
sample_rate, sample_rate.map(|v| v as i64).unwrap_or(44100),
2, // Assume stereo 2, // Assume stereo
file_size_bytes,
now,
now,
track_id as i64, track_id as i64,
], ],
) )
+25 -1
View File
@@ -43,8 +43,31 @@
let selectedPlaylistId = $state<number | null>(null); let selectedPlaylistId = $state<number | null>(null);
let loading = $state(false); let loading = $state(false);
let error = $state<string | null>(null); let error = $state<string | null>(null);
// Local track counts for playlists
let localTrackCounts = $state<Map<number, number>>(new Map());
let showDeleteConfirm = $state(false); let showDeleteConfirm = $state(false);
// Load local track counts
async function loadLocalTrackCounts() {
try {
const counts = await invoke<Record<string, number>>('playlist_get_all_local_track_counts');
const map = new Map<number, number>();
for (const [id, count] of Object.entries(counts)) {
map.set(Number(id), count);
}
localTrackCounts = map;
} catch (err) {
console.debug('Failed to load local track counts:', err);
}
}
// Get total track count for a playlist
function getTotalTrackCount(pl: Playlist): number {
const localCount = localTrackCounts.get(pl.id) ?? 0;
return pl.tracks_count + localCount;
}
// Reset form when modal opens // Reset form when modal opens
$effect(() => { $effect(() => {
if (isOpen) { if (isOpen) {
@@ -63,6 +86,7 @@
hidden = false; hidden = false;
} else if (mode === 'addTrack') { } else if (mode === 'addTrack') {
selectedPlaylistId = null; selectedPlaylistId = null;
loadLocalTrackCounts();
} }
} }
}); });
@@ -298,7 +322,7 @@
<option value={null}>Select a playlist...</option> <option value={null}>Select a playlist...</option>
<option value={-1}>+ Create new playlist</option> <option value={-1}>+ Create new playlist</option>
{#each userPlaylists as pl (pl.id)} {#each userPlaylists as pl (pl.id)}
<option value={pl.id}>{pl.name} ({pl.tracks_count} tracks)</option> <option value={pl.id}>{pl.name} ({getTotalTrackCount(pl)} tracks)</option>
{/each} {/each}
</select> </select>
</div> </div>
+40 -4
View File
@@ -66,6 +66,7 @@
let userPlaylists = $state<Playlist[]>([]); let userPlaylists = $state<Playlist[]>([]);
let playlistSettings = $state<Map<number, PlaylistSettings>>(new Map()); let playlistSettings = $state<Map<number, PlaylistSettings>>(new Map());
let localTrackCounts = $state<Map<number, number>>(new Map());
let playlistsLoading = $state(false); let playlistsLoading = $state(false);
let playlistsCollapsed = $state(false); let playlistsCollapsed = $state(false);
let localLibraryCollapsed = $state(false); let localLibraryCollapsed = $state(false);
@@ -110,6 +111,12 @@
const playlistTooltipCache = new Map<number, string>(); const playlistTooltipCache = new Map<number, string>();
const tooltipLoadingIds = new Set<number>(); const tooltipLoadingIds = new Set<number>();
// Get total track count including local tracks
function getTotalTrackCount(playlist: Playlist): number {
const localCount = localTrackCounts.get(playlist.id) ?? 0;
return playlist.tracks_count + localCount;
}
// Fetch playlist artists for tooltip // Fetch playlist artists for tooltip
async function fetchPlaylistArtists(playlistId: number, trackCount: number): Promise<string> { async function fetchPlaylistArtists(playlistId: number, trackCount: number): Promise<string> {
interface PlaylistDetails { interface PlaylistDetails {
@@ -152,8 +159,13 @@
const cached = playlistTooltipCache.get(playlist.id); const cached = playlistTooltipCache.get(playlist.id);
if (cached) return cached; if (cached) return cached;
// Return basic tooltip - fetch will happen on hover // Return basic tooltip with combined count
return `${playlist.tracks_count} ${playlist.tracks_count === 1 ? 'Song' : 'Songs'}`; const totalCount = getTotalTrackCount(playlist);
const localCount = localTrackCounts.get(playlist.id) ?? 0;
const countText = localCount > 0
? `${totalCount} Songs (${localCount} local)`
: `${totalCount} ${totalCount === 1 ? 'Song' : 'Songs'}`;
return countText;
} }
// Load artist info for tooltip (called on hover, not during render) // Load artist info for tooltip (called on hover, not during render)
@@ -162,8 +174,14 @@
tooltipLoadingIds.add(playlist.id); tooltipLoadingIds.add(playlist.id);
fetchPlaylistArtists(playlist.id, playlist.tracks_count).then(tooltip => { const totalCount = getTotalTrackCount(playlist);
playlistTooltipCache.set(playlist.id, tooltip); const localCount = localTrackCounts.get(playlist.id) ?? 0;
fetchPlaylistArtists(playlist.id, totalCount).then(tooltip => {
// Append local count info if there are local tracks
const finalTooltip = localCount > 0
? tooltip.replace(/(\d+) (Song|Songs)/, `$1 $2 (${localCount} local)`)
: tooltip;
playlistTooltipCache.set(playlist.id, finalTooltip);
tooltipLoadingIds.delete(playlist.id); tooltipLoadingIds.delete(playlist.id);
}); });
} }
@@ -246,6 +264,10 @@
loadPlaylistSettings(); loadPlaylistSettings();
} }
export function refreshLocalTrackCounts() {
loadLocalTrackCounts();
}
// Menu handling functions // Menu handling functions
function closeMenu() { function closeMenu() {
menuOpen = false; menuOpen = false;
@@ -349,6 +371,7 @@
loadSortPreference(); loadSortPreference();
loadUserPlaylists(); loadUserPlaylists();
loadPlaylistSettings(); loadPlaylistSettings();
loadLocalTrackCounts();
// Subscribe to offline state changes // Subscribe to offline state changes
const unsubscribeOffline = subscribeOffline(() => { const unsubscribeOffline = subscribeOffline(() => {
@@ -387,6 +410,19 @@
} }
} }
async function loadLocalTrackCounts() {
try {
const counts = await invoke<Record<string, number>>('playlist_get_all_local_track_counts');
const map = new Map<number, number>();
for (const [id, count] of Object.entries(counts)) {
map.set(Number(id), count);
}
localTrackCounts = map;
} catch (err) {
console.debug('Failed to load local track counts:', err);
}
}
function handleViewChange(view: string) { function handleViewChange(view: string) {
onNavigate(view); onNavigate(view);
} }
+13 -6
View File
@@ -179,11 +179,9 @@
<!-- Quality (always render to maintain column alignment) --> <!-- Quality (always render to maintain column alignment) -->
<div class="track-quality">{quality ?? ''}</div> <div class="track-quality">{quality ?? ''}</div>
<!-- Favorite Button / Local Indicator --> <!-- Favorite Button (placeholder for local tracks to maintain column width) -->
{#if isLocal} {#if isLocal}
<div class="local-indicator" title="Local library track"> <div class="favorite-placeholder"></div>
<HardDrive size={14} />
</div>
{:else if !hideFavorite} {:else if !hideFavorite}
<button <button
class="favorite-btn" class="favorite-btn"
@@ -199,8 +197,12 @@
</button> </button>
{/if} {/if}
<!-- Download Indicator --> <!-- Download Indicator / Local Indicator -->
{#if !hideDownload} {#if isLocal}
<div class="local-indicator" title="Local track - only available on this device">
<HardDrive size={14} />
</div>
{:else if !hideDownload}
<div class="download-indicator" class:has-download={downloadStatus !== 'none'}> <div class="download-indicator" class:has-download={downloadStatus !== 'none'}>
<DownloadButton <DownloadButton
status={downloadStatus} status={downloadStatus}
@@ -396,6 +398,11 @@
text-align: right; text-align: right;
} }
.favorite-placeholder {
width: 28px;
height: 28px;
}
.local-indicator { .local-indicator {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { ArrowLeft, Play, Shuffle, ListMusic, Search, X, ChevronDown, ChevronRight, ImagePlus, Info, Edit3, BarChart2, WifiOff } from 'lucide-svelte'; import { ArrowLeft, Play, Shuffle, ListMusic, Search, X, ChevronDown, ChevronRight, ImagePlus, 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';
@@ -152,6 +152,12 @@
let localTracks = $state<LocalLibraryTrack[]>([]); let localTracks = $state<LocalLibraryTrack[]>([]);
let localTracksMap = $state<Map<number, LocalLibraryTrack>>(new Map()); let localTracksMap = $state<Map<number, LocalLibraryTrack>>(new Map());
let hasLocalTracks = $derived(localTracks.length > 0); let hasLocalTracks = $derived(localTracks.length > 0);
// Total counts including local tracks
let totalTrackCount = $derived((playlist?.tracks_count ?? 0) + localTracks.length);
let localTracksDuration = $derived(localTracks.reduce((sum, t) => sum + t.duration_secs, 0));
let totalDuration = $derived((playlist?.duration ?? 0) + localTracksDuration);
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);
@@ -669,9 +675,9 @@
<div class="playlist-info"> <div class="playlist-info">
<span class="owner">{playlist.owner.name}</span> <span class="owner">{playlist.owner.name}</span>
<span class="separator">•</span> <span class="separator">•</span>
<span>{playlist.tracks_count} tracks</span> <span>{totalTrackCount} tracks{#if hasLocalTracks} <span class="local-count">({localTracks.length} local)</span>{/if}</span>
<span class="separator">•</span> <span class="separator">•</span>
<span>{formatTotalDuration(playlist.duration)}</span> <span>{formatTotalDuration(totalDuration)}</span>
{#if playlistStats && playlistStats.play_count > 0} {#if playlistStats && playlistStats.play_count > 0}
<span class="separator">•</span> <span class="separator">•</span>
<span class="play-count" title="Times played"> <span class="play-count" title="Times played">
@@ -761,22 +767,8 @@
{/if} {/if}
</div> </div>
<span class="track-count">
{displayTracks.length}{searchQuery ? ` / ${tracks.length + localTracks.length}` : ''} tracks
{#if hasLocalTracks}
<span class="local-count">({localTracks.length} local)</span>
{/if}
</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">
@@ -1345,12 +1337,6 @@
margin: 4px 0; margin: 4px 0;
} }
.track-count {
margin-left: auto;
font-size: 13px;
color: var(--text-muted);
}
.no-results { .no-results {
padding: 48px; padding: 48px;
text-align: center; text-align: center;
@@ -1361,29 +1347,11 @@
margin: 0; margin: 0;
} }
/* Local tracks styles */
.local-count { .local-count {
color: var(--accent-primary); color: var(--text-muted);
margin-left: 4px; font-size: 0.9em;
} }
.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 { .track-row-wrapper {
display: flex; display: flex;
@@ -51,6 +51,7 @@
let playlists = $state<Playlist[]>([]); let playlists = $state<Playlist[]>([]);
let playlistSettings = $state<Map<number, PlaylistSettings>>(new Map()); let playlistSettings = $state<Map<number, PlaylistSettings>>(new Map());
let playlistStats = $state<Map<number, PlaylistStats>>(new Map()); let playlistStats = $state<Map<number, PlaylistStats>>(new Map());
let localTrackCounts = $state<Map<number, number>>(new Map());
let loading = $state(true); let loading = $state(true);
// Offline state // Offline state
@@ -190,10 +191,11 @@
async function loadData() { async function loadData() {
loading = true; loading = true;
try { try {
const [playlistsResult, settingsResult, statsResult] = await Promise.all([ const [playlistsResult, settingsResult, statsResult, localCountsResult] = await Promise.all([
invoke<Playlist[]>('get_user_playlists'), invoke<Playlist[]>('get_user_playlists'),
invoke<PlaylistSettings[]>('playlist_get_all_settings'), invoke<PlaylistSettings[]>('playlist_get_all_settings'),
invoke<PlaylistStats[]>('playlist_get_all_stats') invoke<PlaylistStats[]>('playlist_get_all_stats'),
invoke<Record<string, number>>('playlist_get_all_local_track_counts')
]); ]);
playlists = playlistsResult; playlists = playlistsResult;
@@ -209,6 +211,12 @@
statsMap.set(s.qobuz_playlist_id, s); statsMap.set(s.qobuz_playlist_id, s);
} }
playlistStats = statsMap; playlistStats = statsMap;
const localCountsMap = new Map<number, number>();
for (const [id, count] of Object.entries(localCountsResult)) {
localCountsMap.set(Number(id), count);
}
localTrackCounts = localCountsMap;
} catch (err) { } catch (err) {
console.error('Failed to load playlists:', err); console.error('Failed to load playlists:', err);
} finally { } finally {
@@ -216,6 +224,17 @@
} }
} }
// Get total track count including local tracks
function getTotalTrackCount(playlist: Playlist): number {
const localCount = localTrackCounts.get(playlist.id) ?? 0;
return playlist.tracks_count + localCount;
}
// Get local track count for a playlist
function getLocalTrackCount(playlistId: number): number {
return localTrackCounts.get(playlistId) ?? 0;
}
function formatDuration(seconds: number): string { function formatDuration(seconds: number): string {
const hours = Math.floor(seconds / 3600); const hours = Math.floor(seconds / 3600);
const mins = Math.floor((seconds % 3600) / 60); const mins = Math.floor((seconds % 3600) / 60);
@@ -514,7 +533,7 @@
</div> </div>
<div class="info"> <div class="info">
<span class="name">{playlist.name}</span> <span class="name">{playlist.name}</span>
<span class="meta">{playlist.tracks_count} tracks</span> <span class="meta">{getTotalTrackCount(playlist)} tracks{#if getLocalTrackCount(playlist.id) > 0} <span class="local-count">({getLocalTrackCount(playlist.id)} local)</span>{/if}</span>
</div> </div>
</div> </div>
</div> </div>
@@ -556,7 +575,7 @@
<div class="info"> <div class="info">
<span class="name">{playlist.name}</span> <span class="name">{playlist.name}</span>
<span class="meta"> <span class="meta">
{playlist.tracks_count} tracks {getTotalTrackCount(playlist)} tracks{#if getLocalTrackCount(playlist.id) > 0} <span class="local-count">({getLocalTrackCount(playlist.id)} local)</span>{/if}
{#if playlist.duration > 0} {#if playlist.duration > 0}
<span class="dot">.</span> <span class="dot">.</span>
{formatDuration(playlist.duration)} {formatDuration(playlist.duration)}
@@ -1065,6 +1084,11 @@
color: var(--text-muted); color: var(--text-muted);
} }
.local-count {
color: var(--text-muted);
opacity: 0.8;
}
.dot { .dot {
margin: 0 4px; margin: 0 4px;
} }