From 4a74102736a20a6fa5bf9df9cc7716cbecb5b777 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 14 Feb 2020 08:01:27 -0500
Subject: moved dump() to DirectoryEntry static functions instead of lambdas

---
 src/shared/directoryentry.cpp | 131 +++++++++++++++++++++++++++++++-----------
 1 file changed, 98 insertions(+), 33 deletions(-)

(limited to 'src/shared/directoryentry.cpp')

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index 2605d083..394eda7e 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -1380,61 +1380,80 @@ FileEntry::Ptr DirectoryEntry::insert(
   return fe;
 }
 
+struct DirectoryEntry::Context
+{
+  FilesOrigin& origin;
+  DirectoryStats& stats;
+  std::stack<DirectoryEntry*> current;
+};
+
 void DirectoryEntry::addFiles(
   env::DirectoryWalker& walker, FilesOrigin &origin,
   const std::wstring& path, DirectoryStats& stats)
 {
-  struct Context
-  {
-    FilesOrigin& origin;
-    DirectoryStats& stats;
-    std::stack<DirectoryEntry*> current;
-  };
-
   Context cx = {origin, stats};
   cx.current.push(this);
 
   walker.forEachEntry(path, &cx,
     [](void* pcx, std::wstring_view path)
     {
-      Context* cx = (Context*)pcx;
-      elapsed(cx->stats.dirTimes, [&] {
-        auto* sd = cx->current.top()->getSubDirectory(
-          path, true, cx->stats, cx->origin.getID());
-
-        cx->current.push(sd);
-      });
+      onDirectoryStart((Context*)pcx, path);
     },
 
     [](void* pcx, std::wstring_view path)
     {
-      Context* cx = (Context*)pcx;
+      onDirectoryEnd((Context*)pcx, path);
+    },
 
-      elapsed(cx->stats.dirTimes, [&] {
-        auto* current= cx->current.top();
+    [](void* pcx, std::wstring_view path, FILETIME ft)
+    {
+      onFile((Context*)pcx, path, ft);
+    }
+  );
 
-        {
-          std::scoped_lock lock(current->m_SubDirMutex);
+  {
+    std::scoped_lock lock(m_SubDirMutex);
 
-          std::sort(
-            current->m_SubDirectories.begin(),
-            current->m_SubDirectories.end(),
-            &DirCompareByName);
-        }
+    std::sort(
+      m_SubDirectories.begin(),
+      m_SubDirectories.end(),
+      &DirCompareByName);
+  }
+}
 
-        cx->current.pop();
-      });
-    },
+void DirectoryEntry::onDirectoryStart(Context* cx, std::wstring_view path)
+{
+  elapsed(cx->stats.dirTimes, [&] {
+    auto* sd = cx->current.top()->getSubDirectory(
+      path, true, cx->stats, cx->origin.getID());
+
+    cx->current.push(sd);
+  });
+}
+
+void DirectoryEntry::onDirectoryEnd(Context* cx, std::wstring_view path)
+{
+  elapsed(cx->stats.dirTimes, [&] {
+    auto* current = cx->current.top();
 
-    [](void* pcx, std::wstring_view path, FILETIME ft)
     {
-      Context* cx = (Context*)pcx;
+      std::scoped_lock lock(current->m_SubDirMutex);
 
-      elapsed(cx->stats.fileTimes, [&]{
-        cx->current.top()->insert(path, cx->origin, ft, L"", -1, cx->stats);
-      });
+      std::sort(
+        current->m_SubDirectories.begin(),
+        current->m_SubDirectories.end(),
+        &DirCompareByName);
     }
-  );
+
+    cx->current.pop();
+  });
+}
+
+void DirectoryEntry::onFile(Context* cx, std::wstring_view path, FILETIME ft)
+{
+  elapsed(cx->stats.fileTimes, [&]{
+    cx->current.top()->insert(path, cx->origin, ft, L"", -1, cx->stats);
+  });
 }
 
 void DirectoryEntry::addFiles(
@@ -1510,6 +1529,8 @@ DirectoryEntry *DirectoryEntry::getSubDirectory(
 {
   SubDirectoriesLookup::iterator itor;
 
+  std::scoped_lock lock(m_SubDirMutex);
+
   elapsed(stats.subdirLookupTimes, [&] {
     itor = m_SubDirectoriesLookup.find(dir.lcname);
   });
@@ -1664,4 +1685,48 @@ void DirectoryEntry::addFileToList(
   // fileNameLower has been moved from this point
 }
 
+void DirectoryEntry::dump(const std::wstring& file) const
+{
+  std::FILE* f = nullptr;
+  auto e = _wfopen_s(&f, file.c_str(), L"wb");
+
+  dump(f, L"Data");
+
+  std::fclose(f);
+}
+
+void DirectoryEntry::dump(std::FILE* f, const std::wstring& parentPath) const
+{
+  {
+    std::scoped_lock lock(m_FilesMutex);
+
+    for (auto&& index : m_Files) {
+      const auto file = m_FileRegister->getFile(index.second);
+      if (!file) {
+        continue;
+      }
+
+      if (file->isFromArchive()) {
+        // TODO: don't list files from archives. maybe make this an option?
+        continue;
+      }
+
+      const auto o = m_OriginConnection->getByID(file->getOrigin());
+      const auto path = parentPath + L"\\" + file->getName();
+      const auto line = path + L"\t(" + o.getName() + L")\r\n";
+
+      const auto lineu8 = MOShared::ToString(line, true);
+      std::fwrite(lineu8.data(), lineu8.size(), 1, f);
+    }
+  }
+
+  {
+    std::scoped_lock lock(m_SubDirMutex);
+    for (auto&& d : m_SubDirectories) {
+      const auto path = parentPath + L"\\" + d->m_Name;
+      d->dump(f, path);
+    }
+  }
+}
+
 } // namespace MOShared
-- 
cgit v1.3.1