Better error and notification handling

Cargo.lock

@@ -268,7 +268,7 @@ dependencies = [
 
 [[package]]
 name = "noise"
-version = "0.1.7"
+version = "0.1.9"
 dependencies = [
  "clap",
  "clap_complete",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "noise"
-version = "0.1.7"
+version = "0.1.9"
 edition = "2024"
 authors = ["Nox Sluijtman"]
 

src/main.rs

@@ -5,7 +5,7 @@ use noise::{commands::Noise, parser::*};
 
 use clap::{Command, CommandFactory, Parser};
 use clap_complete::{generate, Generator};
-use mpd::Client;
+use mpd::{error::Error, Client};
 use std::io;
 
 fn print_completions<G: Generator>(generator: G, cmd: &mut Command) {
@@ -17,23 +17,26 @@ fn print_completions<G: Generator>(generator: G, cmd: &mut Command) {
     );
 }
 
-fn main() {
+fn main() -> Result<(), Error> {
     let cli = Cli::parse();
 
     if let Some(completions) = cli.completions {
         let mut cmd = Cli::command();
         eprintln!("Generatig completion file for {completions:?}...");
         print_completions(completions, &mut cmd);
-        return;
+        return Ok(());
     }
 
     let host = cli.host.unwrap_or("localhost:6600".into());
 
-    let mut conn = Client::connect(host).expect("Connection failed");
+    let mut conn = match Client::connect(host) {
+        Ok(client) => client,
+        Err(err) => return Err(err),
+    };
 
     if let Some(cmd) = &cli.command {
         match cmd {
-            Commands::Play { track } => conn.noise_play(*track),
+            Commands::Play { track } => Noise::play(&mut conn, *track),
             Commands::Stop => conn.stop().unwrap(),
             Commands::Toggle => conn.toggle(),
             Commands::Next => conn.next().unwrap(),
@@ -41,9 +44,9 @@ fn main() {
             Commands::List { file } => conn.list_queue(*file, cli.verbose),
             Commands::Current => (),
             Commands::Clear => conn.clear().unwrap(),
-            Commands::Search { query, max } => conn.noise_search(query, *max),
-            Commands::Find { query, max, append } => conn.noise_find(query, *max, *append),
-            Commands::Crossfade { seconds } => conn.noise_crossfade(*seconds),
+            Commands::Search { query, max } => Noise::search(&mut conn, query, *max),
+            Commands::Find { query, max, append } => Noise::find(&mut conn, query, *max, *append),
+            Commands::Crossfade { seconds } => Noise::crossfade(&mut conn, *seconds),
             Commands::Shuffle => conn.shuf(),
             Commands::Repeat => conn.toggle_repeat(),
             Commands::Random => conn.toggle_random(),
@@ -60,10 +63,18 @@ fn main() {
         | Commands::Search { .. }
         | Commands::Find { .. }
         | Commands::Crossfade { .. }
+        | Commands::Volume { .. }
         | Commands::Shuffle = cmd
         {
-            return;
+            return Ok(());
         }
     }
+    let _things: Vec<String> = conn
+        .queue()
+        .unwrap()
+        .iter()
+        .map(|x| x.place.unwrap().pos.to_string())
+        .collect();
     println!("{}", conn.get_status(cli.verbose));
+    return Ok(());
 }

src/noise/commands.rs

@@ -3,13 +3,13 @@ extern crate mpd;
 
 use libnotify::Notification;
 use mpd::{Client, Query, Song, State, Term};
-use std::time::Duration;
+use std::{env, time::Duration};
 
 pub trait Noise {
-    fn noise_find(&mut self, query: &Vec<String>, max: Option<u32>, append: bool);
-    fn noise_search(&mut self, query: &Vec<String>, max: Option<u32>);
-    fn noise_crossfade(&mut self, seconds: Option<i64>);
-    fn noise_play(&mut self, track: Option<u32>);
+    fn find(&mut self, query: &Vec<String>, max: Option<u32>, append: bool);
+    fn search(&mut self, query: &Vec<String>, max: Option<u32>);
+    fn crossfade(&mut self, seconds: Option<i64>);
+    fn play(&mut self, track: Option<u32>);
     fn toggle(&mut self);
     fn munch(&mut self);
     fn length(&mut self);
@@ -24,7 +24,7 @@ pub trait Noise {
 }
 
 impl Noise for Client {
-    fn noise_find(&mut self, query: &Vec<String>, max: Option<u32>, append: bool) {
+    fn find(&mut self, query: &Vec<String>, max: Option<u32>, append: bool) {
         let query = query.join(" ");
         let max = max.unwrap_or(self.stats().unwrap().songs);
 
@@ -38,7 +38,7 @@ impl Noise for Client {
         }
     }
 
-    fn noise_search(&mut self, query: &Vec<String>, max: Option<u32>) {
+    fn search(&mut self, query: &Vec<String>, max: Option<u32>) {
         let query = query.join(" ");
         let max = max.unwrap_or(self.stats().unwrap().songs);
 
@@ -48,7 +48,7 @@ impl Noise for Client {
             .for_each(|x| println!("{}", x.file));
     }
 
-    fn noise_crossfade(&mut self, seconds: Option<i64>) {
+    fn crossfade(&mut self, seconds: Option<i64>) {
         if let Some(seconds) = seconds {
             self.crossfade(seconds).unwrap();
         } else {
@@ -62,7 +62,7 @@ impl Noise for Client {
         }
     }
 
-    fn noise_play(&mut self, track: Option<u32>) {
+    fn play(&mut self, track: Option<u32>) {
         if let Some(i) = track {
             self.switch(i).unwrap();
         } else {
@@ -79,9 +79,8 @@ impl Noise for Client {
     }
 
     fn munch(&mut self) {
-        // let current_song = self.currentsong().unwrap().unwrap().place.unwrap();
-        // self.delete(current_song).unwrap();
-        todo!("Not net implemented")
+        let current_song = self.currentsong().unwrap().unwrap().place.unwrap();
+        self.delete(current_song.pos).unwrap();
     }
 
     fn length(&mut self) {
@@ -175,12 +174,23 @@ impl Noise for Client {
             State::Play => "playing",
         };
 
+        fn to_mins_string(dur: Duration) -> String {
+            let seconds = dur.as_secs();
+
+            let minutes = seconds / 60;
+            let rem_seconds = seconds % 60;
+
+            format!("{minutes:02}:{rem_seconds:02}")
+        }
+
         let duration = status.time.map_or("".into(), |(stamp, total)| {
             let stamp = to_mins_string(stamp);
             let total = to_mins_string(total);
             format!("{stamp}/{total}")
         });
 
+        // let pos_in_queue = format!("{current_pos}/{queue_lenth}");
+
         output.push(format!("[{state}] {duration}"));
 
         output.join("\n")
@@ -198,16 +208,16 @@ fn format_song(song: Song) -> String {
 // fn get_status(client: &mut Client, verbose: bool) -> String {}
 
 fn send_notification(body: &str) {
+    let key = "XDG_SESSION_TYPE";
+    match env::var(key) {
+        Ok(key) => {
+            if key != "tty" {
                 libnotify::init("noise").unwrap();
                 let notify = Notification::new("Noise", Some(body), None);
                 notify.show().unwrap();
-}
-
-fn to_mins_string(dur: Duration) -> String {
-    let seconds = dur.as_secs();
-
-    let minutes = seconds / 60;
-    let rem_seconds = seconds % 60;
-
-    format!("{minutes:02}:{rem_seconds:02}")
+                libnotify::uninit();
+            }
+        }
+        Err(_) => return,
+    }
 }

src/noise/parser.rs

@@ -29,6 +29,13 @@ pub struct Cli {
 
 #[derive(Subcommand, Debug, PartialEq)]
 pub enum Commands {
+    /// Stops playing
+    Stop,
+    /// Play queueueu
+    Play {
+        #[arg(value_hint = ValueHint::CommandString)]
+        track: Option<u32>,
+    },
     /// Toggle MPD playback
     #[command(visible_alias = "t")]
     Toggle,
@@ -37,14 +44,6 @@ pub enum Commands {
     Next,
     /// Revert to the previous track
     Prev,
-    /// Stops playing
-    Stop,
-    /// Play queueueu
-    #[command(visible_alias = "start")]
-    Play {
-        #[arg(value_hint = ValueHint::Other)]
-        track: Option<u32>,
-    },
     /// Set or get crossfade
     #[command(visible_alias = "fade")]
     Crossfade {
@@ -53,8 +52,6 @@ pub enum Commands {
     },
     // ///Update still needs some work
     // Update,
-    /// Return currently playing song
-    Current,
     /// Clear current queueueu
     Clear,
     /// Query database
@@ -71,6 +68,8 @@ pub enum Commands {
         // #[arg(short, long)]
         // insert: Option<u32>,
     },
+    /// Return currently playing song
+    Current,
     /// Query database autistically
     #[command(visible_alias = "fd")]
     Find {
@@ -110,6 +109,7 @@ pub enum Commands {
         #[arg(value_hint = ValueHint::Other)]
         percentage: Option<i8>,
     },
+    /// Remove the current track
     Munch,
     Length,
 }