diff options
Diffstat (limited to 'Userland/Services')
16 files changed, 53 insertions, 51 deletions
diff --git a/Userland/Services/FileOperation/main.cpp b/Userland/Services/FileOperation/main.cpp index 37e11d0ffd..c34ec35a96 100644 --- a/Userland/Services/FileOperation/main.cpp +++ b/Userland/Services/FileOperation/main.cpp @@ -11,6 +11,7 @@ #include <AK/StringView.h> #include <LibCore/ArgsParser.h> #include <LibCore/DirIterator.h> +#include <LibCore/File.h> #include <LibCore/Stream.h> #include <LibCore/System.h> #include <LibMain/Main.h> @@ -38,7 +39,7 @@ static ErrorOr<int> perform_copy(Vector<StringView> const& sources, DeprecatedSt static ErrorOr<int> perform_move(Vector<StringView> const& sources, DeprecatedString const& destination); static ErrorOr<int> perform_delete(Vector<StringView> const& sources); static ErrorOr<int> execute_work_items(Vector<WorkItem> const& items); -static ErrorOr<NonnullOwnPtr<Core::Stream::File>> open_destination_file(DeprecatedString const& destination); +static ErrorOr<NonnullOwnPtr<Core::File>> open_destination_file(DeprecatedString const& destination); static DeprecatedString deduplicate_destination_file_name(DeprecatedString const& destination); ErrorOr<int> serenity_main(Main::Arguments arguments) @@ -230,7 +231,7 @@ ErrorOr<int> execute_work_items(Vector<WorkItem> const& items) }; auto copy_file = [&](DeprecatedString const& source, DeprecatedString const& destination) -> ErrorOr<int> { - auto source_file = TRY(Core::Stream::File::open(source, Core::Stream::OpenMode::Read)); + auto source_file = TRY(Core::File::open(source, Core::File::OpenMode::Read)); // FIXME: When the file already exists, let the user choose the next action instead of renaming it by default. auto destination_file = TRY(open_destination_file(destination)); auto buffer = TRY(ByteBuffer::create_zeroed(64 * KiB)); @@ -327,9 +328,9 @@ ErrorOr<int> execute_work_items(Vector<WorkItem> const& items) return 0; } -ErrorOr<NonnullOwnPtr<Core::Stream::File>> open_destination_file(DeprecatedString const& destination) +ErrorOr<NonnullOwnPtr<Core::File>> open_destination_file(DeprecatedString const& destination) { - auto destination_file_or_error = Core::Stream::File::open(destination, (Core::Stream::OpenMode)(Core::Stream::OpenMode::Write | Core::Stream::OpenMode::Truncate | Core::Stream::OpenMode::MustBeNew)); + auto destination_file_or_error = Core::File::open(destination, (Core::File::OpenMode)(Core::File::OpenMode::Write | Core::File::OpenMode::Truncate | Core::File::OpenMode::MustBeNew)); if (destination_file_or_error.is_error() && destination_file_or_error.error().code() == EEXIST) { return open_destination_file(deduplicate_destination_file_name(destination)); } diff --git a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp index 255a7caf9e..33b37ece8e 100644 --- a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp +++ b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp @@ -42,15 +42,15 @@ RefPtr<GUI::Window> ConnectionFromClient::create_dummy_child_window(i32 window_s return window; } -void ConnectionFromClient::request_file_handler(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& path, Core::Stream::OpenMode requested_access, ShouldPrompt prompt) +void ConnectionFromClient::request_file_handler(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& path, Core::File::OpenMode requested_access, ShouldPrompt prompt) { VERIFY(path.starts_with("/"sv)); bool approved = false; auto maybe_permissions = m_approved_files.get(path); - auto relevant_permissions = requested_access & (Core::Stream::OpenMode::Read | Core::Stream::OpenMode::Write); - VERIFY(relevant_permissions != Core::Stream::OpenMode::NotOpen); + auto relevant_permissions = requested_access & (Core::File::OpenMode::Read | Core::File::OpenMode::Write); + VERIFY(relevant_permissions != Core::File::OpenMode::NotOpen); if (maybe_permissions.has_value()) approved = has_flag(maybe_permissions.value(), relevant_permissions); @@ -58,11 +58,11 @@ void ConnectionFromClient::request_file_handler(i32 request_id, i32 window_serve if (!approved) { DeprecatedString access_string; - if (has_flag(requested_access, Core::Stream::OpenMode::ReadWrite)) + if (has_flag(requested_access, Core::File::OpenMode::ReadWrite)) access_string = "read and write"; - else if (has_flag(requested_access, Core::Stream::OpenMode::Read)) + else if (has_flag(requested_access, Core::File::OpenMode::Read)) access_string = "read from"; - else if (has_flag(requested_access, Core::Stream::OpenMode::Write)) + else if (has_flag(requested_access, Core::File::OpenMode::Write)) access_string = "write to"; auto pid = this->socket().peer_pid().release_value_but_fixme_should_propagate_errors(); @@ -90,7 +90,7 @@ void ConnectionFromClient::request_file_handler(i32 request_id, i32 window_serve } if (approved) { - auto file = Core::Stream::File::open(path, requested_access); + auto file = Core::File::open(path, requested_access); if (file.is_error()) { dbgln("FileSystemAccessServer: Couldn't open {}, error {}", path, file.error()); @@ -105,18 +105,18 @@ void ConnectionFromClient::request_file_handler(i32 request_id, i32 window_serve void ConnectionFromClient::request_file_read_only_approved(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& path) { - request_file_handler(request_id, window_server_client_id, parent_window_id, path, Core::Stream::OpenMode::Read, ShouldPrompt::No); + request_file_handler(request_id, window_server_client_id, parent_window_id, path, Core::File::OpenMode::Read, ShouldPrompt::No); } -void ConnectionFromClient::request_file(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& path, Core::Stream::OpenMode requested_access) +void ConnectionFromClient::request_file(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& path, Core::File::OpenMode requested_access) { request_file_handler(request_id, window_server_client_id, parent_window_id, path, requested_access, ShouldPrompt::Yes); } -void ConnectionFromClient::prompt_open_file(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& window_title, DeprecatedString const& path_to_view, Core::Stream::OpenMode requested_access) +void ConnectionFromClient::prompt_open_file(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& window_title, DeprecatedString const& path_to_view, Core::File::OpenMode requested_access) { - auto relevant_permissions = requested_access & (Core::Stream::OpenMode::Read | Core::Stream::OpenMode::Write); - VERIFY(relevant_permissions != Core::Stream::OpenMode::NotOpen); + auto relevant_permissions = requested_access & (Core::File::OpenMode::Read | Core::File::OpenMode::Write); + VERIFY(relevant_permissions != Core::File::OpenMode::NotOpen); auto main_window = create_dummy_child_window(window_server_client_id, parent_window_id); @@ -125,10 +125,10 @@ void ConnectionFromClient::prompt_open_file(i32 request_id, i32 window_server_cl prompt_helper(request_id, user_picked_file, requested_access); } -void ConnectionFromClient::prompt_save_file(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& name, DeprecatedString const& ext, DeprecatedString const& path_to_view, Core::Stream::OpenMode requested_access) +void ConnectionFromClient::prompt_save_file(i32 request_id, i32 window_server_client_id, i32 parent_window_id, DeprecatedString const& name, DeprecatedString const& ext, DeprecatedString const& path_to_view, Core::File::OpenMode requested_access) { - auto relevant_permissions = requested_access & (Core::Stream::OpenMode::Read | Core::Stream::OpenMode::Write); - VERIFY(relevant_permissions != Core::Stream::OpenMode::NotOpen); + auto relevant_permissions = requested_access & (Core::File::OpenMode::Read | Core::File::OpenMode::Write); + VERIFY(relevant_permissions != Core::File::OpenMode::NotOpen); auto main_window = create_dummy_child_window(window_server_client_id, parent_window_id); @@ -137,18 +137,18 @@ void ConnectionFromClient::prompt_save_file(i32 request_id, i32 window_server_cl prompt_helper(request_id, user_picked_file, requested_access); } -void ConnectionFromClient::prompt_helper(i32 request_id, Optional<DeprecatedString> const& user_picked_file, Core::Stream::OpenMode requested_access) +void ConnectionFromClient::prompt_helper(i32 request_id, Optional<DeprecatedString> const& user_picked_file, Core::File::OpenMode requested_access) { if (user_picked_file.has_value()) { VERIFY(user_picked_file->starts_with("/"sv)); - auto file = Core::Stream::File::open(user_picked_file.value(), requested_access); + auto file = Core::File::open(user_picked_file.value(), requested_access); if (file.is_error()) { dbgln("FileSystemAccessServer: Couldn't open {}, error {}", user_picked_file.value(), file.error()); async_handle_prompt_end(request_id, file.error().code(), Optional<IPC::File> {}, user_picked_file); } else { auto maybe_permissions = m_approved_files.get(user_picked_file.value()); - auto new_permissions = requested_access & (Core::Stream::OpenMode::Read | Core::Stream::OpenMode::Write); + auto new_permissions = requested_access & (Core::File::OpenMode::Read | Core::File::OpenMode::Write); if (maybe_permissions.has_value()) new_permissions |= maybe_permissions.value(); diff --git a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.h b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.h index 584291ae30..0ad767a359 100644 --- a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.h +++ b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.h @@ -28,22 +28,22 @@ private: explicit ConnectionFromClient(NonnullOwnPtr<Core::LocalSocket>); virtual void request_file_read_only_approved(i32, i32, i32, DeprecatedString const&) override; - virtual void request_file(i32, i32, i32, DeprecatedString const&, Core::Stream::OpenMode) override; - virtual void prompt_open_file(i32, i32, i32, DeprecatedString const&, DeprecatedString const&, Core::Stream::OpenMode) override; - virtual void prompt_save_file(i32, i32, i32, DeprecatedString const&, DeprecatedString const&, DeprecatedString const&, Core::Stream::OpenMode) override; + virtual void request_file(i32, i32, i32, DeprecatedString const&, Core::File::OpenMode) override; + virtual void prompt_open_file(i32, i32, i32, DeprecatedString const&, DeprecatedString const&, Core::File::OpenMode) override; + virtual void prompt_save_file(i32, i32, i32, DeprecatedString const&, DeprecatedString const&, DeprecatedString const&, Core::File::OpenMode) override; - void prompt_helper(i32, Optional<DeprecatedString> const&, Core::Stream::OpenMode); + void prompt_helper(i32, Optional<DeprecatedString> const&, Core::File::OpenMode); RefPtr<GUI::Window> create_dummy_child_window(i32, i32); enum class ShouldPrompt { No, Yes }; - void request_file_handler(i32, i32, i32, DeprecatedString const&, Core::Stream::OpenMode, ShouldPrompt); + void request_file_handler(i32, i32, i32, DeprecatedString const&, Core::File::OpenMode, ShouldPrompt); virtual Messages::FileSystemAccessServer::ExposeWindowServerClientIdResponse expose_window_server_client_id() override; - HashMap<DeprecatedString, Core::Stream::OpenMode> m_approved_files; + HashMap<DeprecatedString, Core::File::OpenMode> m_approved_files; }; } diff --git a/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc b/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc index a42379acd1..a1970b9972 100644 --- a/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc +++ b/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc @@ -4,9 +4,9 @@ endpoint FileSystemAccessServer { request_file_read_only_approved(i32 request_id, i32 window_server_client_id, i32 window_id, DeprecatedString path) =| - request_file(i32 request_id, i32 window_server_client_id, i32 window_id, DeprecatedString path, Core::Stream::OpenMode requested_access) =| - prompt_open_file(i32 request_id, i32 window_server_client_id, i32 window_id, DeprecatedString window_title, DeprecatedString path_to_view, Core::Stream::OpenMode requested_access) =| - prompt_save_file(i32 request_id, i32 window_server_client_id, i32 window_id, DeprecatedString title, DeprecatedString ext, DeprecatedString path_to_view, Core::Stream::OpenMode requested_access) =| + request_file(i32 request_id, i32 window_server_client_id, i32 window_id, DeprecatedString path, Core::File::OpenMode requested_access) =| + prompt_open_file(i32 request_id, i32 window_server_client_id, i32 window_id, DeprecatedString window_title, DeprecatedString path_to_view, Core::File::OpenMode requested_access) =| + prompt_save_file(i32 request_id, i32 window_server_client_id, i32 window_id, DeprecatedString title, DeprecatedString ext, DeprecatedString path_to_view, Core::File::OpenMode requested_access) =| expose_window_server_client_id() => (i32 client_id) } diff --git a/Userland/Services/NetworkServer/main.cpp b/Userland/Services/NetworkServer/main.cpp index 6e4ba5d7a1..915ff8ea6b 100644 --- a/Userland/Services/NetworkServer/main.cpp +++ b/Userland/Services/NetworkServer/main.cpp @@ -27,7 +27,7 @@ ErrorOr<int> serenity_main(Main::Arguments) auto config_file = TRY(Core::ConfigFile::open_for_system("Network")); - auto proc_net_adapters_file = TRY(Core::Stream::File::open("/sys/kernel/net/adapters"sv, Core::Stream::OpenMode::Read)); + auto proc_net_adapters_file = TRY(Core::File::open("/sys/kernel/net/adapters"sv, Core::File::OpenMode::Read)); auto data = TRY(proc_net_adapters_file->read_until_eof()); JsonParser parser(data); JsonValue proc_net_adapters_json = TRY(parser.parse()); diff --git a/Userland/Services/RequestServer/GeminiProtocol.cpp b/Userland/Services/RequestServer/GeminiProtocol.cpp index 9412476a9b..642f24d613 100644 --- a/Userland/Services/RequestServer/GeminiProtocol.cpp +++ b/Userland/Services/RequestServer/GeminiProtocol.cpp @@ -26,7 +26,7 @@ OwnPtr<Request> GeminiProtocol::start_request(ConnectionFromClient& client, Depr if (pipe_result.is_error()) return {}; - auto output_stream = MUST(Core::Stream::File::adopt_fd(pipe_result.value().write_fd, Core::Stream::OpenMode::Write)); + auto output_stream = MUST(Core::File::adopt_fd(pipe_result.value().write_fd, Core::File::OpenMode::Write)); auto job = Gemini::Job::construct(request, *output_stream); auto protocol_request = GeminiRequest::create_with_job({}, client, *job, move(output_stream)); protocol_request->set_request_fd(pipe_result.value().read_fd); diff --git a/Userland/Services/RequestServer/GeminiRequest.cpp b/Userland/Services/RequestServer/GeminiRequest.cpp index 048338f30e..962480f13b 100644 --- a/Userland/Services/RequestServer/GeminiRequest.cpp +++ b/Userland/Services/RequestServer/GeminiRequest.cpp @@ -12,7 +12,7 @@ namespace RequestServer { -GeminiRequest::GeminiRequest(ConnectionFromClient& client, NonnullRefPtr<Gemini::Job> job, NonnullOwnPtr<Core::Stream::File>&& output_stream) +GeminiRequest::GeminiRequest(ConnectionFromClient& client, NonnullRefPtr<Gemini::Job> job, NonnullOwnPtr<Core::File>&& output_stream) : Request(client, move(output_stream)) , m_job(move(job)) { @@ -57,7 +57,7 @@ GeminiRequest::~GeminiRequest() m_job->cancel(); } -NonnullOwnPtr<GeminiRequest> GeminiRequest::create_with_job(Badge<GeminiProtocol>, ConnectionFromClient& client, NonnullRefPtr<Gemini::Job> job, NonnullOwnPtr<Core::Stream::File>&& output_stream) +NonnullOwnPtr<GeminiRequest> GeminiRequest::create_with_job(Badge<GeminiProtocol>, ConnectionFromClient& client, NonnullRefPtr<Gemini::Job> job, NonnullOwnPtr<Core::File>&& output_stream) { return adopt_own(*new GeminiRequest(client, move(job), move(output_stream))); } diff --git a/Userland/Services/RequestServer/GeminiRequest.h b/Userland/Services/RequestServer/GeminiRequest.h index 9039b83980..5943f62c8b 100644 --- a/Userland/Services/RequestServer/GeminiRequest.h +++ b/Userland/Services/RequestServer/GeminiRequest.h @@ -16,14 +16,14 @@ namespace RequestServer { class GeminiRequest final : public Request { public: virtual ~GeminiRequest() override; - static NonnullOwnPtr<GeminiRequest> create_with_job(Badge<GeminiProtocol>, ConnectionFromClient&, NonnullRefPtr<Gemini::Job>, NonnullOwnPtr<Core::Stream::File>&&); + static NonnullOwnPtr<GeminiRequest> create_with_job(Badge<GeminiProtocol>, ConnectionFromClient&, NonnullRefPtr<Gemini::Job>, NonnullOwnPtr<Core::File>&&); Gemini::Job const& job() const { return *m_job; } virtual URL url() const override { return m_job->url(); } private: - explicit GeminiRequest(ConnectionFromClient&, NonnullRefPtr<Gemini::Job>, NonnullOwnPtr<Core::Stream::File>&&); + explicit GeminiRequest(ConnectionFromClient&, NonnullRefPtr<Gemini::Job>, NonnullOwnPtr<Core::File>&&); virtual void set_certificate(DeprecatedString certificate, DeprecatedString key) override; diff --git a/Userland/Services/RequestServer/HttpCommon.h b/Userland/Services/RequestServer/HttpCommon.h index d54d48ca23..3cc50c7d33 100644 --- a/Userland/Services/RequestServer/HttpCommon.h +++ b/Userland/Services/RequestServer/HttpCommon.h @@ -97,7 +97,7 @@ OwnPtr<Request> start_request(TBadgedProtocol&& protocol, ConnectionFromClient& return {}; request.set_body(allocated_body_result.release_value()); - auto output_stream = MUST(Core::Stream::File::adopt_fd(pipe_result.value().write_fd, Core::Stream::OpenMode::Write)); + auto output_stream = MUST(Core::File::adopt_fd(pipe_result.value().write_fd, Core::File::OpenMode::Write)); auto job = TJob::construct(move(request), *output_stream); auto protocol_request = TRequest::create_with_job(forward<TBadgedProtocol>(protocol), client, (TJob&)*job, move(output_stream)); protocol_request->set_request_fd(pipe_result.value().read_fd); diff --git a/Userland/Services/RequestServer/HttpRequest.cpp b/Userland/Services/RequestServer/HttpRequest.cpp index 861c7a93b3..0249650c3d 100644 --- a/Userland/Services/RequestServer/HttpRequest.cpp +++ b/Userland/Services/RequestServer/HttpRequest.cpp @@ -11,7 +11,7 @@ namespace RequestServer { -HttpRequest::HttpRequest(ConnectionFromClient& client, NonnullRefPtr<HTTP::Job> job, NonnullOwnPtr<Core::Stream::File>&& output_stream) +HttpRequest::HttpRequest(ConnectionFromClient& client, NonnullRefPtr<HTTP::Job> job, NonnullOwnPtr<Core::File>&& output_stream) : Request(client, move(output_stream)) , m_job(job) { @@ -25,7 +25,7 @@ HttpRequest::~HttpRequest() m_job->cancel(); } -NonnullOwnPtr<HttpRequest> HttpRequest::create_with_job(Badge<HttpProtocol>&&, ConnectionFromClient& client, NonnullRefPtr<HTTP::Job> job, NonnullOwnPtr<Core::Stream::File>&& output_stream) +NonnullOwnPtr<HttpRequest> HttpRequest::create_with_job(Badge<HttpProtocol>&&, ConnectionFromClient& client, NonnullRefPtr<HTTP::Job> job, NonnullOwnPtr<Core::File>&& output_stream) { return adopt_own(*new HttpRequest(client, move(job), move(output_stream))); } diff --git a/Userland/Services/RequestServer/HttpRequest.h b/Userland/Services/RequestServer/HttpRequest.h index 624cccf4dc..6833e74d6c 100644 --- a/Userland/Services/RequestServer/HttpRequest.h +++ b/Userland/Services/RequestServer/HttpRequest.h @@ -17,7 +17,7 @@ namespace RequestServer { class HttpRequest final : public Request { public: virtual ~HttpRequest() override; - static NonnullOwnPtr<HttpRequest> create_with_job(Badge<HttpProtocol>&&, ConnectionFromClient&, NonnullRefPtr<HTTP::Job>, NonnullOwnPtr<Core::Stream::File>&&); + static NonnullOwnPtr<HttpRequest> create_with_job(Badge<HttpProtocol>&&, ConnectionFromClient&, NonnullRefPtr<HTTP::Job>, NonnullOwnPtr<Core::File>&&); HTTP::Job& job() { return m_job; } HTTP::Job const& job() const { return m_job; } @@ -25,7 +25,7 @@ public: virtual URL url() const override { return m_job->url(); } private: - explicit HttpRequest(ConnectionFromClient&, NonnullRefPtr<HTTP::Job>, NonnullOwnPtr<Core::Stream::File>&&); + explicit HttpRequest(ConnectionFromClient&, NonnullRefPtr<HTTP::Job>, NonnullOwnPtr<Core::File>&&); NonnullRefPtr<HTTP::Job> m_job; }; diff --git a/Userland/Services/RequestServer/HttpsRequest.cpp b/Userland/Services/RequestServer/HttpsRequest.cpp index dcf2c4da71..f9c9ba0272 100644 --- a/Userland/Services/RequestServer/HttpsRequest.cpp +++ b/Userland/Services/RequestServer/HttpsRequest.cpp @@ -11,7 +11,7 @@ namespace RequestServer { -HttpsRequest::HttpsRequest(ConnectionFromClient& client, NonnullRefPtr<HTTP::HttpsJob> job, NonnullOwnPtr<Core::Stream::File>&& output_stream) +HttpsRequest::HttpsRequest(ConnectionFromClient& client, NonnullRefPtr<HTTP::HttpsJob> job, NonnullOwnPtr<Core::File>&& output_stream) : Request(client, move(output_stream)) , m_job(job) { @@ -30,7 +30,7 @@ HttpsRequest::~HttpsRequest() m_job->cancel(); } -NonnullOwnPtr<HttpsRequest> HttpsRequest::create_with_job(Badge<HttpsProtocol>&&, ConnectionFromClient& client, NonnullRefPtr<HTTP::HttpsJob> job, NonnullOwnPtr<Core::Stream::File>&& output_stream) +NonnullOwnPtr<HttpsRequest> HttpsRequest::create_with_job(Badge<HttpsProtocol>&&, ConnectionFromClient& client, NonnullRefPtr<HTTP::HttpsJob> job, NonnullOwnPtr<Core::File>&& output_stream) { return adopt_own(*new HttpsRequest(client, move(job), move(output_stream))); } diff --git a/Userland/Services/RequestServer/HttpsRequest.h b/Userland/Services/RequestServer/HttpsRequest.h index 1add0e1cee..01eb3870cd 100644 --- a/Userland/Services/RequestServer/HttpsRequest.h +++ b/Userland/Services/RequestServer/HttpsRequest.h @@ -16,7 +16,7 @@ namespace RequestServer { class HttpsRequest final : public Request { public: virtual ~HttpsRequest() override; - static NonnullOwnPtr<HttpsRequest> create_with_job(Badge<HttpsProtocol>&&, ConnectionFromClient&, NonnullRefPtr<HTTP::HttpsJob>, NonnullOwnPtr<Core::Stream::File>&&); + static NonnullOwnPtr<HttpsRequest> create_with_job(Badge<HttpsProtocol>&&, ConnectionFromClient&, NonnullRefPtr<HTTP::HttpsJob>, NonnullOwnPtr<Core::File>&&); HTTP::HttpsJob& job() { return m_job; } HTTP::HttpsJob const& job() const { return m_job; } @@ -24,7 +24,7 @@ public: virtual URL url() const override { return m_job->url(); } private: - explicit HttpsRequest(ConnectionFromClient&, NonnullRefPtr<HTTP::HttpsJob>, NonnullOwnPtr<Core::Stream::File>&&); + explicit HttpsRequest(ConnectionFromClient&, NonnullRefPtr<HTTP::HttpsJob>, NonnullOwnPtr<Core::File>&&); virtual void set_certificate(DeprecatedString certificate, DeprecatedString key) override; diff --git a/Userland/Services/RequestServer/Request.cpp b/Userland/Services/RequestServer/Request.cpp index b1d00d8e03..d766bd8508 100644 --- a/Userland/Services/RequestServer/Request.cpp +++ b/Userland/Services/RequestServer/Request.cpp @@ -12,7 +12,7 @@ namespace RequestServer { // FIXME: What about rollover? static i32 s_next_id = 1; -Request::Request(ConnectionFromClient& client, NonnullOwnPtr<Core::Stream::File>&& output_stream) +Request::Request(ConnectionFromClient& client, NonnullOwnPtr<Core::File>&& output_stream) : m_client(client) , m_id(s_next_id++) , m_output_stream(move(output_stream)) diff --git a/Userland/Services/RequestServer/Request.h b/Userland/Services/RequestServer/Request.h index 6b4a9a107a..7633032e07 100644 --- a/Userland/Services/RequestServer/Request.h +++ b/Userland/Services/RequestServer/Request.h @@ -40,10 +40,10 @@ public: void did_request_certificates(); void set_response_headers(HashMap<DeprecatedString, DeprecatedString, CaseInsensitiveStringTraits> const&); void set_downloaded_size(size_t size) { m_downloaded_size = size; } - Core::Stream::File const& output_stream() const { return *m_output_stream; } + Core::File const& output_stream() const { return *m_output_stream; } protected: - explicit Request(ConnectionFromClient&, NonnullOwnPtr<Core::Stream::File>&&); + explicit Request(ConnectionFromClient&, NonnullOwnPtr<Core::File>&&); private: ConnectionFromClient& m_client; @@ -52,7 +52,7 @@ private: Optional<u32> m_status_code; Optional<u32> m_total_size {}; size_t m_downloaded_size { 0 }; - NonnullOwnPtr<Core::Stream::File> m_output_stream; + NonnullOwnPtr<Core::File> m_output_stream; HashMap<DeprecatedString, DeprecatedString, CaseInsensitiveStringTraits> m_response_headers; }; diff --git a/Userland/Services/WebServer/Client.cpp b/Userland/Services/WebServer/Client.cpp index ce90bdff07..ae65737e3f 100644 --- a/Userland/Services/WebServer/Client.cpp +++ b/Userland/Services/WebServer/Client.cpp @@ -16,6 +16,7 @@ #include <LibCore/DateTime.h> #include <LibCore/DeprecatedFile.h> #include <LibCore/DirIterator.h> +#include <LibCore/File.h> #include <LibCore/MappedFile.h> #include <LibCore/MimeData.h> #include <LibHTTP/HttpRequest.h> @@ -165,7 +166,7 @@ ErrorOr<bool> Client::handle_request(ReadonlyBytes raw_request) return false; } - auto stream = TRY(Core::Stream::File::open(real_path.bytes_as_string_view(), Core::Stream::OpenMode::Read)); + auto stream = TRY(Core::File::open(real_path.bytes_as_string_view(), Core::File::OpenMode::Read)); auto const info = ContentInfo { .type = TRY(String::from_deprecated_string(Core::guess_mime_type_based_on_filename(real_path.bytes_as_string_view()))), |