minor ZenCmdBase cleanup

FormatResponse -> FormatHttpResponse
GetReturnCode -> MapHttpToCommandReturnCode

4 files changed, 35 insertions, 55 deletions

diff --git a/zen/cmds/projectstore.cpp b/zen/cmds/projectstore.cpp
index e12b85edc..b57277c6b 100644
--- a/zen/cmds/projectstore.cpp
+++ b/zen/cmds/projectstore.cpp
@@ -207,8 +207,8 @@ CreateProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** a
 		Response = Session.Post();
 	}
 
-	ZEN_CONSOLE("{}", FormatResponse(Response));
-	return GetReturnCode(Response);
+	ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+	return MapHttpToCommandReturnCode(Response);
 }
 
 ///////////////////////////////////////
@@ -275,9 +275,9 @@ CreateOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg
 		Response = Session.Post();
 	}
 
-	ZEN_CONSOLE("{}", FormatResponse(Response));
+	ZEN_CONSOLE("{}", FormatHttpResponse(Response));
 
-	return GetReturnCode(Response);
+	return MapHttpToCommandReturnCode(Response);
 }
 
 ///////////////////////////////////////
@@ -424,14 +424,14 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg
 			Response = Session.Post();
 			if (!zen::IsHttpSuccessCode(Response.status_code))
 			{
-				ZEN_CONSOLE("{}", FormatResponse(Response));
-				return GetReturnCode(Response);
+				ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+				return MapHttpToCommandReturnCode(Response);
 			}
 		}
 		else if (!zen::IsHttpSuccessCode(Response.status_code))
 		{
-			ZEN_CONSOLE("{}", FormatResponse(Response));
-			return GetReturnCode(Response);
+			ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+			return MapHttpToCommandReturnCode(Response);
 		}
 		else if (m_ZenClean)
 		{
@@ -439,14 +439,14 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg
 			Response = Session.Delete();
 			if (!zen::IsHttpSuccessCode(Response.status_code))
 			{
-				ZEN_CONSOLE("{}", FormatResponse(Response));
-				return GetReturnCode(Response);
+				ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+				return MapHttpToCommandReturnCode(Response);
 			}
 			Response = Session.Post();
 			if (!zen::IsHttpSuccessCode(Response.status_code))
 			{
-				ZEN_CONSOLE("{}", FormatResponse(Response));
-				return GetReturnCode(Response);
+				ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+				return MapHttpToCommandReturnCode(Response);
 			}
 		}
 	}
@@ -551,8 +551,8 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg
 
 	ZEN_CONSOLE("Saving oplog '{}/{}' from '{}' to {}", m_ProjectName, m_OplogName, m_HostName, TargetDescription);
 	cpr::Response Response = Session.Post();
-	ZEN_CONSOLE("{}", FormatResponse(Response));
-	return GetReturnCode(Response);
+	ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+	return MapHttpToCommandReturnCode(Response);
 }
 
 ////////////////////////////
@@ -685,14 +685,14 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg
 		Response = Session.Post();
 		if (!zen::IsHttpSuccessCode(Response.status_code))
 		{
-			ZEN_CONSOLE("{}", FormatResponse(Response));
-			return GetReturnCode(Response);
+			ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+			return MapHttpToCommandReturnCode(Response);
 		}
 	}
 	else if (!zen::IsHttpSuccessCode(Response.status_code))
 	{
-		ZEN_CONSOLE("{}", FormatResponse(Response));
-		return GetReturnCode(Response);
+		ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+		return MapHttpToCommandReturnCode(Response);
 	}
 	else if (m_ZenClean)
 	{
@@ -700,14 +700,14 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg
 		Response = Session.Delete();
 		if (!zen::IsHttpSuccessCode(Response.status_code))
 		{
-			ZEN_CONSOLE("{}", FormatResponse(Response));
-			return GetReturnCode(Response);
+			ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+			return MapHttpToCommandReturnCode(Response);
 		}
 		Response = Session.Post();
 		if (!zen::IsHttpSuccessCode(Response.status_code))
 		{
-			ZEN_CONSOLE("{}", FormatResponse(Response));
-			return GetReturnCode(Response);
+			ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+			return MapHttpToCommandReturnCode(Response);
 		}
 	}
 
@@ -778,6 +778,6 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg
 	ZEN_CONSOLE("Loading oplog '{}/{}' from '{}' to {}", m_ProjectName, m_OplogName, SourceDescription, m_HostName);
 	Response = Session.Post();
 
-	ZEN_CONSOLE("{}", FormatResponse(Response));
-	return GetReturnCode(Response);
+	ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+	return MapHttpToCommandReturnCode(Response);
 }
diff --git a/zen/cmds/rpcreplay.cpp b/zen/cmds/rpcreplay.cpp
index 90edb949d..9bc4b2c7b 100644
--- a/zen/cmds/rpcreplay.cpp
+++ b/zen/cmds/rpcreplay.cpp
@@ -54,8 +54,8 @@ RpcStartRecordingCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char
 	Session.SetUrl(fmt::format("{}/z$/exec$/start-recording"sv, m_HostName));
 	Session.SetParameters({{"path", m_RecordingPath}});
 	cpr::Response Response = Session.Post();
-	ZEN_CONSOLE("{}", FormatResponse(Response));
-	return GetReturnCode(Response);
+	ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+	return MapHttpToCommandReturnCode(Response);
 }
 
 ////////////////////////////////////////////////////
@@ -81,8 +81,8 @@ RpcStopRecordingCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char*
 	cpr::Session Session;
 	Session.SetUrl(fmt::format("{}/z$/exec$/stop-recording"sv, m_HostName));
 	cpr::Response Response = Session.Post();
-	ZEN_CONSOLE("{}", FormatResponse(Response));
-	return GetReturnCode(Response);
+	ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+	return MapHttpToCommandReturnCode(Response);
 }
 
 ////////////////////////////////////////////////////
@@ -177,8 +177,8 @@ RpcReplayCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		Session.SetUrl(fmt::format("{}/z$/exec$/replay-recording"sv, m_HostName));
 		Session.SetParameters({{"path", m_RecordingPath}, {"thread-count", fmt::format("{}", m_ThreadCount)}});
 		cpr::Response Response = Session.Post();
-		ZEN_CONSOLE("{}", FormatResponse(Response));
-		return GetReturnCode(Response);
+		ZEN_CONSOLE("{}", FormatHttpResponse(Response));
+		return MapHttpToCommandReturnCode(Response);
 	}
 
 	std::unique_ptr<cache::IRpcRequestReplayer> Replayer   = cache::MakeDiskRequestReplayer(m_RecordingPath, true);
@@ -367,7 +367,7 @@ RpcReplayCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 						if (Response.error || !(IsHttpSuccessCode(Response.status_code) ||
 												Response.status_code == gsl::narrow<long>(HttpResponseCode::NotFound)))
 						{
-							ZEN_CONSOLE("{}", FormatResponse(Response));
+							ZEN_CONSOLE("{}", FormatHttpResponse(Response));
 							break;
 						}
 						BytesReceived.fetch_add(Response.downloaded_bytes);
diff --git a/zen/zen.cpp b/zen/zen.cpp
index 754b1f0a6..8252d8868 100644
--- a/zen/zen.cpp
+++ b/zen/zen.cpp
@@ -42,26 +42,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 //////////////////////////////////////////////////////////////////////////
 
-class TemplateCommand : public ZenCmdBase
-{
-public:
-	TemplateCommand() { m_Options.add_options()("r,root", "Root directory for CAS pool", cxxopts::value<std::string>(m_RootDirectory)); }
-
-	virtual int Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) override
-	{
-		ZEN_UNUSED(GlobalOptions, argc, argv);
-		return 0;
-	}
-
-	virtual cxxopts::Options& Options() override { return m_Options; }
-
-private:
-	cxxopts::Options m_Options{"template", "EDIT THIS COMMAND DESCRIPTION"};
-	std::string		 m_RootDirectory;
-};
-
-//////////////////////////////////////////////////////////////////////////
-
 bool
 ZenCmdBase::ParseOptions(int argc, char** argv)
 {
@@ -93,7 +73,7 @@ ZenCmdBase::ParseOptions(int argc, char** argv)
 }
 
 std::string
-ZenCmdBase::FormatResponse(const cpr::Response& Response)
+ZenCmdBase::FormatHttpResponse(const cpr::Response& Response)
 {
 	if (Response.error.code != cpr::ErrorCode::OK)
 	{
@@ -136,7 +116,7 @@ ZenCmdBase::FormatResponse(const cpr::Response& Response)
 }
 
 int
-ZenCmdBase::GetReturnCode(const cpr::Response& Response)
+ZenCmdBase::MapHttpToCommandReturnCode(const cpr::Response& Response)
 {
 	if (zen::IsHttpSuccessCode(Response.status_code))
 	{
diff --git a/zen/zen.h b/zen/zen.h
index d786b3148..b55e7a16c 100644
--- a/zen/zen.h
+++ b/zen/zen.h
@@ -33,6 +33,6 @@ public:
 	virtual cxxopts::Options& Options()														 = 0;
 
 	bool			   ParseOptions(int argc, char** argv);
-	static std::string FormatResponse(const cpr::Response& Response);
-	static int		   GetReturnCode(const cpr::Response& Response);
+	static std::string FormatHttpResponse(const cpr::Response& Response);
+	static int		   MapHttpToCommandReturnCode(const cpr::Response& Response);
 };