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

LibCore: Do not return an Optional from Resource:::filesystem_path

Browse source 
This API never returns OptionalNone, and all callers already assume as
much.
This commit is contained in:
Timothy Flynn 2023-11-05 08:05:22 -05:00 • committed by Andreas Kling
parent 2a1fc96650
commit 98a82565cd
6 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibCore/ResourceImplementationFile.cpp
View file

@ -11,6 +11,7 @@
#include <LibCore/ResourceImplementationFile.h>
namespace Core {
ResourceImplementationFile::ResourceImplementationFile(String base_directory)
: m_base_directory(move(base_directory))
{
@ -33,14 +34,14 @@ ErrorOr<NonnullRefPtr<Resource>> ResourceImplementationFile::load_from_resource_
Vector<String> ResourceImplementationFile::child_names_for_resource_scheme(Resource const& resource)
{
Vector<String> children;
Core::DirIterator it(resource.filesystem_path().release_value().to_deprecated_string(), Core::DirIterator::SkipParentAndBaseDir);
Core::DirIterator it(resource.filesystem_path().to_deprecated_string(), Core::DirIterator::SkipParentAndBaseDir);
while (it.has_next())
children.append(MUST(String::from_deprecated_string(it.next_path())));
return children;
}
Optional<String> ResourceImplementationFile::filesystem_path_for_resource_scheme(String const& relative_path)
String ResourceImplementationFile::filesystem_path_for_resource_scheme(String const& relative_path)
{
return MUST(String::from_deprecated_string(LexicalPath::join(m_base_directory, relative_path).string()));
}