RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 19:58:11 +00:00
Code Issues Activity Actions

PixelPaint: Use FileSystemAccessClient::try_* APIs

Browse source
This commit is contained in:
Mustafa Quraish 2022-01-16 04:30:06 -05:00 • committed by Andreas Kling
parent aae96af812
commit 1c3e93c6e0
11 changed files with 59 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Applications/PixelPaint/ImageEditor.cpp
View file

@ -591,12 +591,12 @@ void ImageEditor::save_project()
save_project_as();
return;
}
auto response = FileSystemAccessClient::Client::the().request_file(window()->window_id(), path(), Core::OpenMode::Truncate | Core::OpenMode::WriteOnly);
if (response.error != 0)
auto response = FileSystemAccessClient::Client::the().try_request_file(window(), path(), Core::OpenMode::Truncate | Core::OpenMode::WriteOnly);
if (response.is_error())
return;
auto result = save_project_to_fd_and_close(*response.fd);
auto result = save_project_to_file(*response.value());
if (result.is_error()) {
GUI::MessageBox::show_error(window(), String::formatted("Could not save {}: {}", *response.chosen_file, result.error()));
GUI::MessageBox::show_error(window(), String::formatted("Could not save {}: {}", path(), result.error()));
return;
}
undo_stack().set_current_unmodified();
@ -604,19 +604,20 @@ void ImageEditor::save_project()
void ImageEditor::save_project_as()
{
auto save_result = FileSystemAccessClient::Client::the().save_file(window()->window_id(), "untitled", "pp");
if (save_result.error != 0)
auto response = FileSystemAccessClient::Client::the().try_save_file(window(), "untitled", "pp");
if (response.is_error())
return;
auto result = save_project_to_fd_and_close(*save_result.fd);
auto file = response.value();
auto result = save_project_to_file(*file);
if (result.is_error()) {
GUI::MessageBox::show_error(window(), String::formatted("Could not save {}: {}", *save_result.chosen_file, result.error()));
GUI::MessageBox::show_error(window(), String::formatted("Could not save {}: {}", file->filename(), result.error()));
return;
}
set_path(*save_result.chosen_file);
set_path(file->filename());
undo_stack().set_current_unmodified();
}
Result<void, String> ImageEditor::save_project_to_fd_and_close(int fd) const
Result<void, String> ImageEditor::save_project_to_file(Core::File& file) const
{
StringBuilder builder;
JsonObjectSerializer json(builder);
@ -634,13 +635,8 @@ Result<void, String> ImageEditor::save_project_to_fd_and_close(int fd) const
json_guides.finish();
json.finish();
auto file = Core::File::construct();
file->open(fd, Core::OpenMode::WriteOnly | Core::OpenMode::Truncate, Core::File::ShouldCloseFileDescriptor::Yes);
if (file->has_error())
return String { file->error_string() };
if (!file->write(builder.string_view()))
return String { file->error_string() };
if (!file.write(builder.string_view()))
return String { file.error_string() };
return {};
}