mewin/mijin2
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fixed enumeration of files.

Browse Source
This commit is contained in:
Patrick 2024-07-23 19:55:40 +02:00
parent 7aa1edcea0
commit 3b7396c4d6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/mijin/virtual_filesystem/relative.hpp
View File

@ -63,7 +63,16 @@ fs::path RelativeFileSystemAdapter<TWrapped>::getHomeFolder()
template<typename TWrapped>
std::vector<FileInfo> RelativeFileSystemAdapter<TWrapped>::listFiles(const fs::path& folder)
{
std::vector<FileInfo> result = wrapped_.listFiles(root_ / folder);
std::vector<FileInfo> result;
fs::path combinedPath = root_;
if (folder.is_absolute()) {
combinedPath += folder;
}
else {
combinedPath /= folder;
}
result = wrapped_.listFiles(combinedPath);
for (FileInfo& fileInfo : result) {
fileInfo.path = "/" / fileInfo.path.lexically_relative(root_);
}

2
source/mijin/virtual_filesystem/stacked.cpp
View File

@ -68,7 +68,7 @@ std::vector<FileInfo> StackedFileSystemAdapter::listFiles(const fs::path& folder
{
return existing.path == file.path;
});
if (it != files.end()) {
if (it == files.end()) {
files.push_back(file);
}
}