Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Handle saving to unwritable location better to avoid data loss #1262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremypw merged 2 commits into from
Feb 2, 2023
Merged

Handle saving to unwritable location better to avoid data loss #1262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc3633f
Restore old uri if Save As fails
Jan 30, 2023
6c9a6f7
Merge branch 'master' into fix-savenew-unwritable
Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/Services/Document.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,13 @@ namespace Scratch.Services {
public bool save_as_with_hold () {
GLib.Application.get_default ().hold ();
bool result = false;
string old_uri = file.get_uri ();
save_as.begin ((obj, res) => {
result = save_as.end (res);
GLib.Application.get_default ().release ();
if (!result) {
file = File.new_for_uri (old_uri);
}
});

return result;
Expand Down Expand Up @@ -480,8 +484,9 @@ namespace Scratch.Services {
yield source_file_saver.save_async (GLib.Priority.DEFAULT, save_cancellable, null);
} catch (Error e) {
// We don't need to send an error message at cancellation (corresponding to error code 19)
if (e.code != 19)
if (e.code != 19) {
warning ("Cannot save \"%s\": %s", get_basename (), e.message);
}
return false;
}

Expand Down Expand Up @@ -536,28 +541,30 @@ namespace Scratch.Services {
success = true;
}

var is_saved = false;
if (success) {
source_view.buffer.set_modified (true);
var is_saved = yield save (true);

if (is_saved && is_current_file_temporary) {
try {
// Delete temporary file
File.new_for_path (current_file).delete ();
} catch (Error err) {
warning ("Temporary file cannot be deleted: %s", current_file);
is_saved = yield save (true);
if (is_saved) {
if (is_current_file_temporary) {
try {
// Delete temporary file
File.new_for_path (current_file).delete ();
} catch (Error err) {
warning ("Temporary file cannot be deleted: %s", current_file);
}
}
}

delete_backup (current_file + "~");
this.source_view.change_syntax_highlight_from_file (this.file);
delete_backup (current_file + "~");
this.source_view.change_syntax_highlight_from_file (this.file);
}
}

/* We delay destruction of file chooser dialog til to avoid the document focussing in,
* which triggers premature loading of overwritten content.
*/
file_chooser.destroy ();
return success;
return is_saved;
}

public bool move (File new_dest) {
Expand Down