diff --git a/src/model/playlist.rs b/src/model/playlist.rs index ccaf7f4..c4441b3 100644 --- a/src/model/playlist.rs +++ b/src/model/playlist.rs @@ -95,8 +95,8 @@ impl Playlist { } pub fn sort(&mut self, key: &SortKey, direction: &SortDirection) { - fn compare_artists(a: &Vec, b: &Vec) -> Ordering { - let sanitize_artists_name = |x: &Vec| -> Vec { + fn compare_artists(a: &[String], b: &[String]) -> Ordering { + let sanitize_artists_name = |x: &[String]| -> Vec { x.iter() .map(|x| { x.to_lowercase() @@ -125,9 +125,9 @@ impl Playlist { if let Some(c) = self.tracks.as_mut() { c.sort_by(|a, b| match (a.track(), b.track()) { (Some(a), Some(b)) => { - let (a, b) = match direction { - &SortDirection::Ascending => (a, b), - &SortDirection::Descending => (b, a), + let (a, b) = match *direction { + SortDirection::Ascending => (a, b), + SortDirection::Descending => (b, a), }; match *key { SortKey::Title => a.title.to_lowercase().cmp(&b.title.to_lowercase()), diff --git a/src/queue.rs b/src/queue.rs index cb1c545..978d676 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -417,14 +417,14 @@ pub fn send_notification(track_name: &str, _cover_url: Option) { let path = crate::utils::cache_path_for_url(u.to_string()); if !path.exists() { - if let Err(e) = crate::utils::download(u.to_string(), path.clone()) { + if let Err(e) = crate::utils::download(u, path.clone()) { error!("Failed to download cover: {}", e); } } Notification::new() .summary(track_name) - .icon(&path.to_str().unwrap()) + .icon(path.to_str().unwrap()) .show() } else { Notification::new().summary(track_name).show()