RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:37:46 +00:00
Code Issues Activity Actions

file: Use StringView instead of DeprecatedString for paths

Browse source
This commit is contained in:
Nico Weber 2023-02-26 19:04:47 -05:00 • committed by Linus Groh
parent 4193e53f62
commit a81e1a8c4f
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Utilities/file.cpp
View file

@ -19,13 +19,13 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
static Optional<DeprecatedString> description_only(StringView description, [[maybe_unused]] DeprecatedString const& path) static Optional<DeprecatedString> description_only(StringView description, StringView)
{ {
return description; return description;
} }
// FIXME: Ideally Gfx::ImageDecoder could tell us the image type directly. // FIXME: Ideally Gfx::ImageDecoder could tell us the image type directly.
static Optional<DeprecatedString> image_details(StringView description, DeprecatedString const& path) static Optional<DeprecatedString> image_details(StringView description, StringView path)
{ {
auto file_or_error = Core::MappedFile::map(path); auto file_or_error = Core::MappedFile::map(path);
if (file_or_error.is_error()) if (file_or_error.is_error())
@ -51,7 +51,7 @@ static Optional<DeprecatedString> image_details(StringView description, Deprecat
return builder.to_deprecated_string(); return builder.to_deprecated_string();
} }
static Optional<DeprecatedString> gzip_details(StringView description, DeprecatedString const& path) static Optional<DeprecatedString> gzip_details(StringView description, StringView path)
{ {
auto file_or_error = Core::MappedFile::map(path); auto file_or_error = Core::MappedFile::map(path);
if (file_or_error.is_error()) if (file_or_error.is_error())
@ -68,7 +68,7 @@ static Optional<DeprecatedString> gzip_details(StringView description, Deprecate
return DeprecatedString::formatted("{}, {}", description, gzip_details.value()); return DeprecatedString::formatted("{}, {}", description, gzip_details.value());
} }
static Optional<DeprecatedString> elf_details(StringView description, DeprecatedString const& path) static Optional<DeprecatedString> elf_details(StringView description, StringView path)
{ {
auto file_or_error = Core::MappedFile::map(path); auto file_or_error = Core::MappedFile::map(path);
if (file_or_error.is_error()) if (file_or_error.is_error())
@ -104,7 +104,7 @@ static Optional<DeprecatedString> elf_details(StringView description, Deprecated
is_dynamically_linked ? dynamic_section : ""); is_dynamically_linked ? dynamic_section : "");
} }
#define ENUMERATE_MIME_TYPE_DESCRIPTIONS \ #define ENUMERATE_MIME_TYPE_DESCRIPTIONS \
__ENUMERATE_MIME_TYPE_DESCRIPTION("application/gzip"sv, "gzip compressed data"sv, gzip_details) \ __ENUMERATE_MIME_TYPE_DESCRIPTION("application/gzip"sv, "gzip compressed data"sv, gzip_details) \
__ENUMERATE_MIME_TYPE_DESCRIPTION("application/javascript"sv, "JavaScript source"sv, description_only) \ __ENUMERATE_MIME_TYPE_DESCRIPTION("application/javascript"sv, "JavaScript source"sv, description_only) \
__ENUMERATE_MIME_TYPE_DESCRIPTION("application/json"sv, "JSON data"sv, description_only) \ __ENUMERATE_MIME_TYPE_DESCRIPTION("application/json"sv, "JSON data"sv, description_only) \
@ -142,7 +142,7 @@ static Optional<DeprecatedString> elf_details(StringView description, Deprecated
__ENUMERATE_MIME_TYPE_DESCRIPTION("text/markdown"sv, "Markdown document"sv, description_only) \ __ENUMERATE_MIME_TYPE_DESCRIPTION("text/markdown"sv, "Markdown document"sv, description_only) \
__ENUMERATE_MIME_TYPE_DESCRIPTION("text/x-shellscript"sv, "POSIX shell script text executable"sv, description_only) __ENUMERATE_MIME_TYPE_DESCRIPTION("text/x-shellscript"sv, "POSIX shell script text executable"sv, description_only)
static Optional<DeprecatedString> get_description_from_mime_type(StringView mime, DeprecatedString const& path) static Optional<DeprecatedString> get_description_from_mime_type(StringView mime, StringView path)
{ {
#define __ENUMERATE_MIME_TYPE_DESCRIPTION(mime_type, description, details) \ #define __ENUMERATE_MIME_TYPE_DESCRIPTION(mime_type, description, details) \
if (mime_type == mime) \ if (mime_type == mime) \
@ -156,7 +156,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
TRY(Core::System::pledge("stdio rpath")); TRY(Core::System::pledge("stdio rpath"));
Vector<DeprecatedString> paths; Vector<StringView> paths;
bool flag_mime_only = false; bool flag_mime_only = false;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
@ -172,7 +172,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
for (auto const& path : paths) { for (auto const& path : paths) {
auto file_or_error = Core::File::open(path, Core::File::OpenMode::Read); auto file_or_error = Core::File::open(path, Core::File::OpenMode::Read);
if (file_or_error.is_error()) { if (file_or_error.is_error()) {
perror(path.characters()); warnln("{}: {}", path, file_or_error.release_error());
all_ok = false; all_ok = false;
continue; continue;
} }