From 8d9690dad65e554e772fb63a8e821afffca0c06f Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Sun, 10 Aug 2025 12:37:33 +0200 Subject: [PATCH] Implement some Clippy suggestions --- src/album_page.rs | 6 ++---- src/album_tile.rs | 2 +- src/editor/program.rs | 2 +- src/editor/recording.rs | 2 +- src/editor/tracks.rs | 3 +-- src/editor/work.rs | 18 ++++++++---------- src/editor/work/part_row.rs | 2 +- src/empty_page.rs | 4 ++-- src/library/edit.rs | 14 ++++++-------- src/library/exchange.rs | 20 ++++++++------------ src/library/query.rs | 1 - src/main.rs | 2 +- src/player.rs | 18 +++++++++--------- src/program.rs | 2 +- src/program_tile.rs | 2 +- src/recording_tile.rs | 8 ++++---- src/search_page.rs | 8 ++++---- src/selector/recording.rs | 2 +- src/selector/work.rs | 2 +- src/util.rs | 2 +- src/util/error_dialog.rs | 2 +- src/window.rs | 4 ++-- 22 files changed, 57 insertions(+), 69 deletions(-) diff --git a/src/album_page.rs b/src/album_page.rs index dfab603..2eb51e3 100644 --- a/src/album_page.rs +++ b/src/album_page.rs @@ -72,8 +72,7 @@ mod imp { .unwrap() .recordings .iter() - .map(|r| obj.player().recording_to_playlist(r)) - .flatten() + .flat_map(|r| obj.player().recording_to_playlist(r)) .collect::>(); if let Err(err) = obj.player().append(playlist) { @@ -165,8 +164,7 @@ impl AlbumPage { .unwrap() .recordings .iter() - .map(|r| self.player().recording_to_playlist(r)) - .flatten() + .flat_map(|r| self.player().recording_to_playlist(r)) .collect::>(); self.player().append_and_play(playlist); diff --git a/src/album_tile.rs b/src/album_tile.rs index 73667cb..464b98e 100644 --- a/src/album_tile.rs +++ b/src/album_tile.rs @@ -45,7 +45,7 @@ impl AlbumTile { pub fn new(album: &Album) -> Self { let obj: Self = glib::Object::new(); - obj.imp().title_label.set_label(&album.name.get()); + obj.imp().title_label.set_label(album.name.get()); obj.imp().album.set(album.clone()).unwrap(); obj diff --git a/src/editor/program.rs b/src/editor/program.rs index 708c7b0..1ae1cca 100644 --- a/src/editor/program.rs +++ b/src/editor/program.rs @@ -69,7 +69,7 @@ mod imp { self.parent_constructed(); let set_design_action = gio::ActionEntry::builder("set-design") - .parameter_type(Some(&glib::VariantTy::STRING)) + .parameter_type(Some(glib::VariantTy::STRING)) .state(glib::Variant::from("program-1")) .build(); diff --git a/src/editor/recording.rs b/src/editor/recording.rs index 4d60e66..a8029e7 100644 --- a/src/editor/recording.rs +++ b/src/editor/recording.rs @@ -246,7 +246,7 @@ impl RecordingEditor { } fn set_work(&self, work: Work) { - self.imp().work_row.set_title(&work.name.get()); + self.imp().work_row.set_title(work.name.get()); self.imp().work_row.set_subtitle( &work .composers_string() diff --git a/src/editor/tracks.rs b/src/editor/tracks.rs index 4c05e47..caf356c 100644 --- a/src/editor/tracks.rs +++ b/src/editor/tracks.rs @@ -245,8 +245,7 @@ impl TracksEditor { .track_rows .borrow() .iter() - .map(|t| t.track_data().parts.clone()) - .flatten() + .flat_map(|t| t.track_data().parts.clone()) .collect::>() }; diff --git a/src/editor/work.rs b/src/editor/work.rs index 18191c7..77f9d17 100644 --- a/src/editor/work.rs +++ b/src/editor/work.rs @@ -390,17 +390,15 @@ impl WorkEditor { }; self.emit_by_name::<()>("created", &[&part]); + } else if let Some(work_id) = self.imp().work_id.get() { + library + .update_work(work_id, name, parts, composers, instruments, enable_updates) + .unwrap(); } else { - if let Some(work_id) = self.imp().work_id.get() { - library - .update_work(work_id, name, parts, composers, instruments, enable_updates) - .unwrap(); - } else { - let work = library - .create_work(name, parts, composers, instruments, enable_updates) - .unwrap(); - self.emit_by_name::<()>("created", &[&work]); - } + let work = library + .create_work(name, parts, composers, instruments, enable_updates) + .unwrap(); + self.emit_by_name::<()>("created", &[&work]); } self.imp().navigation.get().unwrap().pop(); diff --git a/src/editor/work/part_row.rs b/src/editor/work/part_row.rs index b7d3e42..ca5ae1d 100644 --- a/src/editor/work/part_row.rs +++ b/src/editor/work/part_row.rs @@ -145,7 +145,7 @@ impl WorkEditorPartRow { } fn set_part(&self, part: Work) { - self.set_title(&part.name.get()); + self.set_title(part.name.get()); if !part.parts.is_empty() { self.set_subtitle( diff --git a/src/empty_page.rs b/src/empty_page.rs index 1cf2ffb..14acc04 100644 --- a/src/empty_page.rs +++ b/src/empty_page.rs @@ -92,8 +92,8 @@ impl EmptyPage { #[template_callback] async fn download_library(&self) { let dialog = adw::AlertDialog::builder() - .heading(&gettext("Disclaimer")) - .body(&gettext("You are about to download a library of audio files. These are from recordings that are in the public domain under EU law and are hosted on a server within the EU. Please ensure that you comply with the copyright laws of you country.")) + .heading(gettext("Disclaimer")) + .body(gettext("You are about to download a library of audio files. These are from recordings that are in the public domain under EU law and are hosted on a server within the EU. Please ensure that you comply with the copyright laws of you country.")) .build(); dialog.add_response("continue", &gettext("Continue")); diff --git a/src/library/edit.rs b/src/library/edit.rs index 1e71da9..b7d3134 100644 --- a/src/library/edit.rs +++ b/src/library/edit.rs @@ -209,7 +209,7 @@ impl Library { ) -> Result { let connection = &mut *self.imp().connection.get().unwrap().lock().unwrap(); - let work = self.create_work_priv( + let work = Self::create_work_priv( connection, name, parts, @@ -226,7 +226,6 @@ impl Library { } fn create_work_priv( - &self, connection: &mut SqliteConnection, name: TranslatedString, parts: Vec, @@ -242,7 +241,7 @@ impl Library { let work_data = tables::Work { work_id: work_id.clone(), parent_work_id: parent_work_id.map(|w| w.to_string()), - sequence_number: sequence_number, + sequence_number, name, created_at: now, edited_at: now, @@ -256,7 +255,7 @@ impl Library { .execute(connection)?; for (index, part) in parts.into_iter().enumerate() { - self.create_work_priv( + Self::create_work_priv( connection, part.name, part.parts, @@ -309,7 +308,7 @@ impl Library { ) -> Result<()> { let connection = &mut *self.imp().connection.get().unwrap().lock().unwrap(); - self.update_work_priv( + Self::update_work_priv( connection, work_id, name, @@ -327,7 +326,6 @@ impl Library { } fn update_work_priv( - &self, connection: &mut SqliteConnection, work_id: &str, name: TranslatedString, @@ -367,7 +365,7 @@ impl Library { .optional()? .is_some() { - self.update_work_priv( + Self::update_work_priv( connection, &part.work_id, part.name, @@ -381,7 +379,7 @@ impl Library { } else { // Note: The previously used ID is discarded. This should be OK, because // at this point, the part ID should not have been used anywhere. - self.create_work_priv( + Self::create_work_priv( connection, part.name, part.parts, diff --git a/src/library/exchange.rs b/src/library/exchange.rs index 3560d9f..acec25e 100644 --- a/src/library/exchange.rs +++ b/src/library/exchange.rs @@ -229,22 +229,18 @@ fn import_metadata_from_url_priv( formatx!(gettext("Downloading {}"), &url).unwrap(), )); - match runtime.block_on(download_tmp_file(&url, &sender)) { + match runtime.block_on(download_tmp_file(&url, sender)) { Ok(db_file) => { let _ = sender.send_blocking(ProcessMsg::Message( formatx!(gettext("Importing downloaded library"), &url).unwrap(), )); let _ = sender.send_blocking(ProcessMsg::Result( - import_metadata_from_file(db_file.path(), this_connection, true).and_then( - |tracks| { - if !tracks.is_empty() { - log::warn!("The metadata file at {url} contains tracks."); - } - - Ok(()) - }, - ), + import_metadata_from_file(db_file.path(), this_connection, true).map(|tracks| { + if !tracks.is_empty() { + log::warn!("The metadata file at {url} contains tracks."); + } + }), )); } Err(err) => { @@ -269,7 +265,7 @@ fn import_library_from_url_priv( formatx!(gettext("Downloading {}"), &url).unwrap(), )); - let archive_file = runtime.block_on(download_tmp_file(&url, &sender)); + let archive_file = runtime.block_on(download_tmp_file(&url, sender)); match archive_file { Ok(archive_file) => { @@ -281,7 +277,7 @@ fn import_library_from_url_priv( archive_file.path(), library_folder, this_connection, - &sender, + sender, ))); } Err(err) => { diff --git a/src/library/query.rs b/src/library/query.rs index 43b685f..502d354 100644 --- a/src/library/query.rs +++ b/src/library/query.rs @@ -414,7 +414,6 @@ impl Library { works, recordings, albums, - ..Default::default() } } LibraryQuery { diff --git a/src/main.rs b/src/main.rs index 14115fe..2a9821e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -46,7 +46,7 @@ fn main() -> glib::ExitCode { gettextrs::textdomain(config::PKGNAME).unwrap(); gio::resources_register( - &gio::Resource::load(&format!( + &gio::Resource::load(format!( "{}/{}/{}.gresource", config::DATADIR, config::PKGNAME, diff --git a/src/player.rs b/src/player.rs index 8f75d9a..da1c1bc 100644 --- a/src/player.rs +++ b/src/player.rs @@ -221,14 +221,14 @@ impl Player { items.push(PlaylistItem::new( true, recording.work.composers_string(), - &recording.work.name.get(), + recording.work.name.get(), Some(&performances), None, - &self.library_path_to_file_path(&tracks[0].path), + self.library_path_to_file_path(&tracks[0].path), &tracks[0].track_id, )); } else { - let mut tracks = tracks.into_iter(); + let mut tracks = tracks.iter(); let first_track = tracks.next().unwrap(); let track_title = |track: &Track, number: usize| -> String { @@ -249,10 +249,10 @@ impl Player { items.push(PlaylistItem::new( true, recording.work.composers_string(), - &recording.work.name.get(), + recording.work.name.get(), Some(&performances), - Some(&track_title(&first_track, 1)), - &self.library_path_to_file_path(&first_track.path), + Some(&track_title(first_track, 1)), + self.library_path_to_file_path(&first_track.path), &first_track.track_id, )); @@ -260,11 +260,11 @@ impl Player { items.push(PlaylistItem::new( false, recording.work.composers_string(), - &recording.work.name.get(), + recording.work.name.get(), Some(&performances), // track number = track index + 1 (first track) + 1 (zero based) - Some(&track_title(&track, index + 2)), - &self.library_path_to_file_path(&track.path), + Some(&track_title(track, index + 2)), + self.library_path_to_file_path(&track.path), &track.track_id, )); } diff --git a/src/program.rs b/src/program.rs index 803dbe5..435cd38 100644 --- a/src/program.rs +++ b/src/program.rs @@ -83,7 +83,7 @@ impl Program { } pub fn from_query(query: LibraryQuery) -> Self { - let settings = gio::Settings::new(&config::APP_ID); + let settings = gio::Settings::new(config::APP_ID); glib::Object::builder() .property( diff --git a/src/program_tile.rs b/src/program_tile.rs index 78f5718..d776864 100644 --- a/src/program_tile.rs +++ b/src/program_tile.rs @@ -56,7 +56,7 @@ mod imp { self.set_program_from_settings(&settings); let obj = self.obj().to_owned(); - settings.connect_changed(Some(&self.key.get().unwrap()), move |settings, _| { + settings.connect_changed(Some(self.key.get().unwrap()), move |settings, _| { obj.imp().set_program_from_settings(settings); }); } diff --git a/src/recording_tile.rs b/src/recording_tile.rs index 8ff1373..f7afd6c 100644 --- a/src/recording_tile.rs +++ b/src/recording_tile.rs @@ -69,7 +69,7 @@ mod imp { .push(&RecordingEditor::new( obj.imp().navigation.get().unwrap(), obj.imp().library.get().unwrap(), - Some(&obj.imp().recording.get().unwrap()), + Some(obj.imp().recording.get().unwrap()), )); }) .build(); @@ -90,8 +90,8 @@ mod imp { let delete_action = gio::ActionEntry::builder("delete") .activate(move |_, _, _| { let dialog = adw::AlertDialog::builder() - .heading(&gettext("Delete recording?")) - .body(&gettext("The recording will be removed from your music library and the corresponding audio files will be deleted. This action cannot be undone.")) + .heading(gettext("Delete recording?")) + .body(gettext("The recording will be removed from your music library and the corresponding audio files will be deleted. This action cannot be undone.")) .build(); dialog.add_response("delete", &gettext("Delete")); @@ -142,7 +142,7 @@ impl RecordingTile { let obj: Self = glib::Object::new(); let imp = obj.imp(); - imp.work_label.set_label(&recording.work.name.get()); + imp.work_label.set_label(recording.work.name.get()); imp.composer_label.set_label( &recording .work diff --git a/src/search_page.rs b/src/search_page.rs index ce7983b..21dc00f 100644 --- a/src/search_page.rs +++ b/src/search_page.rs @@ -391,7 +391,7 @@ impl SearchPage { imp.header_box.set_visible(!query.is_empty()); let highlight = if let Some(work) = &query.work { - imp.title_label.set_text(&work.name.get()); + imp.title_label.set_text(work.name.get()); if let Some(composers) = work.composers_string() { imp.subtitle_label.set_text(&composers); imp.subtitle_label.set_visible(true); @@ -400,15 +400,15 @@ impl SearchPage { } Some(Tag::Work(work.to_owned())) } else if let Some(person) = &query.composer { - imp.title_label.set_text(&person.name.get()); + imp.title_label.set_text(person.name.get()); imp.subtitle_label.set_visible(false); Some(Tag::Composer(person.to_owned())) } else if let Some(person) = &query.performer { - imp.title_label.set_text(&person.name.get()); + imp.title_label.set_text(person.name.get()); imp.subtitle_label.set_visible(false); Some(Tag::Performer(person.to_owned())) } else if let Some(ensemble) = &query.ensemble { - imp.title_label.set_text(&ensemble.name.get()); + imp.title_label.set_text(ensemble.name.get()); imp.subtitle_label.set_visible(false); Some(Tag::Ensemble(ensemble.to_owned())) } else if let Some(instrument) = &query.instrument { diff --git a/src/selector/recording.rs b/src/selector/recording.rs index eb16c67..1a256d8 100644 --- a/src/selector/recording.rs +++ b/src/selector/recording.rs @@ -294,7 +294,7 @@ impl RecordingSelectorPopover { .build(), ); - row.set_tooltip_text(Some(&work.name.get())); + row.set_tooltip_text(Some(work.name.get())); let work = work.clone(); let obj = self.clone(); diff --git a/src/selector/work.rs b/src/selector/work.rs index 46e84f1..c636d3a 100644 --- a/src/selector/work.rs +++ b/src/selector/work.rs @@ -256,7 +256,7 @@ impl WorkSelectorPopover { .build(), ); - row.set_tooltip_text(Some(&work.name.get())); + row.set_tooltip_text(Some(work.name.get())); let work = work.clone(); let obj = self.clone(); diff --git a/src/util.rs b/src/util.rs index ecf9f07..f1c1322 100644 --- a/src/util.rs +++ b/src/util.rs @@ -28,7 +28,7 @@ pub fn error_toast(msgid: &str, err: anyhow::Error, toast_overlay: &adw::ToastOv log::error!("{msgid}: {err:?}"); let toast = adw::Toast::builder() - .title(&gettext(msgid)) + .title(gettext(msgid)) .button_label("Details") .build(); diff --git a/src/util/error_dialog.rs b/src/util/error_dialog.rs index 50d8977..280386d 100644 --- a/src/util/error_dialog.rs +++ b/src/util/error_dialog.rs @@ -61,7 +61,7 @@ glib::wrapper! { impl ErrorDialog { pub fn present(err: &anyhow::Error, parent: &impl IsA) { let obj: Self = glib::Object::builder() - .property("error-text", &format!("{err:?}")) + .property("error-text", format!("{err:?}")) .build(); obj.present(Some(parent)); diff --git a/src/window.rs b/src/window.rs index 5a5cc61..220e270 100644 --- a/src/window.rs +++ b/src/window.rs @@ -202,8 +202,8 @@ mod imp { fn close_request(&self) -> glib::signal::Propagation { if self.process_manager.any_ongoing() { let dialog = adw::AlertDialog::builder() - .heading(&gettext("Close window?")) - .body(&gettext( + .heading(gettext("Close window?")) + .body(gettext( "There are ongoing processes that will be canceled.", )) .build();