TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-11 13:30:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(scanner_progress): move to internal namespace

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-07-28 22:23:01 +02:00
parent bfa17289b6
commit da511654a0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -662,10 +662,10 @@ list(APPEND LIBDWARFS_WRITER_SRC
src/dwarfs/internal/global_entry_data.cpp src/dwarfs/internal/global_entry_data.cpp
src/dwarfs/internal/inode_manager.cpp src/dwarfs/internal/inode_manager.cpp
src/dwarfs/internal/metadata_freezer.cpp src/dwarfs/internal/metadata_freezer.cpp
src/dwarfs/internal/scanner_progress.cpp
src/dwarfs/nilsimsa.cpp src/dwarfs/nilsimsa.cpp
src/dwarfs/progress.cpp src/dwarfs/progress.cpp
src/dwarfs/scanner.cpp src/dwarfs/scanner.cpp
src/dwarfs/scanner_progress.cpp
src/dwarfs/segmenter.cpp src/dwarfs/segmenter.cpp
src/dwarfs/segmenter_factory.cpp src/dwarfs/segmenter_factory.cpp
src/dwarfs/similarity.cpp src/dwarfs/similarity.cpp

4
include/dwarfs/scanner_progress.h → include/dwarfs/internal/scanner_progress.h
View File

@ -27,7 +27,7 @@
#include <dwarfs/progress.h> #include <dwarfs/progress.h>
#include <dwarfs/terminal.h> #include <dwarfs/terminal.h>
namespace dwarfs { namespace dwarfs::internal {
class scanner_progress : public progress::context { class scanner_progress : public progress::context {
public: public:
@ -48,4 +48,4 @@ class scanner_progress : public progress::context {
size_t const bytes_total_; size_t const bytes_total_;
}; };
} // namespace dwarfs } // namespace dwarfs::internal

6
src/dwarfs/entry.cpp
View File

@ -35,10 +35,10 @@
#include <dwarfs/options.h> #include <dwarfs/options.h>
#include <dwarfs/os_access.h> #include <dwarfs/os_access.h>
#include <dwarfs/progress.h> #include <dwarfs/progress.h>
#include <dwarfs/scanner_progress.h>
#include <dwarfs/util.h> #include <dwarfs/util.h>
#include <dwarfs/internal/global_entry_data.h> #include <dwarfs/internal/global_entry_data.h>
#include <dwarfs/internal/scanner_progress.h>
#include <dwarfs/gen-cpp2/metadata_types.h> #include <dwarfs/gen-cpp2/metadata_types.h>
@ -222,11 +222,11 @@ void file::scan(mmif* mm, progress& prog,
checksum cs(*hash_alg); checksum cs(*hash_alg);
if (s > 0) { if (s > 0) {
std::shared_ptr<scanner_progress> pctx; std::shared_ptr<internal::scanner_progress> pctx;
auto const chunk_size = prog.hash.chunk_size.load(); auto const chunk_size = prog.hash.chunk_size.load();
if (s >= 4 * chunk_size) { if (s >= 4 * chunk_size) {
pctx = prog.create_context<scanner_progress>( pctx = prog.create_context<internal::scanner_progress>(
termcolor::MAGENTA, kHashContext, path_as_string(), s); termcolor::MAGENTA, kHashContext, path_as_string(), s);
} }

2
src/dwarfs/internal/inode_manager.cpp
View File

@ -53,13 +53,13 @@
#include <dwarfs/os_access.h> #include <dwarfs/os_access.h>
#include <dwarfs/progress.h> #include <dwarfs/progress.h>
#include <dwarfs/promise_receiver.h> #include <dwarfs/promise_receiver.h>
#include <dwarfs/scanner_progress.h>
#include <dwarfs/script.h> #include <dwarfs/script.h>
#include <dwarfs/similarity.h> #include <dwarfs/similarity.h>
#include <dwarfs/similarity_ordering.h> #include <dwarfs/similarity_ordering.h>
#include <dwarfs/util.h> #include <dwarfs/util.h>
#include <dwarfs/internal/inode_manager.h> #include <dwarfs/internal/inode_manager.h>
#include <dwarfs/internal/scanner_progress.h>
#include <dwarfs/internal/worker_group.h> #include <dwarfs/internal/worker_group.h>
#include <dwarfs/gen-cpp2/metadata_types.h> #include <dwarfs/gen-cpp2/metadata_types.h>

6
src/dwarfs/scanner_progress.cpp → src/dwarfs/internal/scanner_progress.cpp
View File

@ -19,9 +19,9 @@
* along with dwarfs. If not, see <https://www.gnu.org/licenses/>. * along with dwarfs. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <dwarfs/scanner_progress.h> #include <dwarfs/internal/scanner_progress.h>
namespace dwarfs { namespace dwarfs::internal {
scanner_progress::scanner_progress(std::string_view context, std::string file, scanner_progress::scanner_progress(std::string_view context, std::string file,
size_t size) size_t size)
@ -44,4 +44,4 @@ auto scanner_progress::get_status() const -> status {
return st; return st;
} }
} // namespace dwarfs } // namespace dwarfs::internal