feat(v2): migrate playlist commands to V2 architecture
- Add playlist methods to QbzCore (get_user_playlists, get_playlist, add_tracks_to_playlist, remove_tracks_from_playlist) - Add playlist methods to CoreBridge - Create V2 Tauri commands for all playlist operations - Update frontend to use V2 playlist commands - Support both playlistTrackIds and trackIds in remove command (with automatic resolution like legacy)
This commit is contained in:
1 parent
7a133e2915
commit
846da0270e
12 files changed
+202
-20
No files matched your search
@@ -7,7 +7,7 @@ use std::sync::Arc;
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
use qbz_models::{
|
||||
Album, Artist, CoreEvent, FrontendAdapter, Quality, QueueState, RepeatMode,
|
||||
Album, Artist, CoreEvent, FrontendAdapter, Playlist, Quality, QueueState, RepeatMode,
|
||||
SearchResultsPage, StreamUrl, Track, UserSession,
|
||||
};
|
||||
use qbz_player::{Player, PlaybackState, QueueManager};
|
||||
@@ -353,6 +353,54 @@ impl<A: FrontendAdapter + Send + Sync + 'static> QbzCore<A> {
|
||||
.map_err(CoreError::Api)
|
||||
}
|
||||
|
||||
// ==================== Playlists ====================
|
||||
|
||||
/// Get user playlists
|
||||
pub async fn get_user_playlists(&self) -> Result<Vec<Playlist>, CoreError> {
|
||||
let client = self.client.read().await;
|
||||
let client = client.as_ref().ok_or(CoreError::NotInitialized)?;
|
||||
|
||||
client.get_user_playlists().await.map_err(CoreError::Api)
|
||||
}
|
||||
|
||||
/// Get playlist by ID
|
||||
pub async fn get_playlist(&self, playlist_id: u64) -> Result<Playlist, CoreError> {
|
||||
let client = self.client.read().await;
|
||||
let client = client.as_ref().ok_or(CoreError::NotInitialized)?;
|
||||
|
||||
client.get_playlist(playlist_id).await.map_err(CoreError::Api)
|
||||
}
|
||||
|
||||
/// Add tracks to playlist
|
||||
pub async fn add_tracks_to_playlist(
|
||||
&self,
|
||||
playlist_id: u64,
|
||||
track_ids: &[u64],
|
||||
) -> Result<(), CoreError> {
|
||||
let client = self.client.read().await;
|
||||
let client = client.as_ref().ok_or(CoreError::NotInitialized)?;
|
||||
|
||||
client
|
||||
.add_tracks_to_playlist(playlist_id, track_ids)
|
||||
.await
|
||||
.map_err(CoreError::Api)
|
||||
}
|
||||
|
||||
/// Remove tracks from playlist
|
||||
pub async fn remove_tracks_from_playlist(
|
||||
&self,
|
||||
playlist_id: u64,
|
||||
playlist_track_ids: &[u64],
|
||||
) -> Result<(), CoreError> {
|
||||
let client = self.client.read().await;
|
||||
let client = client.as_ref().ok_or(CoreError::NotInitialized)?;
|
||||
|
||||
client
|
||||
.remove_tracks_from_playlist(playlist_id, playlist_track_ids)
|
||||
.await
|
||||
.map_err(CoreError::Api)
|
||||
}
|
||||
|
||||
// ==================== Event Emission ====================
|
||||
|
||||
/// Emit an event to the frontend adapter
|
||||
|
||||
@@ -9,7 +9,7 @@ use std::sync::Arc;
|
||||
use tauri::{Emitter, State};
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
use qbz_models::{Album, Artist, Quality, QueueState, RepeatMode, SearchResultsPage, Track, UserSession};
|
||||
use qbz_models::{Album, Artist, Playlist, Quality, QueueState, RepeatMode, SearchResultsPage, Track, UserSession};
|
||||
|
||||
use crate::artist_blacklist::BlacklistState;
|
||||
use crate::cache::AudioCache;
|
||||
@@ -1259,3 +1259,90 @@ pub async fn v2_reinit_audio_device(
|
||||
|
||||
player.reinit_device(device)
|
||||
}
|
||||
|
||||
// ==================== Playlist Commands (V2) ====================
|
||||
|
||||
/// Get user playlists (V2 - uses QbzCore)
|
||||
#[tauri::command]
|
||||
pub async fn v2_get_user_playlists(
|
||||
bridge: State<'_, CoreBridgeState>,
|
||||
) -> Result<Vec<Playlist>, String> {
|
||||
log::info!("[V2] get_user_playlists");
|
||||
let bridge = bridge.get().await;
|
||||
bridge.get_user_playlists().await
|
||||
}
|
||||
|
||||
/// Get playlist by ID (V2 - uses QbzCore)
|
||||
#[tauri::command]
|
||||
#[allow(non_snake_case)]
|
||||
pub async fn v2_get_playlist(
|
||||
playlistId: u64,
|
||||
bridge: State<'_, CoreBridgeState>,
|
||||
) -> Result<Playlist, String> {
|
||||
log::info!("[V2] get_playlist: {}", playlistId);
|
||||
let bridge = bridge.get().await;
|
||||
bridge.get_playlist(playlistId).await
|
||||
}
|
||||
|
||||
/// Add tracks to playlist (V2 - uses QbzCore)
|
||||
#[tauri::command]
|
||||
#[allow(non_snake_case)]
|
||||
pub async fn v2_add_tracks_to_playlist(
|
||||
playlistId: u64,
|
||||
trackIds: Vec<u64>,
|
||||
bridge: State<'_, CoreBridgeState>,
|
||||
) -> Result<(), String> {
|
||||
log::info!("[V2] add_tracks_to_playlist: playlist {} <- {} tracks", playlistId, trackIds.len());
|
||||
let bridge = bridge.get().await;
|
||||
bridge.add_tracks_to_playlist(playlistId, &trackIds).await
|
||||
}
|
||||
|
||||
/// Remove tracks from playlist (V2 - uses QbzCore)
|
||||
/// Accepts either playlistTrackIds (direct) or trackIds (requires resolution)
|
||||
#[tauri::command]
|
||||
#[allow(non_snake_case)]
|
||||
pub async fn v2_remove_tracks_from_playlist(
|
||||
playlistId: u64,
|
||||
playlistTrackIds: Option<Vec<u64>>,
|
||||
trackIds: Option<Vec<u64>>,
|
||||
bridge: State<'_, CoreBridgeState>,
|
||||
) -> Result<(), String> {
|
||||
let ptids = playlistTrackIds.unwrap_or_default();
|
||||
let tids = trackIds.unwrap_or_default();
|
||||
log::info!(
|
||||
"[V2] remove_tracks_from_playlist: playlist {} (playlistTrackIds={}, trackIds={})",
|
||||
playlistId, ptids.len(), tids.len()
|
||||
);
|
||||
|
||||
let bridge = bridge.get().await;
|
||||
|
||||
// If we have direct playlist_track_ids, use them
|
||||
if !ptids.is_empty() {
|
||||
return bridge.remove_tracks_from_playlist(playlistId, &ptids).await;
|
||||
}
|
||||
|
||||
// Otherwise resolve track_ids → playlist_track_ids via full playlist fetch
|
||||
if !tids.is_empty() {
|
||||
let playlist = bridge.get_playlist(playlistId).await?;
|
||||
|
||||
let track_id_set: std::collections::HashSet<u64> = tids.into_iter().collect();
|
||||
let resolved_ptids: Vec<u64> = playlist
|
||||
.tracks
|
||||
.map(|tc| {
|
||||
tc.items
|
||||
.into_iter()
|
||||
.filter(|track| track_id_set.contains(&track.id))
|
||||
.filter_map(|track| track.playlist_track_id)
|
||||
.collect()
|
||||
})
|
||||
.unwrap_or_default();
|
||||
|
||||
if resolved_ptids.is_empty() {
|
||||
return Err("Could not resolve any track IDs to playlist track IDs".to_string());
|
||||
}
|
||||
|
||||
return bridge.remove_tracks_from_playlist(playlistId, &resolved_ptids).await;
|
||||
}
|
||||
|
||||
Err("Either playlistTrackIds or trackIds must be provided".to_string())
|
||||
}
|
||||
@@ -11,7 +11,7 @@ use std::sync::Arc;
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
use qbz_core::QbzCore;
|
||||
use qbz_models::{Album, Artist, Quality, QueueState, RepeatMode, SearchResultsPage, StreamUrl, Track, UserSession};
|
||||
use qbz_models::{Album, Artist, Playlist, Quality, QueueState, RepeatMode, SearchResultsPage, StreamUrl, Track, UserSession};
|
||||
use qbz_player::{Player, PlaybackState};
|
||||
use qbz_audio::{AudioSettings, AudioDiagnostic, settings::AudioSettingsStore};
|
||||
|
||||
@@ -199,6 +199,48 @@ impl CoreBridge {
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
// ==================== Playlists ====================
|
||||
|
||||
/// Get user playlists
|
||||
pub async fn get_user_playlists(&self) -> Result<Vec<Playlist>, String> {
|
||||
self.core
|
||||
.get_user_playlists()
|
||||
.await
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
/// Get playlist by ID
|
||||
pub async fn get_playlist(&self, playlist_id: u64) -> Result<Playlist, String> {
|
||||
self.core
|
||||
.get_playlist(playlist_id)
|
||||
.await
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
/// Add tracks to playlist
|
||||
pub async fn add_tracks_to_playlist(
|
||||
&self,
|
||||
playlist_id: u64,
|
||||
track_ids: &[u64],
|
||||
) -> Result<(), String> {
|
||||
self.core
|
||||
.add_tracks_to_playlist(playlist_id, track_ids)
|
||||
.await
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
/// Remove tracks from playlist
|
||||
pub async fn remove_tracks_from_playlist(
|
||||
&self,
|
||||
playlist_id: u64,
|
||||
playlist_track_ids: &[u64],
|
||||
) -> Result<(), String> {
|
||||
self.core
|
||||
.remove_tracks_from_playlist(playlist_id, playlist_track_ids)
|
||||
.await
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
// ==================== Streaming ====================
|
||||
|
||||
/// Get stream URL for a track with quality fallback
|
||||
|
||||
@@ -1132,6 +1132,11 @@ pub fn run() {
|
||||
commands_v2::v2_get_favorites,
|
||||
commands_v2::v2_add_favorite,
|
||||
commands_v2::v2_remove_favorite,
|
||||
// Playlists
|
||||
commands_v2::v2_get_user_playlists,
|
||||
commands_v2::v2_get_playlist,
|
||||
commands_v2::v2_add_tracks_to_playlist,
|
||||
commands_v2::v2_remove_tracks_from_playlist,
|
||||
// Playback
|
||||
commands_v2::v2_pause_playback,
|
||||
commands_v2::v2_resume_playback,
|
||||
|
||||
@@ -457,7 +457,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
await invoke('add_tracks_to_playlist', {
|
||||
await invoke('v2_add_tracks_to_playlist', {
|
||||
playlistId: selectedPlaylistId!,
|
||||
trackIds: tracksToAdd
|
||||
});
|
||||
@@ -548,7 +548,7 @@
|
||||
});
|
||||
}
|
||||
} else {
|
||||
await invoke('add_tracks_to_playlist', {
|
||||
await invoke('v2_add_tracks_to_playlist', {
|
||||
playlistId: newPlaylist.id,
|
||||
trackIds
|
||||
});
|
||||
|
||||
@@ -279,7 +279,7 @@
|
||||
}
|
||||
|
||||
try {
|
||||
const details = await invoke<PlaylistDetails>('get_playlist', { playlistId });
|
||||
const details = await invoke<PlaylistDetails>('v2_get_playlist', { playlistId });
|
||||
if (details.tracks?.items) {
|
||||
// Extract unique artist names
|
||||
const artistNames = new Set<string>();
|
||||
@@ -1135,7 +1135,7 @@
|
||||
console.log(`[Sidebar] Loaded ${userPlaylists.length} pending playlists`);
|
||||
} else {
|
||||
// Online mode - load from Qobuz
|
||||
const playlists = await invoke<Playlist[]>('get_user_playlists');
|
||||
const playlists = await invoke<Playlist[]>('v2_get_user_playlists');
|
||||
userPlaylists = playlists;
|
||||
}
|
||||
} catch (err) {
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
async function fetchPlaylistCovers(playlists: Playlist[]) {
|
||||
for (const playlist of playlists) {
|
||||
try {
|
||||
const fullPlaylist = await invoke<Playlist>('get_playlist', { playlistId: playlist.id });
|
||||
const fullPlaylist = await invoke<Playlist>('v2_get_playlist', { playlistId: playlist.id });
|
||||
|
||||
// Extract unique album artworks from tracks
|
||||
const artworks: string[] = [];
|
||||
|
||||
@@ -721,7 +721,7 @@
|
||||
const playlists: FavoritePlaylist[] = [];
|
||||
for (const id of favoriteIds) {
|
||||
try {
|
||||
const playlist = await invoke<FavoritePlaylist>('get_playlist', { playlistId: id });
|
||||
const playlist = await invoke<FavoritePlaylist>('v2_get_playlist', { playlistId: id });
|
||||
playlists.push(playlist);
|
||||
} catch (err) {
|
||||
console.warn(`Failed to load playlist ${id}:`, err);
|
||||
|
||||
@@ -640,7 +640,7 @@
|
||||
if (allTrackIds.length <= PROGRESSIVE_THRESHOLD) {
|
||||
// --- Small playlist: single get_playlist call, no placeholders ---
|
||||
console.log(`[Perf] small playlist (${allTrackIds.length} ≤ ${PROGRESSIVE_THRESHOLD}), using get_playlist`);
|
||||
const fullPlaylist = await invoke<Playlist>('get_playlist', { playlistId });
|
||||
const fullPlaylist = await invoke<Playlist>('v2_get_playlist', { playlistId });
|
||||
console.log(`[Perf] get_playlist DONE (+${(performance.now() - _t0).toFixed(1)}ms)`);
|
||||
|
||||
// Use images from meta (collage thumbnails) if the full playlist doesn't have them
|
||||
@@ -1550,7 +1550,7 @@
|
||||
notifyParentOfCounts();
|
||||
} else if (track.playlistTrackId) {
|
||||
// Remove Qobuz track using playlist_track_id (available from full playlist load)
|
||||
await invoke('remove_tracks_from_playlist', {
|
||||
await invoke('v2_remove_tracks_from_playlist', {
|
||||
playlistId,
|
||||
playlistTrackIds: [track.playlistTrackId]
|
||||
});
|
||||
@@ -1558,7 +1558,7 @@
|
||||
notifyParentOfCounts();
|
||||
} else {
|
||||
// Progressive loading path: no playlist_track_id available, resolve by track ID
|
||||
await invoke('remove_tracks_from_playlist', {
|
||||
await invoke('v2_remove_tracks_from_playlist', {
|
||||
playlistId,
|
||||
trackIds: [track.id]
|
||||
});
|
||||
@@ -1606,19 +1606,19 @@
|
||||
|
||||
// Remove the old track (supports both playlist_track_id and track_id resolution)
|
||||
if (trackToReplace.playlistTrackId) {
|
||||
await invoke('remove_tracks_from_playlist', {
|
||||
await invoke('v2_remove_tracks_from_playlist', {
|
||||
playlistId,
|
||||
playlistTrackIds: [trackToReplace.playlistTrackId]
|
||||
});
|
||||
} else {
|
||||
await invoke('remove_tracks_from_playlist', {
|
||||
await invoke('v2_remove_tracks_from_playlist', {
|
||||
playlistId,
|
||||
trackIds: [trackToReplace.id]
|
||||
});
|
||||
}
|
||||
|
||||
// Add the new track
|
||||
await invoke('add_tracks_to_playlist', {
|
||||
await invoke('v2_add_tracks_to_playlist', {
|
||||
playlistId,
|
||||
trackIds: [newTrack.id]
|
||||
});
|
||||
@@ -1672,7 +1672,7 @@
|
||||
async function handleAddSuggestedTrack(suggestedTrack: import('$lib/services/playlistSuggestionsService').SuggestedTrack) {
|
||||
try {
|
||||
// Add to Qobuz playlist
|
||||
await invoke('add_tracks_to_playlist', {
|
||||
await invoke('v2_add_tracks_to_playlist', {
|
||||
playlistId,
|
||||
trackIds: [suggestedTrack.track_id]
|
||||
});
|
||||
|
||||
@@ -363,7 +363,7 @@
|
||||
if (offlineStatus.isOffline) {
|
||||
// Offline mode: Load both regular playlists AND pending playlists
|
||||
const [playlistsResult, pendingPlaylistsResult, settingsResult, statsResult, localCountsResult] = await Promise.all([
|
||||
invoke<Playlist[]>('get_user_playlists'),
|
||||
invoke<Playlist[]>('v2_get_user_playlists'),
|
||||
invoke<import('$lib/stores/offlineStore').PendingPlaylist[]>('get_pending_playlists'),
|
||||
invoke<PlaylistSettings[]>('playlist_get_all_settings'),
|
||||
invoke<PlaylistStats[]>('playlist_get_all_stats'),
|
||||
@@ -422,7 +422,7 @@
|
||||
} else {
|
||||
// Online mode: Load only regular playlists
|
||||
const [playlistsResult, settingsResult, statsResult, localCountsResult] = await Promise.all([
|
||||
invoke<Playlist[]>('get_user_playlists'),
|
||||
invoke<Playlist[]>('v2_get_user_playlists'),
|
||||
invoke<PlaylistSettings[]>('playlist_get_all_settings'),
|
||||
invoke<PlaylistStats[]>('playlist_get_all_stats'),
|
||||
invoke<Record<string, number>>('playlist_get_all_local_track_counts')
|
||||
|
||||
@@ -494,7 +494,7 @@ export async function syncPendingPlaylists(): Promise<void> {
|
||||
// Add Qobuz tracks if any
|
||||
if (playlist.trackIds.length > 0) {
|
||||
console.log(`[Offline] Adding ${playlist.trackIds.length} Qobuz tracks`);
|
||||
await invoke('add_tracks_to_playlist', {
|
||||
await invoke('v2_add_tracks_to_playlist', {
|
||||
playlistId: qobuzPlaylistId,
|
||||
trackIds: playlist.trackIds
|
||||
});
|
||||
|
||||
@@ -1131,7 +1131,7 @@
|
||||
|
||||
async function fetchPlaylistData(playlistId: number): Promise<PlaylistData | null> {
|
||||
try {
|
||||
const playlist = await invoke<PlaylistData>('get_playlist', { playlistId });
|
||||
const playlist = await invoke<PlaylistData>('v2_get_playlist', { playlistId });
|
||||
return playlist;
|
||||
} catch (err) {
|
||||
console.error('Failed to load playlist:', err);
|
||||
|
||||
Reference in new issue
Block a user