1 files changed, 21 insertions, 3 deletions

diff --git a/src/daemon.rs b/src/daemon.rs
index 0921e11..cca9b11 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -1,5 +1,6 @@
 use crate::audio::AudioEngine;
 use crate::config::Config;
+use crate::notification;
 use crate::queue::{Queue, ShuffleMode, Track};
 use std::io::{Read, Write};
 use std::os::unix::net::{UnixListener, UnixStream};
@@ -97,12 +98,15 @@ pub fn start_daemon() -> Result<(), Box<dyn std::error::Error>> {
         {
             let original_position = q.position();
             let mut started = false;
+            let mut had_next = false;
             let max_trials = 4usize;
             for _ in 0..max_trials {
                 if let Some(next_track) = q.next() {
+                    had_next = true;
                     audio_engine.play(next_track.clone());
                     if wait_for_start(&audio_engine, &next_track, 500) {
                         started = true;
+                        notification::notify_track(&Track::from_path(next_track));
                         break;
                     }
                 } else {
@@ -112,6 +116,11 @@ pub fn start_daemon() -> Result<(), Box<dyn std::error::Error>> {
             if !started {
                 q.set_position(original_position);
                 audio_engine.stop();
+                if had_next {
+                    notification::notify_error("Playback failed");
+                } else {
+                    notification::notify_queue_ended();
+                }
             }
         }
 
@@ -286,10 +295,12 @@ fn process_command(
         "next" => {
             if let Ok(mut q) = queue.lock() {
                 if let Some(next_track) = q.next() {
-                    audio.play(next_track);
+                    audio.play(next_track.clone());
+                    notification::notify_track(&Track::from_path(next_track));
                     "Playing next track\n".to_string()
                 } else {
                     audio.stop();
+                    notification::notify_queue_ended();
                     "Queue empty, stopped\n".to_string()
                 }
             } else {
@@ -299,7 +310,8 @@ fn process_command(
         "previous" => {
             if let Ok(mut q) = queue.lock() {
                 if let Some(prev_track) = q.previous() {
-                    audio.play(prev_track);
+                    audio.play(prev_track.clone());
+                    notification::notify_track(&Track::from_path(prev_track));
                     "Playing previous track\n".to_string()
                 } else {
                     "No previous track\n".to_string()
@@ -378,6 +390,7 @@ fn process_command(
                             }
                             if let Some(track) = q.track_at(q.position()) {
                                 audio.play(track.path.clone());
+                                notification::notify_track(track);
                             }
                             format!("Playing now: {}\n", path_str)
                         }
@@ -389,7 +402,9 @@ fn process_command(
                             let was_playing = audio.is_playing();
                             q.add_track(path.clone());
                             if !was_playing {
+                                let track = Track::from_path(path.clone());
                                 audio.play(path);
+                                notification::notify_track(&track);
                                 format!("Playing: {}\n", path_str)
                             } else {
                                 format!("Queued: {}\n", path_str)
@@ -415,6 +430,7 @@ fn process_command(
                                     }
                                     if let Some(track) = q.track_at(q.position()) {
                                         audio.play(track.path.clone());
+                                        notification::notify_track(track);
                                     }
                                     format!(
                                         "Playing now: {} tracks from {}\n",
@@ -439,7 +455,9 @@ fn process_command(
                                     if !audio.is_playing()
                                         && let Some(track) = files.first()
                                     {
-                                        audio.play(track.clone());
+                                        let track = Track::from_path(track.clone());
+                                        audio.play(track.path.clone());
+                                        notification::notify_track(&track);
                                     }
                                     format!("Queued {} tracks from: {}\n", files.len(), path_str)
                                 }