mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 15:57:45 +00:00
HexEditor: Use FileSystemAccessClient, add unveils
Most of the code here is based off the implementation of how TextEditor uses FileSystemAccessClient.
This commit is contained in:
parent
eae21c7e31
commit
8f2521ce52
6 changed files with 109 additions and 31 deletions
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
@ -8,6 +9,7 @@
|
|||
#include <LibConfig/Client.h>
|
||||
#include <LibGUI/Icon.h>
|
||||
#include <LibGUI/Menubar.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
@ -22,11 +24,6 @@ int main(int argc, char** argv)
|
|||
|
||||
Config::pledge_domains("HexEditor");
|
||||
|
||||
if (pledge("stdio recvfd sendfd rpath cpath wpath thread", nullptr) < 0) {
|
||||
perror("pledge");
|
||||
return 1;
|
||||
}
|
||||
|
||||
auto app_icon = GUI::Icon::default_icon("app-hex-editor");
|
||||
|
||||
auto window = GUI::Window::construct();
|
||||
|
@ -41,12 +38,49 @@ int main(int argc, char** argv)
|
|||
return GUI::Window::CloseRequestDecision::StayOpen;
|
||||
};
|
||||
|
||||
String file_to_edit = (argc > 1) ? Core::File::absolute_path(argv[1]) : "";
|
||||
|
||||
if (!file_to_edit.is_empty()) {
|
||||
if (Core::File::exists(file_to_edit)) {
|
||||
dbgln("unveil for: {}", file_to_edit);
|
||||
if (unveil(file_to_edit.characters(), "r") < 0) {
|
||||
perror("unveil");
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
file_to_edit = {};
|
||||
}
|
||||
}
|
||||
|
||||
if (unveil("/res", "r") < 0) {
|
||||
perror("unveil");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (unveil("/tmp/portal/filesystemaccess", "rw") < 0) {
|
||||
perror("unveil");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (unveil(nullptr, nullptr) < 0) {
|
||||
perror("unveil");
|
||||
return 1;
|
||||
}
|
||||
|
||||
hex_editor_widget.initialize_menubar(*window);
|
||||
window->show();
|
||||
window->set_icon(app_icon.bitmap_for_size(16));
|
||||
|
||||
if (argc >= 2)
|
||||
hex_editor_widget.open_file(argv[1]);
|
||||
if (!file_to_edit.is_empty()) {
|
||||
auto file = Core::File::open(file_to_edit, Core::OpenMode::ReadOnly);
|
||||
|
||||
if (file.is_error()) {
|
||||
GUI::MessageBox::show_error(window, String::formatted("Opening \"{}\" failed: {}", file_to_edit, file.error()));
|
||||
return 1;
|
||||
}
|
||||
|
||||
hex_editor_widget.open_file(file.value()->leak_fd(), file_to_edit);
|
||||
}
|
||||
|
||||
return app->exec();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue