1 files changed, 13 insertions, 65 deletions

diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index a734e9eb1..da48253e2 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -1956,49 +1956,23 @@ ZenCacheDiskLayer::Put(std::string_view InBucket, const IoHash& HashKey, const Z
 void
 ZenCacheDiskLayer::DiscoverBuckets()
 {
-	FileSystemTraversal Traversal;
-	struct Visitor : public FileSystemTraversal::TreeVisitor
-	{
-		virtual void VisitFile([[maybe_unused]] const std::filesystem::path& Parent,
-							   [[maybe_unused]] const path_view&			 File,
-							   [[maybe_unused]] uint64_t					 FileSize) override
-		{
-		}
-
-		virtual bool VisitDirectory([[maybe_unused]] const std::filesystem::path& Parent, const path_view& DirectoryName) override
-		{
-			Dirs.push_back((decltype(Dirs)::value_type)(DirectoryName));
-			return false;
-		}
-
-		std::vector<std::filesystem::path::string_type> Dirs;
-	} Visit;
-
-	Traversal.TraverseFileSystem(m_RootDir, Visit);
+	DirectoryContent DirContent;
+	GetDirectoryContent(m_RootDir, DirectoryContent::IncludeDirsFlag, DirContent);
 
 	// Initialize buckets
 
 	RwLock::ExclusiveLockScope _(m_Lock);
 
-	for (const auto& BucketName : Visit.Dirs)
+	for (const std::filesystem::path& BucketPath : DirContent.Directories)
 	{
+		std::string BucketName = PathToUtf8(BucketPath.stem());
 		// New bucket needs to be created
-
-#if ZEN_PLATFORM_WINDOWS
-		std::string BucketName8 = WideToUtf8(BucketName);
-#else
-		const auto& BucketName8 = BucketName;
-#endif
-
-		if (auto It = m_Buckets.find(BucketName8); It != m_Buckets.end())
+		if (auto It = m_Buckets.find(BucketName); It != m_Buckets.end())
 		{
 		}
 		else
 		{
-			auto InsertResult = m_Buckets.try_emplace(BucketName8, BucketName8);
-
-			std::filesystem::path BucketPath = m_RootDir;
-			BucketPath /= BucketName8;
+			auto InsertResult = m_Buckets.try_emplace(BucketName, BucketName);
 
 			CacheBucket& Bucket = InsertResult.first->second;
 
@@ -2006,11 +1980,11 @@ ZenCacheDiskLayer::DiscoverBuckets()
 
 			if (Bucket.IsOk())
 			{
-				ZEN_INFO("Discovered bucket '{}'", BucketName8);
+				ZEN_INFO("Discovered bucket '{}'", BucketName);
 			}
 			else
 			{
-				ZEN_WARN("Found directory '{}' in our base directory '{}' but it is not a valid bucket", BucketName8, m_RootDir);
+				ZEN_WARN("Found directory '{}' in our base directory '{}' but it is not a valid bucket", BucketName, m_RootDir);
 
 				m_Buckets.erase(InsertResult.first);
 			}
@@ -2102,44 +2076,18 @@ ZenCacheDiskLayer::TotalSize() const
 
 static constexpr std::string_view ZenCacheNamespaceDirPrefix = "ns_";
 
-namespace {
-
-	std::vector<std::string> FindExistingFolders(const std::filesystem::path& RootPath)
-	{
-		FileSystemTraversal Traversal;
-		struct Visitor : public FileSystemTraversal::TreeVisitor
-		{
-			virtual void VisitFile(const std::filesystem::path&, const path_view&, uint64_t) override {}
-
-			virtual bool VisitDirectory(const std::filesystem::path&, const path_view& DirectoryName) override
-			{
-#if ZEN_PLATFORM_WINDOWS
-				std::string DirectoryName8 = WideToUtf8(DirectoryName);
-#else
-				std::string DirectoryName8 = std::string(DirectoryName);
-#endif
-				Dirs.push_back(DirectoryName8);
-				return false;
-			}
-
-			std::vector<std::string> Dirs;
-		} Visit;
-
-		Traversal.TraverseFileSystem(RootPath, Visit);
-		return Visit.Dirs;
-	}
-
-}  // namespace
-
 ZenCacheStore::ZenCacheStore(CasGc& Gc, std::filesystem::path BasePath) : GcStorage(Gc), GcContributor(Gc)
 {
 	CreateDirectories(BasePath);
-	std::vector<std::string> ExistingFolders = FindExistingFolders(BasePath);
+
+	DirectoryContent DirContent;
+	GetDirectoryContent(BasePath, DirectoryContent::IncludeDirsFlag, DirContent);
 
 	std::vector<std::string> LegacyBuckets;
 	std::vector<std::string> Namespaces;
-	for (const std::string& DirName : ExistingFolders)
+	for (const std::filesystem::path& DirPath : DirContent.Directories)
 	{
+		std::string DirName = PathToUtf8(DirPath.stem());
 		if (DirName.starts_with(ZenCacheNamespaceDirPrefix))
 		{
 			Namespaces.push_back(DirName.substr(3));