From ac7c1ab569a382cfafd603395a9b68f115a3e95c Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sat, 28 Sep 2024 23:03:39 +0300 Subject: [PATCH] Add force remove remote --- locales/en_US.json | 5 +- src/bin/gui/flatpak_manage_page/mod.rs | 74 +++++++++++++++++++++----- 2 files changed, 65 insertions(+), 14 deletions(-) diff --git a/locales/en_US.json b/locales/en_US.json index 0492a22..625be19 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -141,5 +141,8 @@ "flatpak_remote_add_error_dialog_heading": "Flatpak Remote Changes Failed Error:", "flatpak_remote_add_error_dialog_ok_label": "OK", "flatpak_remote_add_name_prefrencesgroup_title": "Remote Name", - "flatpak_remote_add_url_prefrencesgroup_title": "Remote Ref URL (flatpakrepo)" + "flatpak_remote_add_url_prefrencesgroup_title": "Remote Ref URL (flatpakrepo)", + "flatpak_remote_add_error_dialog_used_error_body": "Should We Force Remove The Remote Alongside Everything Using It?", + "flatpak_remote_add_error_used_no_label": "No", + "flatpak_remote_add_error_used_yes_label": "Yes" } \ No newline at end of file diff --git a/src/bin/gui/flatpak_manage_page/mod.rs b/src/bin/gui/flatpak_manage_page/mod.rs index 9471898..b62d526 100644 --- a/src/bin/gui/flatpak_manage_page/mod.rs +++ b/src/bin/gui/flatpak_manage_page/mod.rs @@ -328,18 +328,18 @@ pub fn flatpak_manage_page( |_| { { - let (mut installation, mut remote_name): (libflatpak::Installation, libflatpak::glib::GString); + let (mut installation, mut remote_name, mut cmd_installation): (libflatpak::Installation, libflatpak::glib::GString, String); { let flatpak_remotes_selection_model = flatpak_remotes_selection_model_rc.borrow(); let selection = flatpak_remotes_selection_model.selected_item().unwrap(); let item = selection.downcast_ref::().unwrap(); let flatpak_remote: Ref = item.borrow(); - (installation, remote_name) = match flatpak_remote.deref() { + (installation, remote_name, cmd_installation) = match flatpak_remote.deref() { FlatpakRemote::System(remote) => { - (libflatpak::Installation::new_system(cancellable_no).unwrap(), remote.name().unwrap_or_default()) + (libflatpak::Installation::new_system(cancellable_no).unwrap(), remote.name().unwrap_or_default(), "--system".to_string()) } FlatpakRemote::User(remote) => { - (libflatpak::Installation::new_user(cancellable_no).unwrap(), remote.name().unwrap_or_default()) + (libflatpak::Installation::new_user(cancellable_no).unwrap(), remote.name().unwrap_or_default(), "--user".to_string()) } }; } @@ -348,15 +348,63 @@ pub fn flatpak_manage_page( retry_signal_action.activate(None); } Err(e) => { - let flatpak_remote_add_error_dialog = adw::MessageDialog::builder() - .heading(t!("flatpak_remote_add_error_dialog_heading")) - .body(e.to_string()) - .build(); - flatpak_remote_add_error_dialog.add_response( - "flatpak_remote_add_error_dialog_ok", - &t!("flatpak_remote_add_error_dialog_ok_label").to_string(), - ); - flatpak_remote_add_error_dialog.present(); + match e.matches(libflatpak::Error::RemoteUsed) { + true => { + let flatpak_remote_add_error_dialog = adw::MessageDialog::builder() + .heading(t!("flatpak_remote_add_error_dialog_heading")) + .body(e.to_string() + "\n" + &t!("flatpak_remote_add_error_dialog_used_error_body").to_string()) + .build(); + flatpak_remote_add_error_dialog.add_response( + "flatpak_remote_add_error_dialog_used_no", + &t!("flatpak_remote_add_error_used_no_label").to_string(), + ); + flatpak_remote_add_error_dialog.add_response( + "flatpak_remote_add_error_dialog_used_yes", + &t!("flatpak_remote_add_error_used_yes_label").to_string(), + ); + flatpak_remote_add_error_dialog.set_response_appearance( + "flatpak_remote_add_error_dialog_used_yes", + adw::ResponseAppearance::Destructive, + ); + let retry_signal_action_clone0 = retry_signal_action.clone(); + flatpak_remote_add_error_dialog.clone() + .choose(None::<&gio::Cancellable>, move |choice| { + match choice.as_str() { + "flatpak_remote_add_error_dialog_used_yes" => { + match duct::cmd!("flatpak", "remote-delete", "--force", "--noninteractive", &cmd_installation, &remote_name).run() { + Ok(_) => { + retry_signal_action_clone0.activate(None); + } + Err(e) => { + let flatpak_remote_add_error_dialog = adw::MessageDialog::builder() + .heading(t!("flatpak_remote_add_error_dialog_heading")) + .body(e.to_string()) + .build(); + flatpak_remote_add_error_dialog.add_response( + "flatpak_remote_add_error_dialog_ok", + &t!("flatpak_remote_add_error_dialog_ok_label").to_string(), + ); + flatpak_remote_add_error_dialog.present(); + } + } + } + _ => {} + } + } + ); + } + false => { + let flatpak_remote_add_error_dialog = adw::MessageDialog::builder() + .heading(t!("flatpak_remote_add_error_dialog_heading")) + .body(e.to_string()) + .build(); + flatpak_remote_add_error_dialog.add_response( + "flatpak_remote_add_error_dialog_ok", + &t!("flatpak_remote_add_error_dialog_ok_label").to_string(), + ); + flatpak_remote_add_error_dialog.present(); + } + } } } }