eric/pmomusic
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Amélioration des pmoplaylist

Browse Source
This commit is contained in:
Eric Coissac
2025-12-17 08:31:47 +01:00
parent d6920703a1
commit ca36a102e5
11 changed files with 201 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pmoplaylist/src/manager.rs
View File

@@ -3,7 +3,7 @@
use crate::handle::{ReadHandle, WriteHandle};
use crate::persistence::PersistenceManager;
use crate::playlist::core::PlaylistConfig;
use crate::playlist::Playlist;
use crate::playlist::{Playlist, PlaylistRole};
use crate::Result;
use once_cell::sync::OnceCell;
use pmocache::{CacheBroadcastEvent, CacheEvent, CacheSubscription};
@@ -138,8 +138,12 @@ impl PlaylistManager {
}
}
/// Cr<43>e une playlist persistante (erreur si existe d<>j<EFBFBD>)
pub async fn create_persistent_playlist(&self, id: String) -> Result<WriteHandle> {
/// Cr<43>e une playlist persistante (erreur si existe d<>j<EFBFBD>) avec rôle personnalisé
pub async fn create_persistent_playlist_with_role(
&self,
id: String,
role: PlaylistRole,
) -> Result<WriteHandle> {
let mut playlists = self.inner.playlists.write().await;
if playlists.contains_key(&id) {
@@ -148,9 +152,10 @@ impl PlaylistManager {
let playlist = Arc::new(Playlist::new(
id.clone(),
id.clone(), // Titre = id par d<EFBFBD>faut
id.clone(), // Titre = id par défaut
PlaylistConfig::default(),
true, // persistent
role,
));
// Acqu<71>rir le write lock
@@ -165,15 +170,22 @@ impl PlaylistManager {
// Sauvegarder la structure vide
if let Some(persistence) = &self.inner.persistence {
let title = playlist.title().await;
let role = playlist.role().await;
let core = playlist.core.read().await;
persistence
.save_playlist(&playlist.id, &title, &core.config, &core.tracks)
.save_playlist(&playlist.id, &title, &role, &core.config, &core.tracks)
.await?;
}
Ok(WriteHandle::new(playlist, write_token))
}
/// Cr<43>e une playlist persistante avec rôle par défaut (user)
pub async fn create_persistent_playlist(&self, id: String) -> Result<WriteHandle> {
self.create_persistent_playlist_with_role(id, PlaylistRole::User)
.await
}
/// Enregistre un callback d'évènement playlist (update, track joué).
///
/// Retourne un jeton (u64) pour désenregistrer plus tard.
@@ -394,7 +406,8 @@ impl PlaylistManager {
id.clone(),
id.clone(),
PlaylistConfig::default(),
false, // <EFBFBD>ph<EFBFBD>m<EFBFBD>re
false, // éphémère
PlaylistRole::User,
));
let write_token = playlist
@@ -430,11 +443,12 @@ impl PlaylistManager {
// Pas en mémoire, essayer de charger depuis la DB
if let Some(persistence) = &self.inner.persistence {
if let Some((title, config, tracks)) = persistence.load_playlist(&id).await? {
if let Some((title, role, config, tracks)) = persistence.load_playlist(&id).await? {
// Reconstruire la playlist
let mut playlists = self.inner.playlists.write().await;
let playlist = Arc::new(Playlist::new(id.clone(), title.clone(), config, true));
let playlist =
Arc::new(Playlist::new(id.clone(), title.clone(), config, true, role));
// Restaurer les tracks
{
@@ -477,11 +491,12 @@ impl PlaylistManager {
// Pas en m<>moire, essayer de ressusciter depuis la DB
if let Some(persistence) = &self.inner.persistence {
if let Some((title, config, tracks)) = persistence.load_playlist(id).await? {
if let Some((title, role, config, tracks)) = persistence.load_playlist(id).await? {
// Reconstruire la playlist
let mut playlists = self.inner.playlists.write().await;
let playlist = Arc::new(Playlist::new(id.to_string(), title.clone(), config, true));
let playlist =
Arc::new(Playlist::new(id.to_string(), title.clone(), config, true, role));
// Restaurer les tracks
{
@@ -767,13 +782,14 @@ impl PlaylistManager {
let new_len = core.len();
drop(core);
// Si des morceaux ont <EFBFBD>t<EFBFBD> <20>vict<EFBFBD>s et la playlist est persistante
// Si des morceaux ont été évictés et la playlist est persistante
if new_len < initial_len && playlist.persistent {
if let Some(persistence) = &self.inner.persistence {
let title = playlist.title().await;
let role = playlist.role().await;
let core = playlist.core.read().await;
let _ = persistence
.save_playlist(&playlist.id, &title, &core.config, &core.tracks)
.save_playlist(&playlist.id, &title, &role, &core.config, &core.tracks)
.await;
}
}