mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-03 09:06:40 +00:00
Code Issues Releases Wiki Activity

Accept normalized path by VFS::Manager functions

Browse source
This commit is contained in:
elsid 2024-01-16 23:55:42 +01:00
parent d549cfd66b
commit 9279138fb0
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/vfs/manager.cpp
View file

@ -38,9 +38,9 @@ namespace VFS
archive->listResources(mIndex); archive->listResources(mIndex);
} }
Files::IStreamPtr Manager::get(std::string_view name) const Files::IStreamPtr Manager::get(const Path::Normalized& name) const
{ {
return getNormalized(Path::normalizeFilename(name)); return getNormalized(name);
} }
Files::IStreamPtr Manager::getNormalized(std::string_view normalizedName) const Files::IStreamPtr Manager::getNormalized(std::string_view normalizedName) const
@ -52,17 +52,16 @@ namespace VFS
return found->second->open(); return found->second->open();
} }
bool Manager::exists(std::string_view name) const bool Manager::exists(const Path::Normalized& name) const
{ {
return mIndex.find(Path::normalizeFilename(name)) != mIndex.end(); return mIndex.find(name) != mIndex.end();
} }
std::string Manager::getArchive(std::string_view name) const std::string Manager::getArchive(const Path::Normalized& name) const
{ {
std::string normalized = Path::normalizeFilename(name);
for (auto it = mArchives.rbegin(); it != mArchives.rend(); ++it) for (auto it = mArchives.rbegin(); it != mArchives.rend(); ++it)
{ {
if ((*it)->contains(normalized)) if ((*it)->contains(name))
return (*it)->getDescription(); return (*it)->getDescription();
} }
return {}; return {};

7
components/vfs/manager.hpp
View file

@ -10,6 +10,7 @@
#include <vector> #include <vector>
#include "filemap.hpp" #include "filemap.hpp"
#include "pathutil.hpp"
namespace VFS namespace VFS
{ {
@ -40,19 +41,19 @@ namespace VFS
/// Does a file with this name exist? /// Does a file with this name exist?
/// @note May be called from any thread once the index has been built. /// @note May be called from any thread once the index has been built.
bool exists(std::string_view name) const; bool exists(const Path::Normalized& name) const;
/// Retrieve a file by name. /// Retrieve a file by name.
/// @note Throws an exception if the file can not be found. /// @note Throws an exception if the file can not be found.
/// @note May be called from any thread once the index has been built. /// @note May be called from any thread once the index has been built.
Files::IStreamPtr get(std::string_view name) const; Files::IStreamPtr get(const Path::Normalized& name) const;
/// Retrieve a file by name (name is already normalized). /// Retrieve a file by name (name is already normalized).
/// @note Throws an exception if the file can not be found. /// @note Throws an exception if the file can not be found.
/// @note May be called from any thread once the index has been built. /// @note May be called from any thread once the index has been built.
Files::IStreamPtr getNormalized(std::string_view normalizedName) const; Files::IStreamPtr getNormalized(std::string_view normalizedName) const;
std::string getArchive(std::string_view name) const; std::string getArchive(const Path::Normalized& name) const;
/// Recursively iterate over the elements of the given path /// Recursively iterate over the elements of the given path
/// In practice it return all files of the VFS starting with the given path /// In practice it return all files of the VFS starting with the given path