From 2cc4402b49f3351342508740dae69cd59b74a465 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Tue, 5 Nov 2019 17:10:17 +0100 Subject: [PATCH] Added progress for loading yaml databases (#4441) --- src/common/database.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/common/database.cpp b/src/common/database.cpp index 24be5c5ace..816d6de12b 100644 --- a/src/common/database.cpp +++ b/src/common/database.cpp @@ -132,11 +132,18 @@ void YamlDatabase::parse( const YAML::Node& rootNode ){ uint64 count = 0; if( this->nodeExists( rootNode, "Body" ) ){ - for( const YAML::Node &node : rootNode["Body"] ){ + const YAML::Node& bodyNode = rootNode["Body"]; + size_t childNodesCount = bodyNode.size(); + size_t childNodesProgressed = 0; + const char* fileName = this->currentFile.c_str(); + + for( const YAML::Node &node : bodyNode ){ count += this->parseBodyNode( node ); + + ShowStatus( "Loading [%zd/%zd] entries from '" CL_WHITE "%s" CL_RESET "'" CL_CLL "\r", ++childNodesProgressed, childNodesCount, fileName ); } - ShowStatus("Done reading '" CL_WHITE "%" PRIu64 CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'\n", count, this->currentFile.c_str()); + ShowStatus( "Done reading '" CL_WHITE "%" PRIu64 CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'" CL_CLL "\n", count, fileName ); } }