Add a block until shutdown.

Author: ccgauche

crates/ytermusic/src/shutdown.rs

@@ -7,6 +7,46 @@ use std::{
 
 use log::info;
 
+use std::sync::{Condvar, Mutex};
+
+pub struct SharedEvent {
+    lock: Mutex<bool>,
+    cvar: Condvar,
+}
+
+impl SharedEvent {
+    // const fn allows this to be called in a static context
+    pub const fn new() -> Self {
+        Self {
+            lock: Mutex::new(false),
+            cvar: Condvar::new(),
+        }
+    }
+
+    /// Blocks the current thread until notify() is called.
+    pub fn wait(&self) {
+        let mut ready = self.lock.lock().unwrap();
+        while !*ready {
+            ready = self.cvar.wait(ready).unwrap();
+        }
+    }
+
+    /// Wakes up ALL waiting threads.
+    pub fn notify(&self) {
+        let mut ready = self.lock.lock().unwrap();
+        *ready = true;
+        self.cvar.notify_all();
+    }
+}
+
+// Global static initialization
+static SHUTDOWN_WAKER: SharedEvent = SharedEvent::new();
+
+#[allow(dead_code)]
+pub fn block_until_shutdown() {
+    SHUTDOWN_WAKER.wait();
+}
+
 static SHUTDOWN_SENT: AtomicBool = AtomicBool::new(false);
 
 pub fn is_shutdown_sent() -> bool {
@@ -30,5 +70,6 @@ impl Future for ShutdownSignal {
 
 pub fn shutdown() {
     SHUTDOWN_SENT.store(true, Ordering::Relaxed);
+    SHUTDOWN_WAKER.notify();
     info!("Shutdown signal sent, waiting for shutdown");
 }

crates/ytermusic/src/structures/media.rs

@@ -167,7 +167,7 @@ pub fn run_window_handler(_updater: &Sender<ManagerMessage>) -> Option<()> {
     use crate::is_shutdown_sent;
 
     loop {
-        if is_shutdown_sent() {
+        if crate::shutdown::block_until_shutdown() && is_shutdown_sent() {
             use std::process::exit;
 
             info!("event loop closed");