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

Some more FS fixes.

Browse Source
This commit is contained in:
Patrick 2025-03-10 09:56:26 +01:00
parent c5b9c02342
commit 75e77c53e4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/mijin/virtual_filesystem/filesystem.cpp
View File

@ -54,11 +54,13 @@ std::vector<FileInfo> OSFileSystemAdapter::listFiles(const fs::path& folder)
info.isHidden = info.path.filename().string().starts_with('.'); // at least for Linux info.isHidden = info.path.filename().string().starts_with('.'); // at least for Linux
if (info.isFolder) if (info.isFolder)
{ {
MIJIN_TRY std::error_code errorCode;
fs::directory_iterator dirIt(info.path, errorCode);
if (errorCode != std::error_code{})
{ {
info.size = std::distance(fs::directory_iterator(info.path), fs::directory_iterator()); info.size = std::distance(dirIt, fs::directory_iterator());
} }
MIJIN_CATCH(std::runtime_error&) else
{ {
info.size = 0; info.size = 0;
} }

4
source/mijin/virtual_filesystem/mapping.hpp
View File

@ -71,6 +71,10 @@ std::vector<FileInfo> MappingFileSystemAdapter<TWrapped>::listFiles(const fs::pa
result = wrapped_.listFiles(adjusted); result = wrapped_.listFiles(adjusted);
for (FileInfo& fileInfo : result) for (FileInfo& fileInfo : result)
{ {
if (fileInfo.path.is_absolute())
{
fileInfo.path = fs::relative(fileInfo.path, "/");
}
fileInfo.path = root_ / fileInfo.path; fileInfo.path = root_ / fileInfo.path;
} }
return result; return result;