Merge pull request #413 from silicon-heaven/add-cpon-option-to-shvcall

add cpon option to shvcall
silicon-heaven · Feb 12, 2024 · c74e75c · c74e75c
2 parents f548d74 + b54b929
commit c74e75c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/examples/cli/shvcall/src/appclioptions.cpp b/examples/cli/shvcall/src/appclioptions.cpp
@@ -5,5 +5,6 @@ AppCliOptions::AppCliOptions()
 	addOption("path").setType(shv::chainpack::RpcValue::Type::String).setNames("--path").setComment("Shv call path");
 	addOption("method").setType(shv::chainpack::RpcValue::Type::String).setNames("--method").setComment("Shv call method");
 	addOption("params").setType(shv::chainpack::RpcValue::Type::String).setNames("--params").setComment("Shv call params");
+	addOption("isCponOutput").setType(shv::chainpack::RpcValue::Type::Bool).setNames("--cpon").setComment("Parse cpon output");
 	addOption("isChainPackOutput").setType(shv::chainpack::RpcValue::Type::Bool).setNames("-x", "--chainpack-output").setComment("ChainPack output");
 }
diff --git a/examples/cli/shvcall/src/appclioptions.h b/examples/cli/shvcall/src/appclioptions.h
@@ -13,4 +13,5 @@ class AppCliOptions : public shv::iotqt::rpc::ClientAppCliOptions
 	CLIOPTION_GETTER_SETTER(std::string, m, setM, ethod)
 	CLIOPTION_GETTER_SETTER(std::string, p, setP, arams)
 	CLIOPTION_GETTER_SETTER(bool, isC, setC, hainPackOutput)
+	CLIOPTION_GETTER_SETTER(bool, isC, setC, ponOutput)
 };
diff --git a/examples/cli/shvcall/src/application.cpp b/examples/cli/shvcall/src/application.cpp
@@ -45,6 +45,9 @@ void Application::onShvStateChanged()
 				if(m_cliOptions->isChainPackOutput()) {
 					std::cout << result.toChainPack();
 				}
+				else if (m_cliOptions->isCponOutput()) {
+					std::cout << cp::RpcValue::fromCpon(result.toString()).toCpon("\t") << "\n";
+				}
 				else {
 					std::cout << result.toCpon("\t") << "\n";
 				}