builds download "default" part if nothing is specified (#994)

1 files changed, 12 insertions, 24 deletions

diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index 01b21a31f..820ca9c45 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -1536,17 +1536,12 @@ BuildsDownloadSubCmd::BuildsDownloadSubCmd(BuildsConfiguration& Config)
 
 	Opts.add_option("", "l", "local-path", "Root file system folder for build", cxxopts::value(m_Path), "<local-path>");
 	Opts.add_option("", "", "build-id", "Build Id", cxxopts::value(m_BuildId), "<id>");
-	Opts.add_option("",
-					"",
-					"build-part-id",
-					"Build part Ids list separated by ',', if no build-part-ids or build-part-names are given all parts will be downloaded",
-					cxxopts::value(m_BuildPartIds),
-					"<id>");
+	Opts.add_option("", "", "build-part-id", "Build part Ids list separated by ','.", cxxopts::value(m_BuildPartIds), "<id>");
 	Opts.add_option("",
 					"",
 					"build-part-name",
-					"Name of the build parts list separated by ',', if no build-part-ids or build-part-names are given "
-					"all parts will be downloaded",
+					"Build part names list separated by ','. If neither --build-part-id nor --build-part-name is given, "
+					"the part named 'default' is selected. Use '*' (alone) to select all parts.",
 					cxxopts::value(m_BuildPartNames),
 					"<name>");
 	Opts.add_option("",
@@ -1624,6 +1619,7 @@ BuildsDownloadSubCmd::Run(const ZenCliOptions& /*GlobalOptions*/)
 
 	std::vector<Oid>		 BuildPartIds	= ParseBuildPartIds(m_BuildPartIds, Opts);
 	std::vector<std::string> BuildPartNames = ParseBuildPartNames(m_BuildPartNames, Opts);
+	NormalizePartSelection(BuildPartIds, BuildPartNames, Opts.help());
 
 	EPartialBlockRequestMode PartialBlockRequestMode = ParseAllowPartialBlockRequests(Opts);
 
@@ -1691,17 +1687,12 @@ BuildsLsSubCmd::BuildsLsSubCmd(BuildsConfiguration& Config) : BuildsSubCmdBase(C
 	Config.AddWildcardOptions(Opts);
 
 	Opts.add_option("", "", "build-id", "Build Id", cxxopts::value(m_BuildId), "<id>");
-	Opts.add_option("",
-					"",
-					"build-part-id",
-					"Build part Ids list separated by ',', if no build-part-ids or build-part-names are given all parts will be downloaded",
-					cxxopts::value(m_BuildPartIds),
-					"<id>");
+	Opts.add_option("", "", "build-part-id", "Build part Ids list separated by ','.", cxxopts::value(m_BuildPartIds), "<id>");
 	Opts.add_option("",
 					"",
 					"build-part-name",
-					"Name of the build parts list separated by ',', if no build-part-ids or build-part-names are given "
-					"all parts will be downloaded",
+					"Build part names list separated by ','. If neither --build-part-id nor --build-part-name is given, "
+					"the part named 'default' is selected. Use '*' (alone) to select all parts.",
 					cxxopts::value(m_BuildPartNames),
 					"<name>");
 
@@ -1751,6 +1742,7 @@ BuildsLsSubCmd::Run(const ZenCliOptions& /*GlobalOptions*/)
 
 	std::vector<Oid>		 BuildPartIds	= ParseBuildPartIds(m_BuildPartIds, Opts);
 	std::vector<std::string> BuildPartNames = ParseBuildPartNames(m_BuildPartNames, Opts);
+	NormalizePartSelection(BuildPartIds, BuildPartNames, Opts.help());
 
 	std::unique_ptr<CbObjectWriter> StructuredOutput;
 	if (!m_ResultPath.empty())
@@ -1913,17 +1905,12 @@ BuildsPrimeCacheSubCmd::BuildsPrimeCacheSubCmd(BuildsConfiguration& Config)
 	Config.AddWorkerOptions(Opts);
 	Config.AddZenFolderOptions(Opts);
 	Opts.add_option("", "", "build-id", "Build Id", cxxopts::value(m_BuildId), "<id>");
-	Opts.add_option("",
-					"",
-					"build-part-id",
-					"Build part Ids list separated by ',', if no build-part-ids or build-part-names are given all parts will be downloaded",
-					cxxopts::value(m_BuildPartIds),
-					"<id>");
+	Opts.add_option("", "", "build-part-id", "Build part Ids list separated by ','.", cxxopts::value(m_BuildPartIds), "<id>");
 	Opts.add_option("",
 					"",
 					"build-part-name",
-					"Name of the build parts list separated by ',', if no build-part-ids or build-part-names are given "
-					"all parts will be downloaded",
+					"Build part names list separated by ','. If neither --build-part-id nor --build-part-name is given, "
+					"the part named 'default' is selected. Use '*' (alone) to select all parts.",
 					cxxopts::value(m_BuildPartNames),
 					"<name>");
 	Opts.add_option("",
@@ -1962,6 +1949,7 @@ BuildsPrimeCacheSubCmd::Run(const ZenCliOptions& /*GlobalOptions*/)
 
 	std::vector<Oid>		 BuildPartIds	= ParseBuildPartIds(m_BuildPartIds, Opts);
 	std::vector<std::string> BuildPartNames = ParseBuildPartNames(m_BuildPartNames, Opts);
+	NormalizePartSelection(BuildPartIds, BuildPartNames, Opts.help());
 
 	std::uint64_t PreferredMultipartChunkSize = 32u * 1024u * 1024u;