VideoCommon: Scan texture dumping directory + subdirectories to not re-dump existing files.

1 files changed, 52 insertions, 13 deletions

diff --git a/Source/Core/VideoCommon/TextureUtils.cpp b/Source/Core/VideoCommon/TextureUtils.cpp
index 9445cf16d6..907b1ac523 100644
--- a/Source/Core/VideoCommon/TextureUtils.cpp
+++ b/Source/Core/VideoCommon/TextureUtils.cpp
@@ -5,37 +5,76 @@
 
 #include <fmt/format.h>
 
+#include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
+#include "Common/Logging/Log.h"
+
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 
 #include "VideoCommon/AbstractTexture.h"
 
+namespace
+{
+std::string BuildDumpTextureFilename(std::string basename, u32 level, bool is_arbitrary)
+{
+  if (is_arbitrary)
+    basename += "_arb";
+
+  if (level > 0)
+    basename += fmt::format("_mip{}", level);
+
+  return basename;
+}
+}  // namespace
 namespace VideoCommon::TextureUtils
 {
 void DumpTexture(const ::AbstractTexture& texture, std::string basename, u32 level,
                  bool is_arbitrary)
 {
-  std::string szDir = File::GetUserPath(D_DUMPTEXTURES_IDX) + SConfig::GetInstance().GetGameID();
+  const std::string dump_dir =
+      File::GetUserPath(D_DUMPTEXTURES_IDX) + SConfig::GetInstance().GetGameID();
 
-  // make sure that the directory exists
-  if (!File::IsDirectory(szDir))
-    File::CreateDir(szDir);
+  if (!File::IsDirectory(dump_dir))
+    File::CreateDir(dump_dir);
 
-  if (is_arbitrary)
-  {
-    basename += "_arb";
-  }
+  const std::string name = BuildDumpTextureFilename(std::move(basename), level, is_arbitrary);
+  const std::string filename = fmt::format("{}/{}.png", dump_dir, name);
 
-  if (level > 0)
+  if (File::Exists(filename))
+    return;
+
+  texture.Save(filename, level, Config::Get(Config::GFX_TEXTURE_PNG_COMPRESSION_LEVEL));
+}
+
+void TextureDumper::DumpTexture(const ::AbstractTexture& texture, std::string basename, u32 level,
+                                bool is_arbitrary)
+{
+  const std::string dump_dir =
+      File::GetUserPath(D_DUMPTEXTURES_IDX) + SConfig::GetInstance().GetGameID();
+
+  if (m_dumped_textures.empty())
   {
-    basename += fmt::format("_mip{}", level);
+    if (!File::IsDirectory(dump_dir))
+      File::CreateDir(dump_dir);
+
+    for (auto& filename : Common::DoFileSearch({dump_dir}, {".png"}, true))
+    {
+      std::string name;
+      SplitPath(filename, nullptr, &name, nullptr);
+      m_dumped_textures.insert(name);
+    }
+
+    NOTICE_LOG_FMT(VIDEO, "Found {} dumped textures that will not be re-dumped.",
+                   m_dumped_textures.size());
   }
 
-  const std::string filename = fmt::format("{}/{}.png", szDir, basename);
-  if (File::Exists(filename))
+  const std::string name = BuildDumpTextureFilename(std::move(basename), level, is_arbitrary);
+  const bool file_existed = !m_dumped_textures.insert(name).second;
+  if (file_existed)
     return;
 
-  texture.Save(filename, level, Config::Get(Config::GFX_TEXTURE_PNG_COMPRESSION_LEVEL));
+  texture.Save(fmt::format("{}/{}.png", dump_dir, name), level,
+               Config::Get(Config::GFX_TEXTURE_PNG_COMPRESSION_LEVEL));
 }
 }  // namespace VideoCommon::TextureUtils