johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-25 20:37:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement some Clippy suggestions

Browse source
This commit is contained in:
Elias Projahn 2025-08-10 12:37:33 +02:00
parent 66af523d5a
commit 8d9690dad6
22 changed files with 57 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/album_page.rs
View file

@ -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::<Vec<PlaylistItem>>();
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::<Vec<PlaylistItem>>();
self.player().append_and_play(playlist);

2
src/album_tile.rs
View file

@ -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

2
src/editor/program.rs
View file

@ -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();

2
src/editor/recording.rs
View file

@ -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()

3
src/editor/tracks.rs
View file

@ -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::<Vec<Work>>()
};

18
src/editor/work.rs
View file

@ -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();

2
src/editor/work/part_row.rs
View file

@ -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(

4
src/empty_page.rs
View file

@ -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"));

14
src/library/edit.rs
View file

@ -209,7 +209,7 @@ impl Library {
) -> Result<Work> {
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<Work>,
@ -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,

20
src/library/exchange.rs
View file

@ -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) => {

1
src/library/query.rs
View file

@ -414,7 +414,6 @@ impl Library {
works,
recordings,
albums,
..Default::default()
}
}
LibraryQuery {

2
src/main.rs
View file

@ -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,

18
src/player.rs
View file

@ -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,
));
}

2
src/program.rs
View file

@ -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(

2
src/program_tile.rs
View file

@ -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);
});
}

8
src/recording_tile.rs
View file

@ -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

8
src/search_page.rs
View file

@ -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 {

2
src/selector/recording.rs
View file

@ -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();

2
src/selector/work.rs
View file

@ -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();

2
src/util.rs
View file

@ -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();

2
src/util/error_dialog.rs
View file

@ -61,7 +61,7 @@ glib::wrapper! {
impl ErrorDialog {
pub fn present(err: &anyhow::Error, parent: &impl IsA<gtk::Widget>) {
let obj: Self = glib::Object::builder()
.property("error-text", &format!("{err:?}"))
.property("error-text", format!("{err:?}"))
.build();
obj.present(Some(parent));

4
src/window.rs
View file

@ -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();