Merge branch 'main' into lm/oidctoken-exe-path

1 files changed, 36 insertions, 31 deletions

diff --git a/src/zencore/filesystem.cpp b/src/zencore/filesystem.cpp
index 7f341818b..92a065707 100644
--- a/src/zencore/filesystem.cpp
+++ b/src/zencore/filesystem.cpp
@@ -1592,7 +1592,7 @@ ReadStdIn()
 }
 
 FileContents
-ReadFile(std::filesystem::path Path)
+ReadFile(const std::filesystem::path& Path)
 {
 	uint64_t FileSizeBytes;
 	void*	 Handle;
@@ -1641,7 +1641,7 @@ ReadFile(std::filesystem::path Path)
 	return Contents;
 }
 
-ZENCORE_API void
+void
 ScanFile(void*												  NativeHandle,
 		 uint64_t											  Offset,
 		 uint64_t											  Size,
@@ -2669,36 +2669,41 @@ GetDirectoryContent(const std::filesystem::path& RootDir,
 			}
 			if (EnumHasAnyFlags(Flags, DirectoryContentFlags::Recursive))
 			{
-				PendingWorkCount.AddCount(1);
-				try
+				if (Visitor->AsyncAllowDirectory(Parent, DirectoryName))
 				{
-					WorkerPool.ScheduleWork(
-						[WorkerPool		  = &WorkerPool,
-						 PendingWorkCount = &PendingWorkCount,
-						 Visitor		  = Visitor,
-						 Flags			  = Flags,
-						 Path			  = std::move(Path),
-						 RelativeRoot	  = RelativeRoot / DirectoryName]() {
-							ZEN_ASSERT(Visitor);
-							auto _ = MakeGuard([&]() { PendingWorkCount->CountDown(); });
-							try
-							{
-								MultithreadedVisitor SubVisitor(*WorkerPool, *PendingWorkCount, RelativeRoot, Flags, Visitor);
-								FileSystemTraversal	 Traversal;
-								Traversal.TraverseFileSystem(Path, SubVisitor);
-								Visitor->AsyncVisitDirectory(SubVisitor.RelativeRoot, std::move(SubVisitor.Content));
-							}
-							catch (const std::exception& Ex)
-							{
-								ZEN_ERROR("Failed scheduling work to scan subfolder '{}'. Reason: '{}'", Path / RelativeRoot, Ex.what());
-							}
-						},
-						WorkerThreadPool::EMode::DisableBacklog);
-				}
-				catch (const std::exception& Ex)
-				{
-					ZEN_ERROR("Failed scheduling work to scan folder '{}'. Reason: '{}'", Path, Ex.what());
-					PendingWorkCount.CountDown();
+					PendingWorkCount.AddCount(1);
+					try
+					{
+						WorkerPool.ScheduleWork(
+							[WorkerPool		  = &WorkerPool,
+							 PendingWorkCount = &PendingWorkCount,
+							 Visitor		  = Visitor,
+							 Flags			  = Flags,
+							 Path			  = std::move(Path),
+							 RelativeRoot	  = RelativeRoot / DirectoryName]() {
+								ZEN_ASSERT(Visitor);
+								auto _ = MakeGuard([&]() { PendingWorkCount->CountDown(); });
+								try
+								{
+									MultithreadedVisitor SubVisitor(*WorkerPool, *PendingWorkCount, RelativeRoot, Flags, Visitor);
+									FileSystemTraversal	 Traversal;
+									Traversal.TraverseFileSystem(Path, SubVisitor);
+									Visitor->AsyncVisitDirectory(SubVisitor.RelativeRoot, std::move(SubVisitor.Content));
+								}
+								catch (const std::exception& Ex)
+								{
+									ZEN_ERROR("Failed scheduling work to scan subfolder '{}'. Reason: '{}'",
+											  Path / RelativeRoot,
+											  Ex.what());
+								}
+							},
+							WorkerThreadPool::EMode::DisableBacklog);
+					}
+					catch (const std::exception& Ex)
+					{
+						ZEN_ERROR("Failed scheduling work to scan folder '{}'. Reason: '{}'", Path, Ex.what());
+						PendingWorkCount.CountDown();
+					}
 				}
 			}
 			return false;