mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 16:09:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'recursive_directory_iteration_errors' into 'master'

Browse source 
Add context to the errors on recursive iteration over directory

See merge request OpenMW/openmw!3872
This commit is contained in:
psi29a 2024-02-19 10:00:24 +00:00
commit e88e92d3aa
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
components/vfs/filesystemarchive.cpp
View file

@ -20,21 +20,36 @@ namespace VFS
if (prefix > 0 && 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)) std::filesystem::recursive_directory_iterator iterator(mPath);
for (auto it = std::filesystem::begin(iterator), end = std::filesystem::end(iterator); it != end;)
{ {
if (std::filesystem::is_directory(i)) const auto& i = *it;
continue;
const std::filesystem::path& filePath = i.path(); if (!std::filesystem::is_directory(i))
const std::string proper = Files::pathToUnicodeString(filePath); {
VFS::Path::Normalized searchable(std::string_view{ proper }.substr(prefix)); const std::filesystem::path& filePath = i.path();
FileSystemArchiveFile file(filePath); const std::string proper = Files::pathToUnicodeString(filePath);
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)
<< "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.";
}
// Exception thrown by the operator++ may not contain the context of the error like what exact path caused
// the problem which makes it hard to understand what's going on when iteration happens over a directory
// with thousands of files and subdirectories.
const std::filesystem::path prevPath = i.path();
std::error_code ec;
it.increment(ec);
if (ec != std::error_code())
throw std::runtime_error("Failed to recursively iterate over \"" + Files::pathToUnicodeString(mPath)
+ "\" when incrementing to the next item from \"" + Files::pathToUnicodeString(prevPath)
+ "\": " + ec.message());
} }
} }