lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse previous notification id

Browse Source 
According to XDG specs, passing the previous notification ID will update it
instead of displaying a new notification.

Fixes #760
This commit is contained in:
Henrik Friedrichsen
2022-03-22 22:02:37 +01:00
parent 90dd1a03d2
commit 1a7b5f90da
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/queue.rs
View File

@@ -1,4 +1,5 @@
use std::cmp::Ordering; use std::cmp::Ordering;
use std::sync::atomic::AtomicU32;
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use log::{debug, error, info}; use log::{debug, error, info};
@@ -36,6 +37,7 @@ pub struct Queue {
current_track: RwLock<Option<usize>>, current_track: RwLock<Option<usize>>,
spotify: Spotify, spotify: Spotify,
cfg: Arc<Config>, cfg: Arc<Config>,
notification_id: Arc<AtomicU32>,
} }
impl Queue { impl Queue {
@@ -47,6 +49,7 @@ impl Queue {
current_track: RwLock::new(state.current_track), current_track: RwLock::new(state.current_track),
random_order: RwLock::new(state.random_order), random_order: RwLock::new(state.random_order),
cfg, cfg,
notification_id: Arc::new(AtomicU32::new(0)),
}; };
if let Some(playable) = queue.get_current() { if let Some(playable) = queue.get_current() {
@@ -268,10 +271,11 @@ impl Queue {
#[cfg(feature = "notify")] #[cfg(feature = "notify")]
if self.cfg.values().notify.unwrap_or(false) { if self.cfg.values().notify.unwrap_or(false) {
let notification_id = self.notification_id.clone();
std::thread::spawn({ std::thread::spawn({
let track_name = track.to_string(); let track_name = track.to_string();
let cover_url = track.cover_url(); let cover_url = track.cover_url();
move || send_notification(&track_name, cover_url) move || send_notification(&track_name, cover_url, notification_id)
}); });
} }
} }
@@ -411,7 +415,12 @@ impl Queue {
} }
#[cfg(feature = "notify")] #[cfg(feature = "notify")]
pub fn send_notification(track_name: &str, _cover_url: Option<String>) { pub fn send_notification(
track_name: &str,
_cover_url: Option<String>,
notification_id: Arc<AtomicU32>,
) {
let current_notification_id = notification_id.load(std::sync::atomic::Ordering::Relaxed);
let res = if let Some(u) = _cover_url { let res = if let Some(u) = _cover_url {
// download album cover image // download album cover image
let path = crate::utils::cache_path_for_url(u.to_string()); let path = crate::utils::cache_path_for_url(u.to_string());
@@ -424,17 +433,27 @@ pub fn send_notification(track_name: &str, _cover_url: Option<String>) {
Notification::new() Notification::new()
.appname("ncspot") .appname("ncspot")
.id(current_notification_id)
.summary(track_name) .summary(track_name)
.icon(path.to_str().unwrap()) .icon(path.to_str().unwrap())
.show() .show()
} else { } else {
Notification::new() Notification::new()
.appname("ncspot") .appname("ncspot")
.id(current_notification_id)
.summary(track_name) .summary(track_name)
.show() .show()
}; };
if let Err(e) = res { if let Ok(n) = res {
let new_notification_id = n.id();
log::debug!(
"new notification id: {}, previously: {}",
new_notification_id,
current_notification_id
);
notification_id.store(new_notification_id, std::sync::atomic::Ordering::Relaxed);
} else if let Err(e) = res {
error!("Failed to send notification cover: {}", e); error!("Failed to send notification cover: {}", e);
} }
} }