refactor: move reader library code

CMakeLists.txt

@@ -616,6 +616,7 @@ list(APPEND LIBDWARFS_COMMON_SRC
   src/dwarfs/history.cpp
   src/dwarfs/internal/features.cpp
   src/dwarfs/internal/file_status_conv.cpp
+  src/dwarfs/internal/fs_section.cpp
   src/dwarfs/internal/string_table.cpp
   src/dwarfs/internal/wcwidth.c
   src/dwarfs/internal/worker_group.cpp
@@ -634,16 +635,15 @@ list(APPEND LIBDWARFS_COMMON_SRC
 )
 
 list(APPEND LIBDWARFS_READER_SRC
-  src/dwarfs/block_range.cpp
-  src/dwarfs/filesystem_v2.cpp
-  src/dwarfs/internal/block_cache.cpp
-  src/dwarfs/internal/cached_block.cpp
-  src/dwarfs/internal/filesystem_parser.cpp
-  src/dwarfs/internal/fs_section.cpp
-  src/dwarfs/internal/inode_reader_v2.cpp
-  src/dwarfs/internal/metadata_types.cpp
-  src/dwarfs/internal/metadata_v2.cpp
-  src/dwarfs/metadata_types.cpp
+  src/dwarfs/reader/block_range.cpp
+  src/dwarfs/reader/filesystem_v2.cpp
+  src/dwarfs/reader/internal/block_cache.cpp
+  src/dwarfs/reader/internal/cached_block.cpp
+  src/dwarfs/reader/internal/filesystem_parser.cpp
+  src/dwarfs/reader/internal/inode_reader_v2.cpp
+  src/dwarfs/reader/internal/metadata_types.cpp
+  src/dwarfs/reader/internal/metadata_v2.cpp
+  src/dwarfs/reader/metadata_types.cpp
 )
 
 list(APPEND LIBDWARFS_WRITER_SRC

include/dwarfs/reader/filesystem_v2.h

@@ -35,10 +35,10 @@
 
 #include <nlohmann/json.hpp>
 
-#include <dwarfs/block_range.h>
 #include <dwarfs/file_stat.h>
-#include <dwarfs/metadata_types.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/block_range.h>
+#include <dwarfs/reader/metadata_types.h>
 #include <dwarfs/types.h>
 
 namespace dwarfs {

include/dwarfs/reader/internal/block_cache.h

@@ -28,8 +28,8 @@
 #include <memory>
 
 #include <dwarfs/block_compressor.h>
-#include <dwarfs/block_range.h>
 #include <dwarfs/fstypes.h>
+#include <dwarfs/reader/block_range.h>
 
 namespace dwarfs {
 

include/dwarfs/reader/internal/inode_reader_v2.h

@@ -28,10 +28,10 @@
 #include <system_error>
 #include <vector>
 
-#include <dwarfs/block_range.h>
+#include <dwarfs/reader/block_range.h>
 #include <dwarfs/types.h>
 
-#include <dwarfs/internal/metadata_types.h>
+#include <dwarfs/reader/internal/metadata_types.h>
 
 namespace dwarfs {
 

include/dwarfs/reader/internal/metadata_v2.h

@@ -34,9 +34,9 @@
 
 #include <nlohmann/json.hpp>
 
-#include <dwarfs/metadata_types.h>
+#include <dwarfs/reader/metadata_types.h>
 
-#include <dwarfs/internal/metadata_types.h>
+#include <dwarfs/reader/internal/metadata_types.h>
 
 namespace dwarfs {
 

include/dwarfs/reader/iovec_read_buf.h

@@ -25,7 +25,7 @@
 #include <sys/uio.h>
 #endif
 
-#include <dwarfs/block_range.h>
+#include <dwarfs/reader/block_range.h>
 #include <dwarfs/small_vector.h>
 
 namespace dwarfs {

src/dwarfs/filesystem_extractor.cpp

@@ -41,12 +41,12 @@
 
 #include <dwarfs/file_stat.h>
 #include <dwarfs/filesystem_extractor.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/fstypes.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/scope_exit.h>
 #include <dwarfs/util.h>
 #include <dwarfs/vfs_stat.h>

src/dwarfs/reader/block_range.cpp

@@ -21,10 +21,10 @@
 
 #include <fmt/format.h>
 
-#include <dwarfs/block_range.h>
 #include <dwarfs/error.h>
+#include <dwarfs/reader/block_range.h>
 
-#include <dwarfs/internal/cached_block.h>
+#include <dwarfs/reader/internal/cached_block.h>
 
 namespace dwarfs {
 

src/dwarfs/reader/filesystem_v2.cpp

@@ -36,7 +36,6 @@
 #include <dwarfs/categorizer.h>
 #include <dwarfs/category_resolver.h>
 #include <dwarfs/error.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer.h>
 #include <dwarfs/fstypes.h>
 #include <dwarfs/history.h>
@@ -45,18 +44,19 @@
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
 #include <dwarfs/performance_monitor.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/util.h>
 #include <dwarfs/writer_progress.h>
 
-#include <dwarfs/internal/block_cache.h>
 #include <dwarfs/internal/block_data.h>
-#include <dwarfs/internal/filesystem_parser.h>
 #include <dwarfs/internal/filesystem_writer_detail.h>
 #include <dwarfs/internal/fs_section.h>
-#include <dwarfs/internal/inode_reader_v2.h>
-#include <dwarfs/internal/metadata_v2.h>
 #include <dwarfs/internal/progress.h>
 #include <dwarfs/internal/worker_group.h>
+#include <dwarfs/reader/internal/block_cache.h>
+#include <dwarfs/reader/internal/filesystem_parser.h>
+#include <dwarfs/reader/internal/inode_reader_v2.h>
+#include <dwarfs/reader/internal/metadata_v2.h>
 
 namespace dwarfs {
 

src/dwarfs/reader/internal/block_cache.cpp

@@ -48,10 +48,10 @@
 #include <dwarfs/scope_exit.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/block_cache.h>
-#include <dwarfs/internal/cached_block.h>
 #include <dwarfs/internal/fs_section.h>
 #include <dwarfs/internal/worker_group.h>
+#include <dwarfs/reader/internal/block_cache.h>
+#include <dwarfs/reader/internal/cached_block.h>
 
 namespace dwarfs::internal {
 

src/dwarfs/reader/internal/cached_block.cpp

@@ -30,8 +30,8 @@
 #include <dwarfs/logger.h>
 #include <dwarfs/mmif.h>
 
-#include <dwarfs/internal/cached_block.h>
 #include <dwarfs/internal/fs_section.h>
+#include <dwarfs/reader/internal/cached_block.h>
 
 namespace dwarfs::internal {
 

src/dwarfs/reader/internal/filesystem_parser.cpp

@@ -29,7 +29,7 @@
 #include <dwarfs/mmif.h>
 #include <dwarfs/options.h>
 
-#include <dwarfs/internal/filesystem_parser.h>
+#include <dwarfs/reader/internal/filesystem_parser.h>
 
 namespace dwarfs::internal {
 

src/dwarfs/reader/internal/inode_reader_v2.cpp

@@ -34,15 +34,15 @@
 #include <range/v3/view/enumerate.hpp>
 
 #include <dwarfs/fstypes.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/options.h>
 #include <dwarfs/performance_monitor.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/block_cache.h>
-#include <dwarfs/internal/inode_reader_v2.h>
-#include <dwarfs/internal/offset_cache.h>
+#include <dwarfs/reader/internal/block_cache.h>
+#include <dwarfs/reader/internal/inode_reader_v2.h>
+#include <dwarfs/reader/internal/offset_cache.h>
 
 namespace dwarfs::internal {
 

src/dwarfs/reader/internal/metadata_types.cpp

@@ -31,7 +31,7 @@
 #include <dwarfs/match.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/metadata_types.h>
+#include <dwarfs/reader/internal/metadata_types.h>
 
 #include <dwarfs/gen-cpp2/metadata_types_custom_protocol.h>
 

src/dwarfs/reader/internal/metadata_v2.cpp

@@ -55,8 +55,8 @@
 #include <dwarfs/vfs_stat.h>
 
 #include <dwarfs/internal/features.h>
-#include <dwarfs/internal/metadata_v2.h>
 #include <dwarfs/internal/string_table.h>
+#include <dwarfs/reader/internal/metadata_v2.h>
 
 #include <dwarfs/gen-cpp2/metadata_layouts.h>
 #include <dwarfs/gen-cpp2/metadata_types_custom_protocol.h>

src/dwarfs/reader/metadata_types.cpp

@@ -29,10 +29,10 @@
 #include <dwarfs/error.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/match.h>
-#include <dwarfs/metadata_types.h>
+#include <dwarfs/reader/metadata_types.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/metadata_types.h>
+#include <dwarfs/reader/internal/metadata_types.h>
 
 namespace dwarfs {
 

src/dwarfs_main.cpp

@@ -85,15 +85,15 @@
 #include <dwarfs/conv.h>
 #include <dwarfs/error.h>
 #include <dwarfs/file_stat.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/fstypes.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
 #include <dwarfs/performance_monitor.h>
+#include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/scope_exit.h>
 #include <dwarfs/string.h>
 #include <dwarfs/tool/iolayer.h>

src/dwarfsck_main.cpp

@@ -38,12 +38,12 @@
 #include <dwarfs/conv.h>
 #include <dwarfs/error.h>
 #include <dwarfs/file_access.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/thread_pool.h>
 #include <dwarfs/tool/iolayer.h>
 #include <dwarfs/tool/program_options_helpers.h>

src/dwarfsextract_main.cpp

@@ -27,13 +27,13 @@
 #include <boost/program_options.hpp>
 
 #include <dwarfs/filesystem_extractor.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
 #include <dwarfs/performance_monitor.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/string.h>
 #include <dwarfs/tool/iolayer.h>
 #include <dwarfs/tool/program_options_helpers.h>

src/mkdwarfs_main.cpp

@@ -65,7 +65,6 @@
 #include <dwarfs/error.h>
 #include <dwarfs/file_access.h>
 #include <dwarfs/filesystem_block_category_resolver.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer_factory.h>
 #include <dwarfs/filter_debug.h>
 #include <dwarfs/fragment_order_parser.h>
@@ -76,6 +75,7 @@
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/rule_based_entry_filter.h>
 #include <dwarfs/scanner.h>
 #include <dwarfs/segmenter_factory.h>

test/badfs_test.cpp

@@ -24,10 +24,10 @@
 
 #include <gtest/gtest.h>
 
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/filesystem_v2.h>
 
 #include "test_helpers.h"
 #include "test_logger.h"

test/block_cache_test.cpp

@@ -32,13 +32,13 @@
 
 #include <range/v3/view/enumerate.hpp>
 
-#include <dwarfs/block_range.h>
 #include <dwarfs/error.h>
-#include <dwarfs/filesystem_v2.h>
+#include <dwarfs/reader/block_range.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/tool/main_adapter.h>
 #include <dwarfs_tool_main.h>
 
-#include <dwarfs/internal/cached_block.h>
+#include <dwarfs/reader/internal/cached_block.h>
 
 #include "mmap_mock.h"
 #include "test_helpers.h"

test/compat_test.cpp

@@ -40,11 +40,11 @@
 #include <dwarfs/file_stat.h>
 #include <dwarfs/filesystem_block_category_resolver.h>
 #include <dwarfs/filesystem_extractor.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer_factory.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/vfs_stat.h>
 #include <dwarfs/writer_progress.h>

test/dwarfs_benchmark.cpp

@@ -28,11 +28,11 @@
 #include <dwarfs/block_compressor.h>
 #include <dwarfs/entry_factory.h>
 #include <dwarfs/file_stat.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer_factory.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/scanner.h>
 #include <dwarfs/segmenter_factory.h>
 #include <dwarfs/thread_pool.h>

test/dwarfs_test.cpp

@@ -39,13 +39,13 @@
 #include <dwarfs/entry_factory.h>
 #include <dwarfs/file_stat.h>
 #include <dwarfs/file_type.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer_factory.h>
 #include <dwarfs/filter_debug.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmif.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/rule_based_entry_filter.h>
 #include <dwarfs/scanner.h>
 #include <dwarfs/segmenter_factory.h>

test/filesystem_test.cpp

@@ -28,9 +28,9 @@
 
 #include <folly/Utility.h>
 
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/fstypes.h>
 #include <dwarfs/mmap.h>
+#include <dwarfs/reader/filesystem_v2.h>
 
 #include "mmap_mock.h"
 #include "test_helpers.h"

test/tool_main_test.cpp

@@ -43,10 +43,10 @@
 
 #include <range/v3/view/enumerate.hpp>
 
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/history.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/logger.h>
+#include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/tool/main_adapter.h>
 #include <dwarfs/util.h>
 #include <dwarfs_tool_main.h>

test/utils_test.cpp

@@ -31,7 +31,7 @@
 #include <dwarfs/options.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/offset_cache.h>
+#include <dwarfs/reader/internal/offset_cache.h>
 
 using namespace dwarfs;