lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edit: Stop saving operation on using "Cancel"

Browse source
This commit is contained in:
Sophie Herold 2025-01-29 13:24:36 +01:00
parent 129d1cfc7a
commit 5706b2eaeb
4 changed files with 60 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/util/gettext.rs
View file

@ -1,4 +1,4 @@
// Copyright (c) 2023-2024 Sophie Herold // Copyright (c) 2023-2025 Sophie Herold
// //
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by

2
src/widgets/edit/crop_selection.rs
View file

@ -194,8 +194,6 @@ mod imp {
#[template_child] #[template_child]
selection_move: TemplateChild<gtk::GestureDrag>, selection_move: TemplateChild<gtk::GestureDrag>,
#[template_child]
shortcuts: TemplateChild<gtk::ShortcutController>,
#[template_child] #[template_child]
selection_overlay: TemplateChild<gtk::Overlay>, selection_overlay: TemplateChild<gtk::Overlay>,

77
src/widgets/edit_window.rs
View file

@ -55,6 +55,7 @@ mod imp {
pub edit_crop: OnceCell<LpEditCrop>, pub edit_crop: OnceCell<LpEditCrop>,
pub(super) operations: RefCell<Option<Arc<Operations>>>, pub(super) operations: RefCell<Option<Arc<Operations>>>,
save_cancellable: RefCell<Option<gio::Cancellable>>,
} }
#[glib::object_subclass] #[glib::object_subclass]
@ -99,6 +100,9 @@ mod imp {
#[weak] #[weak]
obj, obj,
move |_| { move |_| {
if let Some(cancellable) = obj.imp().save_cancellable.replace(None) {
cancellable.cancel();
}
obj.window().show_image(); obj.window().show_image();
} }
)); ));
@ -137,6 +141,13 @@ mod imp {
self.done.popdown(); self.done.popdown();
if let Some(current_file) = obj.original_image().file() { if let Some(current_file) = obj.original_image().file() {
let cancellable = gio::Cancellable::new();
if let Some(old_cancellable) =
self.save_cancellable.replace(Some(cancellable.clone()))
{
old_cancellable.cancel();
}
let file_dialog = gtk::FileDialog::new(); let file_dialog = gtk::FileDialog::new();
let suggested_file = if let Some(path) = current_file.path() { let suggested_file = if let Some(path) = current_file.path() {
@ -162,14 +173,16 @@ mod imp {
new_path.set_file_name(new_filename); new_path.set_file_name(new_filename);
let file = gio::File::for_path(&new_path); let file = gio::File::for_path(&new_path);
let file_exists = file let file_exists = gio::CancellableFuture::new(
.query_info_future( file.query_info_future(
gio::FILE_ATTRIBUTE_STANDARD_NAME, gio::FILE_ATTRIBUTE_STANDARD_NAME,
gio::FileQueryInfoFlags::NONE, gio::FileQueryInfoFlags::NONE,
glib::Priority::DEFAULT, glib::Priority::DEFAULT,
) ),
.await cancellable.clone(),
.is_ok(); )
.await
.is_ok();
if !file_exists { if !file_exists {
suggested_file = Some(file); suggested_file = Some(file);
@ -192,7 +205,10 @@ mod imp {
log::error!("{}", err); log::error!("{}", err);
} }
Ok(new_file) => { Ok(new_file) => {
if self.save(current_file, new_file.clone()).await { if self
.save(current_file, new_file.clone(), cancellable.clone())
.await
{
obj.window().show_specific_image(new_file); obj.window().show_specific_image(new_file);
} }
} }
@ -217,25 +233,41 @@ mod imp {
tmp_path.set_file_name(file_stem); tmp_path.set_file_name(file_stem);
let new_file = gio::File::for_path(&tmp_path); let new_file = gio::File::for_path(&tmp_path);
let written = self.save(current_file.clone(), new_file.clone()).await;
let cancellable = gio::Cancellable::new();
if let Some(old_cancellable) =
self.save_cancellable.replace(Some(cancellable.clone()))
{
old_cancellable.cancel();
}
let written = self
.save(current_file.clone(), new_file.clone(), cancellable.clone())
.await;
if written { if written {
if let Err(err) = if let Err(err) = gio::CancellableFuture::new(
current_file.trash_future(glib::Priority::DEFAULT).await current_file.trash_future(glib::Priority::DEFAULT),
cancellable.clone(),
)
.await
{ {
obj.window().show_error( obj.window().show_error(
&gettext("Failed to save image."), &gettext("Failed to save image."),
&format!("Failed to move image {current_path:?} to trash and therefore couldn't save image: {err}"), &format!("Failed to move image {current_path:?} to trash and therefore couldn't save image: {err}"),
ErrorType::General, ErrorType::General,
); );
} else if let Err(err) = new_file } else if let Err(err) = gio::CancellableFuture::new(
.move_future( new_file
&current_file, .move_future(
gio::FileCopyFlags::NONE, &current_file,
glib::Priority::DEFAULT, gio::FileCopyFlags::NONE,
) glib::Priority::DEFAULT,
.0 )
.await .0,
cancellable.clone(),
)
.await
{ {
obj.window().show_error( obj.window().show_error(
&gettext("Failed to save image."), &gettext("Failed to save image."),
@ -257,13 +289,20 @@ mod imp {
/// Saves image with operations applies /// Saves image with operations applies
/// ///
/// Returns `true` if editing and saving was successful /// Returns `true` if editing and saving was successful
async fn save(&self, current_file: gio::File, new_file: gio::File) -> bool { async fn save(
&self,
current_file: gio::File,
new_file: gio::File,
cancellable: gio::Cancellable,
) -> bool {
let obj = self.obj(); let obj = self.obj();
obj.edit_crop().apply_crop(); obj.edit_crop().apply_crop();
self.set_saving_status(Some(gettext("Editing Image"))); self.set_saving_status(Some(gettext("Editing Image")));
let editor = glycin::Editor::new(current_file); let mut editor = glycin::Editor::new(current_file);
editor.cancellable(cancellable.clone());
if let Some(operations) = obj.operations() { if let Some(operations) = obj.operations() {
log::debug!("Computing edited image."); log::debug!("Computing edited image.");
let result = editor.apply_complete(&operations).await; let result = editor.apply_complete(&operations).await;

2
src/widgets/error_details.rs
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Sophie Herold // Copyright (c) 2024-2025 Sophie Herold
// Copyright (c) 2025 Rafael Fontenelle // Copyright (c) 2025 Rafael Fontenelle
// //
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify