Revert symlink support. Add actual support for out of tree YMLs (#257)

* Revert "Support reading ymls from a common symlinked dir (#255)"

This reverts commit 7f13cffd3efcc50e8ee70809f3a208dcb6b1771b.

* actual support for out of tree common files

* Fixes

* Fix windows

* Oops

2 files changed, 9 insertions, 3 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
diff --git a/src/utils/TorchUtils.h b/src/utils/TorchUtils.h
index 275ec47..1d501cb 100644
--- a/src/utils/TorchUtils.h
+++ b/src/utils/TorchUtils.h
@@ -34,6 +34,6 @@ constexpr bool contains(const Container& c, const Key& k) {
 }
 
 uint32_t translate(uint32_t offset);
-std::vector<std::filesystem::directory_entry> getRecursiveEntries(const std::filesystem::path baseDir);
+std::vector<std::filesystem::directory_entry> getRecursiveEntries(const std::filesystem::path baseDir, const std::filesystem::path );
 
 };
\ No newline at end of file