From a5158f9fc806d506590dd9bf0e3282cb76c3ac4e Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 16 Jan 2025 09:19:08 +0100
Subject: move basicfile.h/cpp -> zencore (#273)

move jupiter.h/cpp -> zenutil
move packageformat.h/.cpp -> zenhttp

zenutil now depends on zenhttp instead of the inverse
---
 src/zen/cmds/admin_cmd.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/zen/cmds/admin_cmd.cpp')

diff --git a/src/zen/cmds/admin_cmd.cpp b/src/zen/cmds/admin_cmd.cpp
index e07e28f54..31e6886b2 100644
--- a/src/zen/cmds/admin_cmd.cpp
+++ b/src/zen/cmds/admin_cmd.cpp
@@ -1,12 +1,13 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
 #include "admin_cmd.h"
+
+#include <zencore/basicfile.h>
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
 #include <zenhttp/formatters.h>
 #include <zenhttp/httpclient.h>
 #include <zenhttp/httpcommon.h>
-#include <zenutil/basicfile.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <cpr/cpr.h>
-- 
cgit v1.2.3


From b6bac83e8456905c37c8abb4f57fd45d61c37c72 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Wed, 22 Jan 2025 15:26:55 +0100
Subject: Add multithreading directory scanning in core/filesystem (#277)

add DirectoryContent::IncludeFileSizes
add DirectoryContent::IncludeAttributes
add multithreaded GetDirectoryContent
use multithreaded GetDirectoryContent in workspace folder scanning
---
 src/zen/cmds/admin_cmd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/zen/cmds/admin_cmd.cpp')

diff --git a/src/zen/cmds/admin_cmd.cpp b/src/zen/cmds/admin_cmd.cpp
index 31e6886b2..995ed4136 100644
--- a/src/zen/cmds/admin_cmd.cpp
+++ b/src/zen/cmds/admin_cmd.cpp
@@ -737,14 +737,14 @@ CopyStateCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 
 	// Copy cache state
 	DirectoryContent CacheDirectoryContent;
-	GetDirectoryContent(CachePath, DirectoryContent::IncludeDirsFlag, CacheDirectoryContent);
+	GetDirectoryContent(CachePath, DirectoryContentFlags::IncludeDirs, CacheDirectoryContent);
 	for (const std::filesystem::path& NamespacePath : CacheDirectoryContent.Directories)
 	{
 		std::filesystem::path NamespaceName		  = NamespacePath.filename();
 		std::filesystem::path TargetNamespacePath = TargetCachePath / NamespaceName;
 
 		DirectoryContent CacheNamespaceContent;
-		GetDirectoryContent(NamespacePath, DirectoryContent::IncludeDirsFlag, CacheNamespaceContent);
+		GetDirectoryContent(NamespacePath, DirectoryContentFlags::IncludeDirs, CacheNamespaceContent);
 
 		for (const std::filesystem::path& BucketPath : CacheNamespaceContent.Directories)
 		{
-- 
cgit v1.2.3