anas-elgarhy/cmus-notify
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases 1 Packages Wiki Activity

Update notification image for tracks with covers

Browse source
This commit is contained in:
Anas Elgarhy 2023-02-19 12:55:33 +02:00
parent 9e37b59573
commit 1bd4f7e034
No known key found for this signature in database
GPG key ID: 0501802A1D496528
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/bin/cmus-notify.rs
View file

@ -105,6 +105,7 @@ fn main() {
}; };
// Set the notification cover. // Set the notification cover.
if cover_changed { if cover_changed {
notification = notify_rust::Notification::new(); // Reset the notification.
cover.set_notification_image(&mut notification); cover.set_notification_image(&mut notification);
} }
} }

24
src/lib.rs
View file

@ -121,7 +121,7 @@ pub enum TrackCover {
Embedded(image::DynamicImage), Embedded(image::DynamicImage),
/// The cover is an external file. /// The cover is an external file.
/// The `String` contains the absolute path of the external file. /// The `String` contains the absolute path of the external file.
External(String), External(image::DynamicImage),
/// The track does not have a cover. /// The track does not have a cover.
None, None,
} }
@ -130,20 +130,17 @@ impl TrackCover {
pub fn set_notification_image(&self, notification: &mut notify_rust::Notification) { pub fn set_notification_image(&self, notification: &mut notify_rust::Notification) {
use TrackCover::*; use TrackCover::*;
match self { match self {
Embedded(cover) => { Embedded(cover) | External(cover) => {
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
debug!("Setting the embedded cover as the notification image."); debug!("Setting the cover as the notification image.");
let Ok(image) = notify_rust::Image::try_from(cover.clone()) else { return; }; let Ok(image) = notify_rust::Image::try_from(cover.clone()) else { return; };
notification.image_data(image); notification.image_data(image);
} }
External(cover_path) => {
#[cfg(feature = "debug")]
debug!("Setting the external cover as the notification image.");
let _ = notification.image(cover_path);
}
None => { None => {
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
debug!("The track does not have a cover."); debug!("The track does not have a cover.");
// reset the notification image
notification.image_path("");
} }
} }
} }
@ -160,13 +157,13 @@ pub fn track_cover(
force_use_external_cover: bool, force_use_external_cover: bool,
no_use_external_cover: bool, no_use_external_cover: bool,
) -> TrackCover { ) -> TrackCover {
/*if !force_use_external_cover { if !force_use_external_cover {
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
info!("Trying to get the embedded cover of \"{track_path}\"."); info!("Trying to get the embedded cover of \"{track_path}\".");
if let Ok(Some(cover)) = get_embedded_art(track_path) { if let Ok(Some(cover)) = get_embedded_art(track_path) {
return TrackCover::Embedded(cover); return TrackCover::Embedded(cover);
} }
}*/ }
if !no_use_external_cover { if !no_use_external_cover {
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
@ -176,6 +173,13 @@ pub fn track_cover(
max_depth, max_depth,
&regex::Regex::new(r".*\.(jpg|jpeg|png|gif)$").unwrap(), &regex::Regex::new(r".*\.(jpg|jpeg|png|gif)$").unwrap(),
) { ) {
#[cfg(feature = "debug")]
info!("Found the external cover \"{cover}\".");
let Ok(cover) = image::open(cover) else {
#[cfg(feature = "debug")]
info!("Could not open the external cover.");
return TrackCover::None;
};
return TrackCover::External(cover); return TrackCover::External(cover);
} }
} }