RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:08:12 +00:00
Code Issues Activity Actions

grep: Port to Core::Stream

Browse source 
It also adds support for `ErrorOr` in one lambda.
This commit is contained in:
Lucas CHOLLET 2023-01-17 18:26:30 -05:00 • committed by Jelle Raaijmakers
parent f354b52099
commit 36e66502c9
1 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Userland/Utilities/grep.cpp
View file

@ -13,6 +13,7 @@
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/Stream.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <LibRegex/Regex.h> #include <LibRegex/Regex.h>
@ -212,27 +213,16 @@ ErrorOr<int> serenity_main(Main::Arguments args)
bool did_match_something = false; bool did_match_something = false;
auto handle_file = [&matches, binary_mode, suppress_errors, count_lines, quiet_mode, auto handle_file = [&matches, binary_mode, count_lines, quiet_mode,
user_specified_multiple_files, &matched_line_count, &did_match_something](StringView filename, bool print_filename) -> bool { user_specified_multiple_files, &matched_line_count, &did_match_something](StringView filename, bool print_filename) -> ErrorOr<void> {
auto file = Core::File::construct(filename); auto file = TRY(Core::Stream::File::open(filename, Core::Stream::OpenMode::Read));
if (!file->open(Core::OpenMode::ReadOnly)) { auto buffered_file = TRY(Core::Stream::BufferedFile::create(move(file)));
if (!suppress_errors)
warnln("Failed to open {}: {}", filename, file->error_string());
return false;
}
auto file_size_or_error = Core::File::size(filename); for (size_t line_number = 1; TRY(buffered_file->can_read_line()); ++line_number) {
if (file_size_or_error.is_error()) { Array<u8, PAGE_SIZE> buffer;
if (!suppress_errors) auto line = TRY(buffered_file->read_line(buffer));
warnln("Failed to retrieve size of {}: {}", filename, strerror(file_size_or_error.error().code()));
return false;
}
auto file_size = file_size_or_error.release_value(); auto is_binary = line.contains('\0');
for (size_t line_number = 1; file->can_read_line(); ++line_number) {
auto line = file->read_line(file_size);
auto is_binary = memchr(line.characters(), 0, line.length()) != nullptr;
auto matched = matches(line, filename, line_number, print_filename, is_binary); auto matched = matches(line, filename, line_number, print_filename, is_binary);
did_match_something = did_match_something || matched; did_match_something = did_match_something || matched;
@ -248,16 +238,18 @@ ErrorOr<int> serenity_main(Main::Arguments args)
matched_line_count = 0; matched_line_count = 0;
} }
return true; return {};
}; };
auto add_directory = [&handle_file, user_has_specified_files](DeprecatedString base, Optional<DeprecatedString> recursive, auto handle_directory) -> void { auto add_directory = [&handle_file, user_has_specified_files, suppress_errors](DeprecatedString base, Optional<DeprecatedString> recursive, auto handle_directory) -> void {
Core::DirIterator it(recursive.value_or(base), Core::DirIterator::Flags::SkipDots); Core::DirIterator it(recursive.value_or(base), Core::DirIterator::Flags::SkipDots);
while (it.has_next()) { while (it.has_next()) {
auto path = it.next_full_path(); auto path = it.next_full_path();
if (!Core::File::is_directory(path)) { if (!Core::File::is_directory(path)) {
auto key = user_has_specified_files ? path.view() : path.substring_view(base.length() + 1, path.length() - base.length() - 1); auto key = user_has_specified_files ? path.view() : path.substring_view(base.length() + 1, path.length() - base.length() - 1);
handle_file(key, true); if (auto result = handle_file(key, true); result.is_error() && !suppress_errors)
warnln("Failed with file {}: {}", key, result.release_error());
} else { } else {
handle_directory(base, path, handle_directory); handle_directory(base, path, handle_directory);
} }
@ -303,8 +295,12 @@ ErrorOr<int> serenity_main(Main::Arguments args)
} else { } else {
bool print_filename { files.size() > 1 }; bool print_filename { files.size() > 1 };
for (auto& filename : files) { for (auto& filename : files) {
if (!handle_file(filename, print_filename)) auto result = handle_file(filename, print_filename);
if (result.is_error()) {
if (!suppress_errors)
warnln("Failed with file {}: {}", filename, result.release_error());
return 1; return 1;
}
} }
} }
} }