diff options
| -rw-r--r-- | Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeDateTimeFormat.cpp | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeDateTimeFormat.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeDateTimeFormat.cpp index 21f78992c2..f6aa97759a 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeDateTimeFormat.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeDateTimeFormat.cpp @@ -22,7 +22,7 @@ #include <AK/Utf8View.h> #include <LibCore/ArgsParser.h> #include <LibCore/DirIterator.h> -#include <LibCore/File.h> +#include <LibCore/Stream.h> #include <LibTimeZone/TimeZone.h> #include <LibUnicode/DateTimeFormat.h> @@ -607,8 +607,7 @@ static ErrorOr<void> parse_hour_cycles(String core_path, UnicodeLocaleData& loca time_data_path = time_data_path.append("supplemental"sv); time_data_path = time_data_path.append("timeData.json"sv); - auto time_data_file = TRY(Core::File::open(time_data_path.string(), Core::OpenMode::ReadOnly)); - auto time_data = TRY(JsonValue::from_string(time_data_file->read_all())); + auto time_data = TRY(read_json_file(time_data_path.string())); auto const& supplemental_object = time_data.as_object().get("supplemental"sv); auto const& time_data_object = supplemental_object.as_object().get("timeData"sv); @@ -652,9 +651,7 @@ static ErrorOr<void> parse_meta_zones(String core_path, UnicodeLocaleData& local meta_zone_path = meta_zone_path.append("supplemental"sv); meta_zone_path = meta_zone_path.append("metaZones.json"sv); - auto meta_zone_file = TRY(Core::File::open(meta_zone_path.string(), Core::OpenMode::ReadOnly)); - auto meta_zone = TRY(JsonValue::from_string(meta_zone_file->read_all())); - + auto meta_zone = TRY(read_json_file(meta_zone_path.string())); auto const& supplemental_object = meta_zone.as_object().get("supplemental"sv); auto const& meta_zone_object = supplemental_object.as_object().get("metaZones"sv); auto const& meta_zone_array = meta_zone_object.as_object().get("metazones"sv); @@ -1327,9 +1324,7 @@ static ErrorOr<void> parse_calendars(String locale_calendars_path, UnicodeLocale if (!calendars_path.basename().starts_with("ca-"sv)) return {}; - auto calendars_file = TRY(Core::File::open(calendars_path.string(), Core::OpenMode::ReadOnly)); - auto calendars = TRY(JsonValue::from_string(calendars_file->read_all())); - + auto calendars = TRY(read_json_file(calendars_path.string())); auto const& main_object = calendars.as_object().get("main"sv); auto const& locale_object = main_object.as_object().get(calendars_path.parent().basename()); auto const& dates_object = locale_object.as_object().get("dates"sv); @@ -1417,9 +1412,7 @@ static ErrorOr<void> parse_time_zone_names(String locale_time_zone_names_path, U LexicalPath time_zone_names_path(move(locale_time_zone_names_path)); time_zone_names_path = time_zone_names_path.append("timeZoneNames.json"sv); - auto time_zone_names_file = TRY(Core::File::open(time_zone_names_path.string(), Core::OpenMode::ReadOnly)); - auto time_zone_names = TRY(JsonValue::from_string(time_zone_names_file->read_all())); - + auto time_zone_names = TRY(read_json_file(time_zone_names_path.string())); auto const& main_object = time_zone_names.as_object().get("main"sv); auto const& locale_object = main_object.as_object().get(time_zone_names_path.parent().basename()); auto const& dates_object = locale_object.as_object().get("dates"sv); @@ -1530,9 +1523,7 @@ static ErrorOr<void> parse_day_periods(String core_path, UnicodeLocaleData& loca day_periods_path = day_periods_path.append("supplemental"sv); day_periods_path = day_periods_path.append("dayPeriods.json"sv); - auto day_periods_file = TRY(Core::File::open(day_periods_path.string(), Core::OpenMode::ReadOnly)); - auto locale_day_periods = TRY(JsonValue::from_string(day_periods_file->read_all())); - + auto locale_day_periods = TRY(read_json_file(day_periods_path.string())); auto const& supplemental_object = locale_day_periods.as_object().get("supplemental"sv); auto const& day_periods_object = supplemental_object.as_object().get("dayPeriodRuleSet"sv); @@ -1629,7 +1620,7 @@ static String format_identifier(StringView owner, String identifier) return identifier; } -static void generate_unicode_locale_header(Core::File& file, UnicodeLocaleData& locale_data) +static ErrorOr<void> generate_unicode_locale_header(Core::Stream::BufferedFile& file, UnicodeLocaleData& locale_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -1649,10 +1640,11 @@ namespace Unicode { } )~~~"); - VERIFY(file.write(generator.as_string_view())); + TRY(file.write(generator.as_string_view().bytes())); + return {}; } -static void generate_unicode_locale_implementation(Core::File& file, UnicodeLocaleData& locale_data) +static ErrorOr<void> generate_unicode_locale_implementation(Core::Stream::BufferedFile& file, UnicodeLocaleData& locale_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -2241,7 +2233,8 @@ Optional<StringView> get_time_zone_name(StringView locale, StringView time_zone, } )~~~"); - VERIFY(file.write(generator.as_string_view())); + TRY(file.write(generator.as_string_view().bytes())); + return {}; } ErrorOr<int> serenity_main(Main::Arguments arguments) @@ -2258,23 +2251,14 @@ 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 open_file = [&](StringView path) -> ErrorOr<NonnullRefPtr<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"sv); - } - - return Core::File::open(path, Core::OpenMode::ReadWrite); - }; - - auto generated_header_file = TRY(open_file(generated_header_path)); - auto generated_implementation_file = TRY(open_file(generated_implementation_path)); + 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)); UnicodeLocaleData locale_data; TRY(parse_all_locales(core_path, dates_path, locale_data)); - generate_unicode_locale_header(generated_header_file, locale_data); - generate_unicode_locale_implementation(generated_implementation_file, locale_data); + TRY(generate_unicode_locale_header(*generated_header_file, locale_data)); + TRY(generate_unicode_locale_implementation(*generated_implementation_file, locale_data)); return 0; } |