From 16a6a15ba2b6ba260c872c7b91ccc87d80ac365d Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Fri, 15 Aug 2025 22:05:17 +0200 Subject: [PATCH] chore: `cargo fmt` --- src/commands.rs | 17 +++++++++-------- src/library.rs | 39 ++++++++++++++++++++------------------- src/model/artist.rs | 7 ++++--- src/model/playlist.rs | 9 +++++---- src/mpris.rs | 21 +++++++++++---------- src/queue.rs | 14 ++++++++------ src/ui/artist.rs | 18 ++++++++++-------- src/ui/contextmenu.rs | 19 ++++++++++--------- src/ui/layout.rs | 17 ++++++++++------- src/ui/listview.rs | 31 ++++++++++++++++--------------- src/ui/statusbar.rs | 11 ++++++----- 11 files changed, 109 insertions(+), 94 deletions(-) diff --git a/src/commands.rs b/src/commands.rs index dad3562..89eca7c 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -282,14 +282,15 @@ impl CommandManager { } Command::AddCurrent => { if let Some(track) = self.queue.get_current() - && let Some(track) = track.track() { - let dialog = ContextMenu::add_track_dialog( - self.library.clone(), - self.queue.get_spotify(), - track, - ); - s.add_layer(dialog); - } + && let Some(track) = track.track() + { + let dialog = ContextMenu::add_track_dialog( + self.library.clone(), + self.queue.get_spotify(), + track, + ); + s.add_layer(dialog); + } Ok(None) } Command::SaveCurrent => { diff --git a/src/library.rs b/src/library.rs index e033d8d..d0050db 100644 --- a/src/library.rs +++ b/src/library.rs @@ -157,13 +157,14 @@ impl Library { .position(|i| i.id == id); if let Some(position) = position - && self.spotify.api.delete_playlist(id).is_ok() { - self.playlists.write().unwrap().remove(position); - self.save_cache( - &config::cache_path(CACHE_PLAYLISTS), - &self.playlists.read().unwrap(), - ); - } + && self.spotify.api.delete_playlist(id).is_ok() + { + self.playlists.write().unwrap().remove(position); + self.save_cache( + &config::cache_path(CACHE_PLAYLISTS), + &self.playlists.read().unwrap(), + ); + } } /// Set the playlist with `id` to contain only `tracks`. If the playlist already contains @@ -699,9 +700,9 @@ impl Library { .api .current_user_saved_albums_add(vec![album_id.as_str()]) .is_err() - { - return; - } + { + return; + } { let mut store = self.albums.write().unwrap(); @@ -731,9 +732,9 @@ impl Library { .api .current_user_saved_albums_delete(vec![album_id.as_str()]) .is_err() - { - return; - } + { + return; + } { let mut store = self.albums.write().unwrap(); @@ -768,9 +769,9 @@ impl Library { .api .user_follow_artists(vec![artist_id.as_str()]) .is_err() - { - return; - } + { + return; + } { let mut store = self.artists.write().unwrap(); @@ -803,9 +804,9 @@ impl Library { .api .user_unfollow_artists(vec![artist_id.as_str()]) .is_err() - { - return; - } + { + return; + } { let mut store = self.artists.write().unwrap(); diff --git a/src/model/artist.rs b/src/model/artist.rs index f9c1d0d..792a8b6 100644 --- a/src/model/artist.rs +++ b/src/model/artist.rs @@ -34,9 +34,10 @@ impl Artist { fn load_top_tracks(&mut self, spotify: Spotify) { if let Some(artist_id) = &self.id - && self.tracks.is_none() { - self.tracks = spotify.api.artist_top_tracks(artist_id).ok(); - } + && self.tracks.is_none() + { + self.tracks = spotify.api.artist_top_tracks(artist_id).ok(); + } } } diff --git a/src/model/playlist.rs b/src/model/playlist.rs index c7770ce..ad8142a 100644 --- a/src/model/playlist.rs +++ b/src/model/playlist.rs @@ -88,10 +88,11 @@ impl Playlist { .api .append_tracks(&self.id, new_tracks, None) .is_ok() - && let Some(tracks) = &mut self.tracks { - tracks.append(&mut new_tracks.to_vec()); - has_modified = true; - } + && let Some(tracks) = &mut self.tracks + { + tracks.append(&mut new_tracks.to_vec()); + has_modified = true; + } if has_modified { library.playlist_update(self); diff --git a/src/mpris.rs b/src/mpris.rs index 5cfd159..321c714 100644 --- a/src/mpris.rs +++ b/src/mpris.rs @@ -394,16 +394,17 @@ impl MprisPlayer { match uri_type { Some(UriType::Album) => { if let Ok(a) = self.spotify.api.album(&id) - && let Some(t) = &Album::from(&a).tracks { - let should_shuffle = self.queue.get_shuffle(); - self.queue.clear(); - let index = self.queue.append_next( - &t.iter() - .map(|track| Playable::Track(track.clone())) - .collect(), - ); - self.queue.play(index, should_shuffle, should_shuffle) - } + && let Some(t) = &Album::from(&a).tracks + { + let should_shuffle = self.queue.get_shuffle(); + self.queue.clear(); + let index = self.queue.append_next( + &t.iter() + .map(|track| Playable::Track(track.clone())) + .collect(), + ); + self.queue.play(index, should_shuffle, should_shuffle) + } } Some(UriType::Track) => { if let Ok(t) = self.spotify.api.track(&id) { diff --git a/src/queue.rs b/src/queue.rs index 4e78767..e200ffc 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -360,9 +360,10 @@ impl Queue { if repeat == RepeatSetting::RepeatTrack && !manual { if let Some(index) = current - && q[index].is_playable() { - self.play(index, false, false); - } + && q[index].is_playable() + { + self.play(index, false, false); + } } else if let Some(index) = self.next_index() { self.play(index, false, false); if repeat == RepeatSetting::RepeatTrack && manual { @@ -492,9 +493,10 @@ pub fn send_notification(summary_txt: &str, body_txt: &str, cover_url: Option "Unsave album", - false => "Save album", - }, - ContextMenuAction::ToggleSavedStatus(a.as_listitem()), - ); - } + && let Some(savestatus) = a.is_saved(&library) + { + content.add_item( + match savestatus { + true => "Unsave album", + false => "Save album", + }, + ContextMenuAction::ToggleSavedStatus(a.as_listitem()), + ); + } // open detail view of artist/album { diff --git a/src/ui/layout.rs b/src/ui/layout.rs index 2e93c55..ddeb252 100644 --- a/src/ui/layout.rs +++ b/src/ui/layout.rs @@ -166,9 +166,10 @@ impl Layout { fn get_result(&self) -> Result, String> { if let Some(t) = self.result_time - && t.elapsed().unwrap() > Duration::from_secs(5) { - return Ok(None); - } + && t.elapsed().unwrap() > Duration::from_secs(5) + { + return Ok(None); + } self.result.clone() } @@ -467,10 +468,12 @@ impl ViewExt for Layout { // Clear search results and return to search bar // If trying to focus search screen while already on it let search_view_name = "search"; - if view == search_view_name && self.focus == Some(search_view_name.into()) - && let Some(stack) = self.stack.get_mut(search_view_name) { - stack.clear(); - } + if view == search_view_name + && self.focus == Some(search_view_name.into()) + && let Some(stack) = self.stack.get_mut(search_view_name) + { + stack.clear(); + } if self.screens.keys().any(|k| k == view) { self.set_screen(view.clone()); diff --git a/src/ui/listview.rs b/src/ui/listview.rs index 90c2761..64c65c4 100644 --- a/src/ui/listview.rs +++ b/src/ui/listview.rs @@ -278,13 +278,13 @@ impl ListView { if let Some(target) = clicked_list_item && let Some(view) = target.open(self.queue.clone(), self.library.clone()) - { - return MouseHandleResult::Handled(EventResult::Consumed(Some( - Callback::from_fn_once(move |s| { - s.on_layout(|_, mut l| l.push_view(view)); - }), - ))); - } + { + return MouseHandleResult::Handled(EventResult::Consumed(Some( + Callback::from_fn_once(move |s| { + s.on_layout(|_, mut l| l.push_view(view)); + }), + ))); + } } } } @@ -544,14 +544,15 @@ impl ViewExt for ListView { }; if let Some(track) = item - && let Some(track) = track.track() { - let dialog = ContextMenu::add_track_dialog( - self.library.clone(), - self.queue.get_spotify(), - track, - ); - return Ok(CommandResult::Modal(Box::new(dialog))); - } + && let Some(track) = track.track() + { + let dialog = ContextMenu::add_track_dialog( + self.library.clone(), + self.queue.get_spotify(), + track, + ); + return Ok(CommandResult::Modal(Box::new(dialog))); + } return Ok(CommandResult::Consumed(None)); } diff --git a/src/ui/statusbar.rs b/src/ui/statusbar.rs index 0d574b4..437601d 100644 --- a/src/ui/statusbar.rs +++ b/src/ui/statusbar.rs @@ -227,11 +227,12 @@ impl View for StatusBar { } if event == MouseEvent::Press(MouseButton::Left) - && let Some(playable) = self.queue.get_current() { - let f: f32 = position.x as f32 / self.last_size.x as f32; - let new = playable.duration() as f32 * f; - self.spotify.seek(new as u32); - } + && let Some(playable) = self.queue.get_current() + { + let f: f32 = position.x as f32 / self.last_size.x as f32; + let new = playable.duration() as f32 * f; + self.spotify.seek(new as u32); + } } else if self.last_size.x - position.x < volume_len { if event == MouseEvent::WheelUp { let volume = self