From 343c880497f394be2ab6c83d7ee1680d205a2df1 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 4 Aug 2024 18:48:24 +0200
Subject: [PATCH] refactor: move filesystem_extractor to utility namespace

---
 CMakeLists.txt                                      | 2 +-
 include/dwarfs/{ => utility}/filesystem_extractor.h | 4 ++++
 src/dwarfs/{ => utility}/filesystem_extractor.cpp   | 8 +++++---
 src/dwarfsextract_main.cpp                          | 8 ++++----
 test/compat_test.cpp                                | 4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)
 rename include/dwarfs/{ => utility}/filesystem_extractor.h (98%)
 rename src/dwarfs/{ => utility}/filesystem_extractor.cpp (98%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e339cd06..46bdf0a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -693,7 +693,7 @@ list(APPEND LIBDWARFS_REWRITE_SRC
 )
 
 list(APPEND LIBDWARFS_EXTRACTOR_SRC
-  src/dwarfs/filesystem_extractor.cpp
+  src/dwarfs/utility/filesystem_extractor.cpp
 )
 
 list(APPEND LIBDWARFS_TOOL_SRC
diff --git a/include/dwarfs/filesystem_extractor.h b/include/dwarfs/utility/filesystem_extractor.h
similarity index 98%
rename from include/dwarfs/filesystem_extractor.h
rename to include/dwarfs/utility/filesystem_extractor.h
index 83046d79..6522844f 100644
--- a/include/dwarfs/filesystem_extractor.h
+++ b/include/dwarfs/utility/filesystem_extractor.h
@@ -40,6 +40,8 @@ class filesystem_v2;
 
 }
 
+namespace utility {
+
 struct filesystem_extractor_options {
   size_t max_queued_bytes{4096};
   bool continue_on_error{false};
@@ -90,4 +92,6 @@ class filesystem_extractor {
   std::unique_ptr<impl> impl_;
 };
 
+} // namespace utility
+
 } // namespace dwarfs
diff --git a/src/dwarfs/filesystem_extractor.cpp b/src/dwarfs/utility/filesystem_extractor.cpp
similarity index 98%
rename from src/dwarfs/filesystem_extractor.cpp
rename to src/dwarfs/utility/filesystem_extractor.cpp
index 161134c7..d871ab2a 100644
--- a/src/dwarfs/filesystem_extractor.cpp
+++ b/src/dwarfs/utility/filesystem_extractor.cpp
@@ -40,7 +40,6 @@
 #include <folly/system/ThreadName.h>
 
 #include <dwarfs/file_stat.h>
-#include <dwarfs/filesystem_extractor.h>
 #include <dwarfs/fstypes.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
@@ -49,14 +48,17 @@
 #include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/scope_exit.h>
 #include <dwarfs/util.h>
+#include <dwarfs/utility/filesystem_extractor.h>
 #include <dwarfs/vfs_stat.h>
 
 #include <dwarfs/internal/worker_group.h>
 
-namespace dwarfs {
+namespace dwarfs::utility {
 
 namespace internal {
 
+using namespace dwarfs::internal;
+
 namespace {
 
 class cache_semaphore {
@@ -436,4 +438,4 @@ void filesystem_extractor::add_library_dependencies(
   deps.add_library(::archive_version_string());
 }
 
-} // namespace dwarfs
+} // namespace dwarfs::utility
diff --git a/src/dwarfsextract_main.cpp b/src/dwarfsextract_main.cpp
index f5b8bc11..8a531596 100644
--- a/src/dwarfsextract_main.cpp
+++ b/src/dwarfsextract_main.cpp
@@ -26,7 +26,6 @@
 
 #include <boost/program_options.hpp>
 
-#include <dwarfs/filesystem_extractor.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
@@ -39,6 +38,7 @@
 #include <dwarfs/tool/program_options_helpers.h>
 #include <dwarfs/tool/tool.h>
 #include <dwarfs/util.h>
+#include <dwarfs/utility/filesystem_extractor.h>
 #include <dwarfs_tool_main.h>
 
 namespace po = boost::program_options;
@@ -131,7 +131,7 @@ int dwarfsextract_main(int argc, sys_char** argv, iolayer const& iol) {
   if (vm.count("help") or !vm.count("input")) {
     library_dependencies deps;
     deps.add_common_libraries();
-    filesystem_extractor::add_library_dependencies(deps);
+    utility::filesystem_extractor::add_library_dependencies(deps);
 
     iol.out << tool::tool_header("dwarfsextract") << deps.as_string() << "\n\n"
             << usage << "\n"
@@ -165,7 +165,7 @@ int dwarfsextract_main(int argc, sys_char** argv, iolayer const& iol) {
         perfmon_enabled, iol.file, perfmon_trace_file);
 
     reader::filesystem_v2 fs(lgr, *iol.os, fs_image, fsopts, perfmon);
-    filesystem_extractor fsx(lgr, *iol.os);
+    utility::filesystem_extractor fsx(lgr, *iol.os);
 
     if (format.empty()) {
       fsx.open_disk(iol.os->canonical(output));
@@ -192,7 +192,7 @@ int dwarfsextract_main(int argc, sys_char** argv, iolayer const& iol) {
       }
     }
 
-    filesystem_extractor_options fsx_opts;
+    utility::filesystem_extractor_options fsx_opts;
 
     fsx_opts.max_queued_bytes = fsopts.block_cache.max_bytes;
     fsx_opts.continue_on_error = continue_on_error;
diff --git a/test/compat_test.cpp b/test/compat_test.cpp
index 226cde01..a943a7df 100644
--- a/test/compat_test.cpp
+++ b/test/compat_test.cpp
@@ -38,12 +38,12 @@
 
 #include <dwarfs/block_compressor.h>
 #include <dwarfs/file_stat.h>
-#include <dwarfs/filesystem_extractor.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/thread_pool.h>
+#include <dwarfs/utility/filesystem_extractor.h>
 #include <dwarfs/utility/rewrite_filesystem.h>
 #include <dwarfs/vfs_stat.h>
 #include <dwarfs/writer/filesystem_block_category_resolver.h>
@@ -981,7 +981,7 @@ void check_compat(logger& lgr, reader::filesystem_v2 const& fs,
   }
 
   test::os_access_mock os;
-  filesystem_extractor ext(lgr, os);
+  utility::filesystem_extractor ext(lgr, os);
   std::ostringstream oss;
 
   EXPECT_NO_THROW(ext.open_stream(oss, "mtree"));