Amélioration des pmoplaylist

This commit is contained in:
2025-12-17 08:31:47 +01:00
parent d6920703a1
commit ca36a102e5
11 changed files with 201 additions and 33 deletions

View File

@@ -4,6 +4,9 @@ pub mod core;
pub mod record;
use self::core::{PlaylistConfig, PlaylistCore};
use serde::{Deserialize, Serialize};
use std::fmt;
use std::str::FromStr;
use std::sync::atomic::{AtomicU8, Ordering};
use std::sync::{Arc, Weak};
use std::time::SystemTime;
@@ -30,6 +33,7 @@ impl From<u8> for PlaylistState {
pub struct Playlist {
pub id: String,
title: RwLock<String>,
role: RwLock<PlaylistRole>,
state: Arc<AtomicU8>,
pub core: Arc<RwLock<PlaylistCore>>,
pub persistent: bool,
@@ -39,10 +43,17 @@ pub struct Playlist {
impl Playlist {
/// Crée une nouvelle playlist
pub fn new(id: String, title: String, config: PlaylistConfig, persistent: bool) -> Self {
pub fn new(
id: String,
title: String,
config: PlaylistConfig,
persistent: bool,
role: PlaylistRole,
) -> Self {
Self {
id,
title: RwLock::new(title),
role: RwLock::new(role),
state: Arc::new(AtomicU8::new(PlaylistState::Active as u8)),
core: Arc::new(RwLock::new(PlaylistCore::new(config))),
persistent,
@@ -78,6 +89,17 @@ impl Playlist {
self.touch().await;
}
/// Retourne le rôle
pub async fn role(&self) -> PlaylistRole {
self.role.read().await.clone()
}
/// Change le rôle
pub async fn set_role(&self, role: PlaylistRole) {
*self.role.write().await = role;
self.touch().await;
}
/// Timestamp du dernier changement
pub async fn last_change(&self) -> SystemTime {
*self.last_change.read().await
@@ -100,3 +122,90 @@ impl Playlist {
Ok(token)
}
}
/// Rôle logique d'une playlist
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum PlaylistRole {
User,
Album,
Radio,
Source,
Custom(String),
}
impl PlaylistRole {
pub const fn user() -> Self {
PlaylistRole::User
}
pub const fn album() -> Self {
PlaylistRole::Album
}
pub const fn radio() -> Self {
PlaylistRole::Radio
}
pub const fn source() -> Self {
PlaylistRole::Source
}
pub fn custom<S: Into<String>>(value: S) -> Self {
PlaylistRole::Custom(value.into())
}
pub fn as_str(&self) -> &str {
match self {
PlaylistRole::User => "user",
PlaylistRole::Album => "album",
PlaylistRole::Radio => "radio",
PlaylistRole::Source => "source",
PlaylistRole::Custom(value) => value.as_str(),
}
}
}
impl Default for PlaylistRole {
fn default() -> Self {
PlaylistRole::User
}
}
impl fmt::Display for PlaylistRole {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.write_str(self.as_str())
}
}
impl Serialize for PlaylistRole {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
serializer.serialize_str(self.as_str())
}
}
impl<'de> Deserialize<'de> for PlaylistRole {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
let value = String::deserialize(deserializer)?;
Ok(PlaylistRole::from_str(&value).unwrap_or_else(|_| PlaylistRole::Custom(value)))
}
}
impl FromStr for PlaylistRole {
type Err = ();
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s.to_ascii_lowercase().as_str() {
"user" => Ok(PlaylistRole::User),
"album" => Ok(PlaylistRole::Album),
"radio" => Ok(PlaylistRole::Radio),
"source" => Ok(PlaylistRole::Source),
other => Ok(PlaylistRole::Custom(other.to_string())),
}
}
}