RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:27:35 +00:00
Code Issues Activity Actions

Spreadsheet: Use TRY() on file load and save

Browse source
This commit is contained in:
Karol Kosek 2022-05-22 11:13:46 +02:00 • committed by Ali Mohammad Pur
parent ca42da23c2
commit 01824fd19a
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Applications/Spreadsheet/Workbook.cpp
View file

@ -57,11 +57,7 @@ Result<bool, String> Workbook::open_file(Core::File& file)
auto mime = Core::guess_mime_type_based_on_filename(file.filename()); auto mime = Core::guess_mime_type_based_on_filename(file.filename());
// Make an import dialog, we might need to import it. // Make an import dialog, we might need to import it.
auto result = ImportDialog::make_and_run_for(m_parent_window, mime, file, *this); m_sheets = TRY(ImportDialog::make_and_run_for(m_parent_window, mime, file, *this));
if (result.is_error())
return result.error();
m_sheets = result.release_value();
set_filename(file.filename()); set_filename(file.filename());
@ -99,9 +95,7 @@ Result<bool, String> Workbook::save(StringView filename)
} }
// Make an export dialog, we might need to import it. // Make an export dialog, we might need to import it.
auto result = ExportDialog::make_and_run_for(mime, *file, *this); TRY(ExportDialog::make_and_run_for(mime, *file, *this));
if (result.is_error())
return result.error();
set_filename(filename); set_filename(filename);
set_dirty(false); set_dirty(false);

6
Userland/Applications/Spreadsheet/main.cpp
View file

@ -71,10 +71,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->show(); window->show();
if (filename) { if (filename) {
auto response = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window, filename); auto file = TRY(FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window, filename));
if (response.is_error()) spreadsheet_widget.load_file(file);
return 1;
spreadsheet_widget.load_file(*response.value());
} }
return app->exec(); return app->exec();