zen print fixes/improvements (#469)

- Improvement: `zen print` now allows output of compact binary content even if they are in non-optimal format (Unifom vs Non-Uniform arrays and objects)
- Feature: `zen print` now has a `--show-type-info` option to add type information to output of compact binary content
- Bugfix: Stats information for Build Store (Zen Store Cache) no longer throws exception and outputs invalid state information

3 files changed, 5 insertions, 6 deletions

diff --git a/src/zenserver/buildstore/httpbuildstore.cpp b/src/zenserver/buildstore/httpbuildstore.cpp
index 3e1bc4203..2a3ce41b7 100644
--- a/src/zenserver/buildstore/httpbuildstore.cpp
+++ b/src/zenserver/buildstore/httpbuildstore.cpp
@@ -534,7 +534,6 @@ HttpBuildStoreService::HandleStatsRequest(HttpServerRequest& Request)
 		{
 			Cbo << "count" << StorageStats.BlobCount;
 			Cbo << "bytes" << StorageStats.BlobBytes;
-			Cbo.EndObject();  // small
 		}
 		Cbo.EndObject();  // blobs
 
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 07fd6e908..61c279afa 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -1492,7 +1492,7 @@ ProjectStore::Oplog::ReadStateFile(const std::filesystem::path& BasePath, std::f
 
 		if (ValidationError != CbValidateError::None)
 		{
-			ZEN_ERROR("validation error {} hit for oplog config at '{}'", int(ValidationError), StateFilePath);
+			ZEN_ERROR("validation error {} hit for oplog config at '{}'", ToString(ValidationError), StateFilePath);
 			return CbObject();
 		}
 
@@ -3168,7 +3168,7 @@ ProjectStore::Project::Read()
 	}
 	else
 	{
-		ZEN_ERROR("validation error {} hit for '{}'", int(ValidationError), ProjectStateFilePath);
+		ZEN_ERROR("validation error {} hit for '{}'", ToString(ValidationError), ProjectStateFilePath);
 	}
 
 	ReadAccessTimes();
@@ -3260,7 +3260,7 @@ ProjectStore::Project::ReadAccessTimes()
 	}
 	else
 	{
-		ZEN_WARN("project '{}': validation error {} hit for '{}'", Identifier, int(ValidationError), ProjectAccessTimesFilePath);
+		ZEN_WARN("project '{}': validation error {} hit for '{}'", Identifier, ToString(ValidationError), ProjectAccessTimesFilePath);
 	}
 }
 
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 5307d58d9..ba1413819 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -424,10 +424,10 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions)
 			if (CbValidateError ValidationResult = ValidateCompactBinary(Manifest, CbValidateMode::All);
 				ValidationResult != CbValidateError::None)
 			{
-				ZEN_WARN("Manifest validation failed: {}, state will be wiped", uint32_t(ValidationResult));
+				ZEN_WARN("Manifest validation failed: {}, state will be wiped", zen::ToString(ValidationResult));
 
 				WipeState  = true;
-				WipeReason = fmt::format("Validation of manifest at '{}' failed: {}", ManifestPath, uint32_t(ValidationResult));
+				WipeReason = fmt::format("Validation of manifest at '{}' failed: {}", ManifestPath, zen::ToString(ValidationResult));
 			}
 			else
 			{