chore: Improve shutdown.

Author: ccgauche

crates/download-manager/src/lib.rs

@@ -50,7 +50,11 @@ impl DownloadManager {
     /// HANDLES.lock().unwrap().push(run_service(async move {
     ///     run_service_stream(sender);
     /// }));
-    pub fn run_service_stream(&'static self, cancelation: impl Future<Output = ()> + Clone + Send + 'static, sender: MessageHandler) {
+    pub fn run_service_stream(
+        &'static self,
+        cancelation: impl Future<Output = ()> + Clone + Send + 'static,
+        sender: MessageHandler,
+    ) {
         let fut = async move {
             loop {
                 if let Some(id) = self.take() {
@@ -69,13 +73,21 @@ impl DownloadManager {
         self.handles.lock().unwrap().push(service);
     }
 
-    pub fn spawn_system(&'static self, cancelation: impl Future<Output = ()> + Clone + Send + 'static, sender: MessageHandler) {
+    pub fn spawn_system(
+        &'static self,
+        cancelation: impl Future<Output = ()> + Clone + Send + 'static,
+        sender: MessageHandler,
+    ) {
         for _ in 0..DOWNLOADER_COUNT {
             self.run_service_stream(cancelation.clone(), sender.clone());
         }
     }
 
-    pub fn clean(&'static self, cancelation: impl Future<Output = ()> + Clone + Send + 'static, sender: MessageHandler) {
+    pub fn clean(
+        &'static self,
+        cancelation: impl Future<Output = ()> + Clone + Send + 'static,
+        sender: MessageHandler,
+    ) {
         self.download_list.lock().unwrap().clear();
         self.in_download.lock().unwrap().clear();
         {

crates/ytermusic/src/main.rs

@@ -6,7 +6,13 @@ use structures::performance::STARTUP_TIME;
 use term::{Manager, ManagerMessage};
 use tokio::select;
 
-use std::{future::Future, panic, path::{Path, PathBuf}, str::FromStr, sync::RwLock};
+use std::{
+    future::Future,
+    panic,
+    path::{Path, PathBuf},
+    str::FromStr,
+    sync::RwLock,
+};
 use systems::{logger::init, player::player_system};
 
 use crate::{
@@ -20,12 +26,12 @@ mod config;
 mod consts;
 mod database;
 mod errors;
+mod shutdown;
 mod structures;
 mod systems;
 mod term;
 mod utils;
-mod shutdown;
-pub use shutdown::{ShutdownSignal, is_shutdown_sent, shutdown};
+pub use shutdown::{is_shutdown_sent, shutdown, ShutdownSignal};
 mod tasks;
 
 pub use database::DATABASE;
@@ -231,10 +237,7 @@ async fn app_start_main(updater_r: Receiver<ManagerMessage>, updater_s: Sender<M
     // Spawn the player task
     let (sa, player) = player_system(updater_s.clone());
     // Spawn the downloader system
-    DOWNLOAD_MANAGER.spawn_system(
-        ShutdownSignal,
-        download_manager_handler(sa.clone()),
-    );
+    DOWNLOAD_MANAGER.spawn_system(ShutdownSignal, download_manager_handler(sa.clone()));
     STARTUP_TIME.log("Spawned system task");
     tasks::last_playlist::spawn_last_playlist_task(updater_s.clone());
     STARTUP_TIME.log("Spawned last playlist task");
@@ -248,6 +251,7 @@ async fn app_start_main(updater_r: Receiver<ManagerMessage>, updater_s: Sender<M
     let mut manager = Manager::new(sa, player).await;
     manager.run(&updater_r).unwrap();
 }
+
 fn app_start() {
     let (updater_s, updater_r) = flume::unbounded::<ManagerMessage>();
     let updater_s_c = updater_s.clone();

crates/ytermusic/src/shutdown.rs

@@ -1,8 +1,12 @@
-use std::{future::Future, pin::Pin, sync::atomic::{AtomicBool, Ordering}, task::{Context, Poll}};
+use std::{
+    future::Future,
+    pin::Pin,
+    sync::atomic::{AtomicBool, Ordering},
+    task::{Context, Poll},
+};
 
 use log::info;
 
-
 static SHUTDOWN_SENT: AtomicBool = AtomicBool::new(false);
 
 pub fn is_shutdown_sent() -> bool {
@@ -27,4 +31,4 @@ impl Future for ShutdownSignal {
 pub fn shutdown() {
     SHUTDOWN_SENT.store(true, Ordering::Relaxed);
     info!("Shutdown signal sent, waiting for shutdown");
-}
+}

crates/ytermusic/src/structures/sound_action.rs

@@ -6,7 +6,10 @@ use std::{fs, sync::Arc, time::Duration};
 use ytpapi2::YoutubeMusicVideoRef;
 
 use crate::{
-    DATABASE, ShutdownSignal, consts::CACHE_DIR, errors::handle_error_option, systems::{DOWNLOAD_MANAGER, player::PlayerState}
+    consts::CACHE_DIR,
+    errors::handle_error_option,
+    systems::{player::PlayerState, DOWNLOAD_MANAGER},
+    ShutdownSignal, DATABASE,
 };
 
 /// Actions that can be sent to the player from other services

crates/ytermusic/src/term/mod.rs

@@ -25,7 +25,7 @@ use ratatui::{backend::CrosstermBackend, layout::Rect, Frame, Terminal};
 use ytpapi2::YoutubeMusicVideoRef;
 
 use crate::{
-    is_shutdown_sent, shutdown, structures::sound_action::SoundAction, systems::player::PlayerState
+    is_shutdown_sent, shutdown, structures::sound_action::SoundAction, systems::player::PlayerState,
 };
 
 use self::{device_lost::DeviceLost, item_list::ListItem, playlist::Chooser, search::Search};

crates/ytermusic/src/term/search.rs

@@ -16,7 +16,13 @@ use ytpapi2::{
 };
 
 use crate::{
-    DATABASE, ShutdownSignal, consts::CONFIG, get_header_file, run_service, structures::sound_action::{SoundAction, download_manager_handler}, systems::DOWNLOAD_MANAGER, try_get_cookies, utils::invert
+    consts::CONFIG,
+    get_header_file, run_service,
+    structures::sound_action::{download_manager_handler, SoundAction},
+    systems::DOWNLOAD_MANAGER,
+    try_get_cookies,
+    utils::invert,
+    ShutdownSignal, DATABASE,
 };
 
 use super::{