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

SpreadSheet: Use FileSystemAccessClient::try_* APIs

Browse source
This commit is contained in:
Mustafa Quraish 2022-01-17 06:09:19 -05:00 • committed by Andreas Kling
parent ca2c7dced5
commit bba32de857
5 changed files with 17 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp
View file

@ -124,15 +124,10 @@ SpreadsheetWidget::SpreadsheetWidget(GUI::Window& parent_window, NonnullRefPtrVe
if (!load_path.has_value()) if (!load_path.has_value())
return; return;
auto response = FileSystemAccessClient::Client::the().request_file_read_only_approved(window()->window_id(), *load_path); auto response = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window(), *load_path);
if (response.is_error())
if (response.error != 0) {
if (response.error != -1)
GUI::MessageBox::show_error(window(), String::formatted("Opening \"{}\" failed: {}", *response.chosen_file, strerror(response.error)));
return; return;
} load_file(*response.value());
load_file(*response.fd, *load_path);
}); });
m_save_action = GUI::CommonActions::make_save_action([&](auto&) { m_save_action = GUI::CommonActions::make_save_action([&](auto&) {
@ -400,9 +395,9 @@ void SpreadsheetWidget::save(StringView filename)
GUI::MessageBox::show_error(window(), result.error()); GUI::MessageBox::show_error(window(), result.error());
} }
void SpreadsheetWidget::load_file(int fd, StringView filename) void SpreadsheetWidget::load_file(Core::File& file)
{ {
auto result = m_workbook->open_file(fd, filename); auto result = m_workbook->open_file(file);
if (result.is_error()) { if (result.is_error()) {
GUI::MessageBox::show_error(window(), result.error()); GUI::MessageBox::show_error(window(), result.error());
return; return;

2
Userland/Applications/Spreadsheet/SpreadsheetWidget.h
View file

@ -20,7 +20,7 @@ public:
~SpreadsheetWidget(); ~SpreadsheetWidget();
void save(StringView filename); void save(StringView filename);
void load_file(int fd, StringView filename); void load_file(Core::File&);
bool request_close(); bool request_close();
void add_sheet(); void add_sheet();
void add_sheet(NonnullRefPtr<Sheet>&&); void add_sheet(NonnullRefPtr<Sheet>&&);

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

@ -51,15 +51,9 @@ bool Workbook::set_filename(const String& filename)
return true; return true;
} }
Result<bool, String> Workbook::open_file(int fd, StringView filename) Result<bool, String> Workbook::open_file(Core::File& file)
{ {
auto file = Core::File::construct(); auto mime = Core::guess_mime_type_based_on_filename(file.filename());
if (!file->open(fd, Core::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes) && file->error() != ENOENT) {
return String::formatted("Opening \"{}\" failed: {}", file, strerror(errno));
}
auto mime = Core::guess_mime_type_based_on_filename(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); auto result = ImportDialog::make_and_run_for(m_parent_window, mime, file, *this);
@ -68,25 +62,24 @@ Result<bool, String> Workbook::open_file(int fd, StringView filename)
m_sheets = result.release_value(); m_sheets = result.release_value();
set_filename(filename); set_filename(file.filename());
return true; return true;
} }
Result<bool, String> Workbook::load(StringView filename) Result<bool, String> Workbook::load(StringView filename)
{ {
auto response = FileSystemAccessClient::Client::the().request_file_read_only_approved(m_parent_window.window_id(), filename); auto response = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(&m_parent_window, filename);
if (response.error != 0) { if (response.is_error()) {
StringBuilder sb; StringBuilder sb;
sb.append("Failed to open "); sb.append("Failed to open ");
sb.append(filename); sb.append(filename);
sb.append(" for reading. Error: "); sb.append(" for reading. Error: ");
sb.appendff("{}", response.error); sb.appendff("{}", response.error());
return sb.to_string(); return sb.to_string();
} }
return open_file(*response.fd, filename); return open_file(*response.value());
} }
Result<bool, String> Workbook::save(StringView filename) Result<bool, String> Workbook::save(StringView filename)

2
Userland/Applications/Spreadsheet/Workbook.h
View file

@ -19,7 +19,7 @@ public:
Result<bool, String> save(StringView filename); Result<bool, String> save(StringView filename);
Result<bool, String> load(StringView filename); Result<bool, String> load(StringView filename);
Result<bool, String> open_file(int fd, StringView filename); Result<bool, String> open_file(Core::File&);
const String& current_filename() const { return m_current_filename; } const String& current_filename() const { return m_current_filename; }
bool set_filename(const String& filename); bool set_filename(const String& filename);

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

@ -94,14 +94,10 @@ int main(int argc, char* argv[])
window->show(); window->show();
if (filename) { if (filename) {
auto response = FileSystemAccessClient::Client::the().request_file_read_only_approved(window->window_id(), filename); auto response = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window, filename);
if (response.is_error())
if (response.error != 0) {
if (response.error != -1)
GUI::MessageBox::show_error(window, String::formatted("Opening \"{}\" failed: {}", *response.chosen_file, strerror(response.error)));
return 1; return 1;
} spreadsheet_widget.load_file(*response.value());
spreadsheet_widget.load_file(*response.fd, filename);
} }
return app->exec(); return app->exec();