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

On continue le refactoring des sources

Browse Source
This commit is contained in:
Eric Coissac
2025-10-26 13:44:41 +01:00
parent 1268c24faf
commit 1e0a0e2acb
18 changed files with 647 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
PMOMusic/src/main.rs
View File

@@ -3,16 +3,14 @@ use pmomediarenderer::MEDIA_RENDERER;
use pmomediaserver::{MEDIA_SERVER, sources::SourcesExt};
use pmoserver::Server;
use pmosource::MusicSourceExt;
use pmoupnp::{UpnpServerExt, upnp_api::UpnpApiExt};
use pmoupnp::UpnpServerExt;
use tracing::info;
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
// ========== PHASE 1 : Infrastructure UPnP ==========
let mut server = Server::create_upnp_server().await?;
// Routes personnalisées de l'application
server
let server = Server::create_upnp_server().await?; // Routes personnalisées de l'application
server.write().await
.add_route("/info", || async {
serde_json::json!({"version": "1.0.0"})
})
@@ -20,7 +18,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// Initialiser le système de gestion des sources musicales avec API REST
info!("📡 Initializing music sources management system...");
server
server.write().await
.init_music_sources()
.await
.expect("Failed to initialize music sources API");
@@ -36,12 +34,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// }
// Enregistrer Radio Paradise (inclut l'initialisation de l'API)
if let Err(e) = server.register_paradise().await {
if let Err(e) = server.write().await.register_paradise().await {
tracing::warn!("⚠️ Failed to register Radio Paradise: {}", e);
}
// Lister toutes les sources enregistrées
let sources = server.list_music_sources().await;
let sources = server.read().await.list_music_sources().await;
info!("✅ {} music source(s) registered", sources.len());
for source in sources {
info!(" - {} ({})", source.name(), source.id());
@@ -50,7 +48,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// Enregistrer les devices UPnP (HTTP + SSDP automatique)
info!("📡 Registering UPnP devices...");
let renderer_instance = server
let renderer_instance = server.write().await
.register_device(MEDIA_RENDERER.clone())
.await
.expect("Failed to register MediaRenderer");
@@ -61,7 +59,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
renderer_instance.description_route()
);
let server_instance = server
let server_instance = server.write().await
.register_device(MEDIA_SERVER.clone())
.await
.expect("Failed to register MediaServer");
@@ -74,16 +72,16 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// Ajouter la webapp via le trait WebAppExt
info!("📡 Registering Web application...");
server.add_webapp_with_redirect::<Webapp>("/app").await;
server.write().await.add_webapp_with_redirect::<Webapp>("/app").await;
// ========== PHASE 3 : Démarrage du serveur ==========
info!("🌐 Starting HTTP server...");
server.start().await;
server.write().await.start().await;
info!("✅ PMOMusic is ready!");
info!("Press Ctrl+C to stop...");
server.wait().await;
server.write().await.wait().await;
Ok(())
}