Skip to content

Commit

Permalink
LibCore: Move Stream-based file into the Core namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
@timschumi @linusg
timschumi authored and linusg committed Feb 13, 2023
1 parent a96339b commit 606a398
Show file tree
Hide file tree
Showing 218 changed files with 748 additions and 643 deletions.
6 changes: 3 additions & 3 deletions Ladybird/WebContent/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)

static ErrorOr<void> load_content_filters()
{
auto file_or_error = Core::Stream::File::open(DeprecatedString::formatted("{}/home/anon/.config/BrowserContentFilters.txt", s_serenity_resource_root), Core::Stream::OpenMode::Read);
auto file_or_error = Core::File::open(DeprecatedString::formatted("{}/home/anon/.config/BrowserContentFilters.txt", s_serenity_resource_root), Core::File::OpenMode::Read);
if (file_or_error.is_error())
file_or_error = Core::Stream::File::open(DeprecatedString::formatted("{}/res/ladybird/BrowserContentFilters.txt", s_serenity_resource_root), Core::Stream::OpenMode::Read);
file_or_error = Core::File::open(DeprecatedString::formatted("{}/res/ladybird/BrowserContentFilters.txt", s_serenity_resource_root), Core::File::OpenMode::Read);
if (file_or_error.is_error())
return file_or_error.release_error();
auto file = file_or_error.release_value();
auto ad_filter_list = TRY(Core::Stream::BufferedFile::create(move(file)));
auto ad_filter_list = TRY(Core::BufferedFile::create(move(file)));
auto buffer = TRY(ByteBuffer::create_uninitialized(4096));
while (TRY(ad_filter_list->can_read_line())) {
auto line = TRY(ad_filter_list->read_line(buffer));
Expand Down
2 changes: 1 addition & 1 deletion Ladybird/WebContentView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ Gfx::IntRect WebContentView::notify_server_did_request_fullscreen_window()

void WebContentView::notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32 request_id)
{
auto file = Core::Stream::File::open(path, Core::Stream::OpenMode::Read);
auto file = Core::File::open(path, Core::File::OpenMode::Read);
if (file.is_error())
client().async_handle_file_return(file.error().code(), {}, request_id);
else
Expand Down
4 changes: 2 additions & 2 deletions Ladybird/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ static ErrorOr<void> handle_attached_debugger()
// incorrectly forwards the signal to us even when it's set to
// "nopass". See https://sourceware.org/bugzilla/show_bug.cgi?id=9425
// for details.
auto unbuffered_status_file = TRY(Core::Stream::File::open("/proc/self/status"sv, Core::Stream::OpenMode::Read));
auto status_file = TRY(Core::Stream::BufferedFile::create(move(unbuffered_status_file)));
auto unbuffered_status_file = TRY(Core::File::open("/proc/self/status"sv, Core::File::OpenMode::Read));
auto status_file = TRY(Core::BufferedFile::create(move(unbuffered_status_file)));
auto buffer = TRY(ByteBuffer::create_uninitialized(4096));
while (TRY(status_file->can_read_line())) {
auto line = TRY(status_file->read_line(buffer));
Expand Down
5 changes: 3 additions & 2 deletions Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <AK/HashMap.h>
#include <AK/SourceGenerator.h>
#include <AK/StringBuilder.h>
#include <LibCore/File.h>
#include <LibCore/Stream.h>
#include <LibMain/Main.h>
#include <ctype.h>
Expand Down Expand Up @@ -69,7 +70,7 @@ static bool is_primitive_type(DeprecatedString const& type)
static bool is_simple_type(DeprecatedString const& type)
{
// Small types that it makes sense just to pass by value.
return type.is_one_of("Gfx::Color", "Gfx::IntPoint", "Gfx::FloatPoint", "Gfx::IntSize", "Gfx::FloatSize", "Core::Stream::OpenMode");
return type.is_one_of("Gfx::Color", "Gfx::IntPoint", "Gfx::FloatPoint", "Gfx::IntSize", "Gfx::FloatSize", "Core::File::OpenMode");
}

static bool is_primitive_or_simple_type(DeprecatedString const& type)
Expand Down Expand Up @@ -796,7 +797,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return 1;
}

auto file = TRY(Core::Stream::File::open(arguments.strings[1], Core::Stream::OpenMode::Read));
auto file = TRY(Core::File::open(arguments.strings[1], Core::File::OpenMode::Read));

auto file_contents = TRY(file->read_until_eof());

Expand Down
15 changes: 8 additions & 7 deletions Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <AK/SourceGenerator.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/Stream.h>

enum class PnpIdColumns {
Expand Down Expand Up @@ -116,7 +117,7 @@ static ErrorOr<ApprovalDate> parse_approval_date(StringView const& str)
return ApprovalDate { .year = year.value(), .month = month.value(), .day = day.value() };
}

static ErrorOr<HashMap<DeprecatedString, PnpIdData>> parse_pnp_ids_database(Core::Stream::File& pnp_ids_file)
static ErrorOr<HashMap<DeprecatedString, PnpIdData>> parse_pnp_ids_database(Core::File& pnp_ids_file)
{
auto pnp_ids_file_bytes = TRY(pnp_ids_file.read_until_eof());
StringView pnp_ids_file_contents(pnp_ids_file_bytes);
Expand Down Expand Up @@ -181,7 +182,7 @@ static ErrorOr<HashMap<DeprecatedString, PnpIdData>> parse_pnp_ids_database(Core
return pnp_id_data;
}

static ErrorOr<void> generate_header(Core::Stream::File& file, HashMap<DeprecatedString, PnpIdData> const& pnp_ids)
static ErrorOr<void> generate_header(Core::File& file, HashMap<DeprecatedString, PnpIdData> const& pnp_ids)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -215,7 +216,7 @@ namespace PnpIDs {
return {};
}

static ErrorOr<void> generate_source(Core::Stream::File& file, HashMap<DeprecatedString, PnpIdData> const& pnp_ids)
static ErrorOr<void> generate_source(Core::File& file, HashMap<DeprecatedString, PnpIdData> const& pnp_ids)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -281,17 +282,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(pnp_ids_file_path, "Path to the input PNP ID database file", "pnp-ids-file", 'p', "pnp-ids-file");
args_parser.parse(arguments);

auto open_file = [&](StringView path, Core::Stream::OpenMode mode = Core::Stream::OpenMode::Read) -> ErrorOr<NonnullOwnPtr<Core::Stream::File>> {
auto open_file = [&](StringView path, Core::File::OpenMode mode = Core::File::OpenMode::Read) -> ErrorOr<NonnullOwnPtr<Core::File>> {
if (path.is_empty()) {
args_parser.print_usage(stderr, arguments.argv[0]);
return Error::from_string_literal("Must provide all command line options");
}

return Core::Stream::File::open(path, mode);
return Core::File::open(path, mode);
};

auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::ReadWrite));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::ReadWrite));
auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::ReadWrite));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::ReadWrite));
auto pnp_ids_file = TRY(open_file(pnp_ids_file_path));

auto pnp_id_map = TRY(parse_pnp_ids_database(*pnp_ids_file));
Expand Down
11 changes: 6 additions & 5 deletions Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/Stream.h>
#include <LibMain/Main.h>

Expand Down Expand Up @@ -355,7 +356,7 @@ Vector<FunctionDefinition> create_function_definitions(DeprecatedString function
return functions;
}

ErrorOr<void> generate_header_file(JsonObject& api_data, Core::Stream::File& file)
ErrorOr<void> generate_header_file(JsonObject& api_data, Core::File& file)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -409,7 +410,7 @@ ErrorOr<void> generate_header_file(JsonObject& api_data, Core::Stream::File& fil
return {};
}

ErrorOr<void> generate_implementation_file(JsonObject& api_data, Core::Stream::File& file)
ErrorOr<void> generate_implementation_file(JsonObject& api_data, Core::File& file)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -535,7 +536,7 @@ ErrorOr<void> generate_implementation_file(JsonObject& api_data, Core::Stream::F

ErrorOr<JsonValue> read_entire_file_as_json(StringView filename)
{
auto file = TRY(Core::Stream::File::open(filename, Core::Stream::OpenMode::Read));
auto file = TRY(Core::File::open(filename, Core::File::OpenMode::Read));
auto json_size = TRY(file->size());
auto json_data = TRY(ByteBuffer::create_uninitialized(json_size));
TRY(file->read_entire_buffer(json_data.bytes()));
Expand All @@ -558,8 +559,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
VERIFY(json.is_object());
auto api_data = json.as_object();

auto generated_header_file = TRY(Core::Stream::File::open(generated_header_path, Core::Stream::OpenMode::Write));
auto generated_implementation_file = TRY(Core::Stream::File::open(generated_implementation_path, Core::Stream::OpenMode::Write));
auto generated_header_file = TRY(Core::File::open(generated_header_path, Core::File::OpenMode::Write));
auto generated_implementation_file = TRY(Core::File::open(generated_implementation_path, Core::File::OpenMode::Write));

TRY(generate_header_file(api_data, *generated_header_file));
TRY(generate_implementation_file(api_data, *generated_implementation_file));
Expand Down
8 changes: 4 additions & 4 deletions Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1701,7 +1701,7 @@ static DeprecatedString format_identifier(StringView owner, DeprecatedString ide
return identifier;
}

static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR& cldr)
static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -1729,7 +1729,7 @@ namespace Locale {
return {};
}

static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr)
static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -2416,8 +2416,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(dates_path, "Path to cldr-dates directory", "dates-path", 'd', "dates-path");
args_parser.parse(arguments);

auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write));
auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write));

CLDR cldr;
TRY(parse_all_locales(core_path, dates_path, cldr));
Expand Down
8 changes: 4 additions & 4 deletions Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ static ErrorOr<void> parse_all_locales(DeprecatedString bcp47_path, DeprecatedSt
return {};
}

static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR& cldr)
static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -1052,7 +1052,7 @@ namespace Locale {
return {};
}

static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr)
static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr)
{
auto string_index_type = cldr.unique_strings.type_that_fits();

Expand Down Expand Up @@ -1774,8 +1774,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(dates_path, "Path to cldr-dates directory", "dates-path", 'd', "dates-path");
args_parser.parse(arguments);

auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write));
auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write));

CLDR cldr;
TRY(parse_all_locales(bcp47_path, core_path, locale_names_path, misc_path, numbers_path, dates_path, cldr));
Expand Down
8 changes: 4 additions & 4 deletions Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ static DeprecatedString format_identifier(StringView, DeprecatedString identifie
return identifier.to_titlecase();
}

static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR& cldr)
static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand All @@ -768,7 +768,7 @@ namespace Locale {
return {};
}

static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr)
static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -1128,8 +1128,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(units_path, "Path to cldr-units directory", "units-path", 'u', "units-path");
args_parser.parse(arguments);

auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write));
auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write));

CLDR cldr;
TRY(parse_all_locales(core_path, numbers_path, units_path, cldr));
Expand Down
8 changes: 4 additions & 4 deletions Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ static ErrorOr<void> parse_all_locales(DeprecatedString core_path, DeprecatedStr
return {};
}

static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR&)
static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR&)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand All @@ -447,7 +447,7 @@ namespace Locale {
return {};
}

static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr)
static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -673,8 +673,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(locale_names_path, "Path to cldr-localenames directory", "locale-names-path", 'l', "locale-names-path");
args_parser.parse(arguments);

auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write));
auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write));

CLDR cldr;
TRY(parse_all_locales(core_path, locale_names_path, cldr));
Expand Down
8 changes: 4 additions & 4 deletions Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static ErrorOr<void> parse_all_locales(DeprecatedString dates_path, CLDR& cldr)
return {};
}

static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, CLDR&)
static ErrorOr<void> generate_unicode_locale_header(Core::BufferedFile& file, CLDR&)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand All @@ -185,7 +185,7 @@ namespace Locale {
return {};
}

static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, CLDR& cldr)
static ErrorOr<void> generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -293,8 +293,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(dates_path, "Path to cldr-dates directory", "dates-path", 'd', "dates-path");
args_parser.parse(arguments);

auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write));
auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write));

CLDR cldr;
TRY(parse_all_locales(dates_path, cldr));
Expand Down
14 changes: 7 additions & 7 deletions Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static void parse_rule(StringView rule_line, TimeZoneData& time_zone_data)
static ErrorOr<void> parse_time_zones(StringView time_zone_path, TimeZoneData& time_zone_data)
{
// For reference, the man page for `zic` has the best documentation of the TZDB file format.
auto file = TRY(open_file(time_zone_path, Core::Stream::OpenMode::Read));
auto file = TRY(open_file(time_zone_path, Core::File::OpenMode::Read));
Array<u8, 1024> buffer {};

Vector<TimeZoneOffset>* last_parsed_zone = nullptr;
Expand Down Expand Up @@ -346,7 +346,7 @@ static ErrorOr<void> parse_time_zones(StringView time_zone_path, TimeZoneData& t
return {};
}

static ErrorOr<void> parse_time_zone_coordinates(Core::Stream::BufferedFile& file, TimeZoneData& time_zone_data)
static ErrorOr<void> parse_time_zone_coordinates(Core::BufferedFile& file, TimeZoneData& time_zone_data)
{
auto parse_coordinate = [](auto coordinate) {
VERIFY(coordinate.substring_view(0, 1).is_one_of("+"sv, "-"sv));
Expand Down Expand Up @@ -448,7 +448,7 @@ static DeprecatedString format_identifier(StringView owner, DeprecatedString ide
return identifier;
}

static ErrorOr<void> generate_time_zone_data_header(Core::Stream::BufferedFile& file, TimeZoneData& time_zone_data)
static ErrorOr<void> generate_time_zone_data_header(Core::BufferedFile& file, TimeZoneData& time_zone_data)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand All @@ -473,7 +473,7 @@ namespace TimeZone {
return {};
}

static ErrorOr<void> generate_time_zone_data_implementation(Core::Stream::BufferedFile& file, TimeZoneData& time_zone_data)
static ErrorOr<void> generate_time_zone_data_implementation(Core::BufferedFile& file, TimeZoneData& time_zone_data)
{
StringBuilder builder;
SourceGenerator generator { builder };
Expand Down Expand Up @@ -819,9 +819,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_positional_argument(time_zone_paths, "Paths to the time zone database files", "time-zone-paths");
args_parser.parse(arguments);

auto generated_header_file = TRY(open_file(generated_header_path, Core::Stream::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::Stream::OpenMode::Write));
auto time_zone_coordinates_file = TRY(open_file(time_zone_coordinates_path, Core::Stream::OpenMode::Read));
auto generated_header_file = TRY(open_file(generated_header_path, Core::File::OpenMode::Write));
auto generated_implementation_file = TRY(open_file(generated_implementation_path, Core::File::OpenMode::Write));
auto time_zone_coordinates_file = TRY(open_file(time_zone_coordinates_path, Core::File::OpenMode::Read));

TimeZoneData time_zone_data {};
for (auto time_zone_path : time_zone_paths)
Expand Down
Loading

0 comments on commit 606a398

Please sign in to comment.