diff options
Diffstat (limited to 'src/utils/TorchUtils.cpp')
| -rw-r--r-- | src/utils/TorchUtils.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/utils/TorchUtils.cpp b/src/utils/TorchUtils.cpp index 8b9ad48..f04c2e2 100644 --- a/src/utils/TorchUtils.cpp +++ b/src/utils/TorchUtils.cpp @@ -35,13 +35,19 @@ int getFileDepth(const fs::path& base, const fs::path& p) { return std::distance(base.begin(), p.begin()); } -std::vector<fs::directory_entry> Torch::getRecursiveEntries(const fs::path baseDir) { +std::vector<fs::directory_entry> Torch::getRecursiveEntries(const fs::path baseDir, const fs::path commonDir) { std::set<fs::directory_entry> result; - for (const auto& entry : fs::recursive_directory_iterator(baseDir, std::filesystem::directory_options::follow_directory_symlink)) { + for (const auto& entry : fs::recursive_directory_iterator(baseDir)) { result.insert(entry); } + if (!commonDir.empty()) { + for (const auto& entry : fs::recursive_directory_iterator(commonDir)) { + result.insert(entry); + } + } + std::vector<fs::directory_entry> sortedEntries(result.begin(), result.end()); return sortedEntries; }
\ No newline at end of file |
