mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 13:36:44 +00:00
Code Issues Releases Wiki Activity

Initialize FileSystemArchive index in constructor

Browse source 
It should be initialize for each created archive anyway. There is no good reason
to have additional complexity for lazy initialization. And it helps to catch
problems with specific directory when it's added to the VFS not when all are
added and index is built.
This commit is contained in:
elsid 2024-01-30 01:19:42 +01:00
parent 0db730825d
commit d147d1d250
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 25 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
components/vfs/filesystemarchive.cpp
View file

@ -12,19 +12,12 @@ namespace VFS
{ {
FileSystemArchive::FileSystemArchive(const std::filesystem::path& path) FileSystemArchive::FileSystemArchive(const std::filesystem::path& path)
: mBuiltIndex(false) : mPath(path)
, mPath(path)
{
}
void FileSystemArchive::listResources(FileMap& out)
{
if (!mBuiltIndex)
{ {
const auto str = mPath.u8string(); const auto str = mPath.u8string();
size_t prefix = str.size(); std::size_t prefix = str.size();
if (!mPath.empty() && str[prefix - 1] != '\\' && str[prefix - 1] != '/') if (prefix > 0 && str[prefix - 1] != '\\' && str[prefix - 1] != '/')
++prefix; ++prefix;
for (const auto& i : std::filesystem::recursive_directory_iterator(mPath)) for (const auto& i : std::filesystem::recursive_directory_iterator(mPath))
@ -32,29 +25,24 @@ namespace VFS
if (std::filesystem::is_directory(i)) if (std::filesystem::is_directory(i))
continue; continue;
const auto& path = i.path(); const std::filesystem::path& filePath = i.path();
const std::string proper = Files::pathToUnicodeString(path); const std::string proper = Files::pathToUnicodeString(filePath);
FileSystemArchiveFile file(path);
VFS::Path::Normalized searchable(std::string_view{ proper }.substr(prefix)); VFS::Path::Normalized searchable(std::string_view{ proper }.substr(prefix));
FileSystemArchiveFile file(filePath);
const auto inserted = mIndex.emplace(std::move(searchable), std::move(file)); const auto inserted = mIndex.emplace(std::move(searchable), std::move(file));
if (!inserted.second) if (!inserted.second)
Log(Debug::Warning) Log(Debug::Warning)
<< "Warning: found duplicate file for '" << proper << "Found duplicate file for '" << proper
<< "', please check your file system for two files with the same name in different cases."; << "', please check your file system for two files with the same name in different cases.";
else
out[inserted.first->first] = &inserted.first->second;
} }
mBuiltIndex = true;
} }
else
void FileSystemArchive::listResources(FileMap& out)
{ {
for (auto& [k, v] : mIndex) for (auto& [k, v] : mIndex)
out[k] = &v; out[k] = &v;
} }
}
bool FileSystemArchive::contains(Path::NormalizedView file) const bool FileSystemArchive::contains(Path::NormalizedView file) const
{ {

1
components/vfs/filesystemarchive.hpp
View file

@ -36,7 +36,6 @@ namespace VFS
private: private:
std::map<VFS::Path::Normalized, FileSystemArchiveFile, std::less<>> mIndex; std::map<VFS::Path::Normalized, FileSystemArchiveFile, std::less<>> mIndex;
bool mBuiltIndex;
std::filesystem::path mPath; std::filesystem::path mPath;
}; };