ref(media&volume): using tokio command to drop resources

Author: Qiumix

src/modules/media.rs

@@ -27,7 +27,7 @@ use crate::{
 };
 use crate::{impl_on_click, impl_wrapper};
 
-use super::{KillOnDrop, Module};
+use super::Module;
 
 #[derive(Debug, Builder)]
 pub struct MediaMod {
@@ -485,6 +485,7 @@ impl Module for MediaMod {
                         "playerctl --follow metadata --format '{\"title\": \"{{title}}\", \"artist\": \"{{artist}}\", \"album\": \"{{album}}\", \"art_url\": \"{{mpris:artUrl}}\", \"length\": {{mpris:length}}, \"status\": \"{{status}}\", \"player\": \"{{playerName}}\"}'",
                     )
                     .stdout(Stdio::piped())
+                    .kill_on_drop(true)
                     .spawn()
                     .expect("Failed to read output from playerctl");
 
@@ -493,10 +494,6 @@ impl Module for MediaMod {
                     .take()
                     .expect("child did not have a handle to stdout");
 
-                // Kill playerctl when the subscription ends (e.g. on reload),
-                // so it doesn't leak and accumulate processes.
-                let _kill_on_drop = KillOnDrop(child);
-
                 let mut reader = BufReader::new(stdout).lines();
                 let mut last_track = String::new();
 

src/modules/mod.rs

@@ -160,17 +160,6 @@ pub trait Module: Any + Debug + Send + Sync + Downcast {
 }
 impl_downcast!(Module);
 
-/// Kills the wrapped child process when dropped, so subscription child
-/// processes (e.g. `pactl subscribe`, `playerctl --follow`) don't leak when
-/// the subscription ends (e.g. on config reload).
-pub struct KillOnDrop(pub tokio::process::Child);
-
-impl Drop for KillOnDrop {
-    fn drop(&mut self) {
-        let _ = self.0.start_kill();
-    }
-}
-
 pub trait Action: Any + Debug + Send + Sync + Downcast {
     fn as_message(&self) -> Message;
 }

src/modules/volume.rs

@@ -21,7 +21,7 @@ use crate::{
 };
 use crate::{impl_on_click, impl_wrapper};
 
-use super::{KillOnDrop, Module};
+use super::Module;
 
 #[derive(Default, Debug, Builder)]
 pub struct VolumeMod {
@@ -100,6 +100,7 @@ impl Module for VolumeMod {
                 let mut child = Command::new("sh")
                     .arg("-c")
                     .arg("pactl subscribe")
+                    .kill_on_drop(true)
                     .stdout(Stdio::piped())
                     .spawn()
                     .expect("Failed to spawn pactl to monitor volume changes");
@@ -109,10 +110,6 @@ impl Module for VolumeMod {
                     .take()
                     .expect("child did not have a handle to stdout");
 
-                // Kill pactl when the subscription ends (e.g. on reload), so
-                // it doesn't leak and exhaust the pulse client limit.
-                let _kill_on_drop = KillOnDrop(child);
-
                 let mut reader = BufReader::new(stdout).lines();
 
                 while let Some(line) = reader.next_line().await.unwrap() {