diff --git a/.DS_Store b/.DS_Store index 30336c35..1596fb0b 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.pmomusic.yml b/.pmomusic.yml index 6440da8c..7da3f639 100644 --- a/.pmomusic.yml +++ b/.pmomusic.yml @@ -9,7 +9,7 @@ host: logger: buffer_capacity: 200 enable_console: true - min_level: INFO + min_level: TRACE mediarenderer: mpd_renderer: null mediaserver: diff --git a/.pmomusic_audio/6274bb81a4547b93.orig.flac b/.pmomusic_audio/6274bb81a4547b93.orig.flac new file mode 100644 index 00000000..1b9068bf Binary files /dev/null and b/.pmomusic_audio/6274bb81a4547b93.orig.flac differ diff --git a/.pmomusic_audio/cache.db b/.pmomusic_audio/cache.db index 6bb75df6..ff577fcc 100644 Binary files a/.pmomusic_audio/cache.db and b/.pmomusic_audio/cache.db differ diff --git a/.pmomusic_audio/e769c605118bdadf.orig.flac b/.pmomusic_audio/e769c605118bdadf.orig.flac new file mode 100644 index 00000000..0ea0b658 Binary files /dev/null and b/.pmomusic_audio/e769c605118bdadf.orig.flac differ diff --git a/pmoapp/webapp/src/services/audioCache.ts b/pmoapp/webapp/src/services/audioCache.ts index c3d9f244..343eade2 100644 --- a/pmoapp/webapp/src/services/audioCache.ts +++ b/pmoapp/webapp/src/services/audioCache.ts @@ -154,14 +154,14 @@ export async function consolidateCache(): Promise { * Génère l'URL pour streamer une piste */ export function getTrackUrl(pk: string): string { - return `/audio/tracks/${pk}`; + return `/audio/flac/${pk}`; } /** * Génère l'URL pour télécharger la piste originale */ export function getOriginalTrackUrl(pk: string): string { - return `/audio/tracks/${pk}/orig`; + return `/audio/flac/${pk}/orig`; } /** diff --git a/pmoapp/webapp/src/services/coverCache.ts b/pmoapp/webapp/src/services/coverCache.ts index a277c097..427d63f6 100644 --- a/pmoapp/webapp/src/services/coverCache.ts +++ b/pmoapp/webapp/src/services/coverCache.ts @@ -114,7 +114,7 @@ export async function consolidateCache(): Promise { */ export function getImageUrl(pk: string, size?: number): string { if (size) { - return `/covers/images/${pk}/${size}`; + return `/covers/image/${pk}/${size}`; } - return `/covers/images/${pk}`; + return `/covers/image/${pk}`; } diff --git a/pmoaudiocache/src/cache.rs b/pmoaudiocache/src/cache.rs index 8d0085f2..eafb3843 100644 --- a/pmoaudiocache/src/cache.rs +++ b/pmoaudiocache/src/cache.rs @@ -21,7 +21,7 @@ impl CacheConfig for AudioConfig { } fn cache_type() -> &'static str { - "audio" + "flac" } fn cache_name() -> &'static str { diff --git a/pmoaudiocache/src/openapi.rs b/pmoaudiocache/src/openapi.rs index 4c3a6187..b941904f 100644 --- a/pmoaudiocache/src/openapi.rs +++ b/pmoaudiocache/src/openapi.rs @@ -64,10 +64,10 @@ Consolide le cache (répare les incohérences) ## Servir les fichiers -### GET /audio/tracks/{pk} +### GET /audio/flac/{pk} Récupère le fichier FLAC (streaming progressif si en cours de téléchargement) -### GET /audio/tracks/{pk}/orig +### GET /audio/flac/{pk}/orig Alias pour le fichier original ## Format des fichiers diff --git a/pmoconfig/src/lib.rs b/pmoconfig/src/lib.rs index 45a772fb..b267977f 100644 --- a/pmoconfig/src/lib.rs +++ b/pmoconfig/src/lib.rs @@ -433,7 +433,7 @@ impl Config { pub fn get_log_min_level(&self) -> Result { match self.get_value(&["host", "logger", "min_level"])? { Value::String(s) => Ok(s), - _ => Ok("INFO".to_string()), + _ => Ok("TRACE".to_string()), } } diff --git a/pmoserver/src/logs/mod.rs b/pmoserver/src/logs/mod.rs index b58e2c09..1bd8abe9 100644 --- a/pmoserver/src/logs/mod.rs +++ b/pmoserver/src/logs/mod.rs @@ -261,9 +261,9 @@ pub fn init_logging() -> LogState { let log_level = match config.get_log_min_level() { Ok(l) => match string_to_level(&l) { Some(lev) => level_to_levelfilter(lev), - None => LevelFilter::INFO, + None => LevelFilter::TRACE, } - Err(_) => LevelFilter::INFO + Err(_) => LevelFilter::TRACE }; let (filter, reload_handle) = reload::Layer::new(log_level); diff --git a/pmoupnp/src/actions/action_methods.rs b/pmoupnp/src/actions/action_methods.rs index 6e442112..b8f528a8 100644 --- a/pmoupnp/src/actions/action_methods.rs +++ b/pmoupnp/src/actions/action_methods.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use tracing::{debug, trace}; +use tracing::{debug, info, trace}; use xmltree::{Element, XMLNode}; use crate::{ @@ -75,7 +75,7 @@ impl Action { action_handler!(|instance| { use crate::UpnpTypedInstance; - debug!("🎬 Action '{}' called", instance.get_name()); + info!("🎬 Action '{}' called", instance.get_name()); // Logger les arguments d'entrée (déjà stockés dans les variables par run()) for arg_inst in instance.arguments_set().all() {