Merge remote-tracking branch 'origin/main' into sb/build-cachesb/build-cache

1 files changed, 45 insertions, 46 deletions

diff --git a/src/zen/cmds/workspaces_cmd.cpp b/src/zen/cmds/workspaces_cmd.cpp
index 166d4218d..5f3f8f7ca 100644
--- a/src/zen/cmds/workspaces_cmd.cpp
+++ b/src/zen/cmds/workspaces_cmd.cpp
@@ -25,16 +25,7 @@ namespace {
 		if (!Path.empty())
 		{
 			std::u8string PathString = Path.u8string();
-			if (PathString.ends_with(std::filesystem::path::preferred_separator) || PathString.ends_with('/'))
-			{
-				PathString.pop_back();
-				Path = std::filesystem::path(PathString);
-			}
-			// Special case if user gives a path with quotes and includes a backslash at the end:
-			// ="path\" cxxopts strips the leading quote only but not the trailing.
-			// As we expect paths here and we don't want trailing slashes we strip away the quote
-			// manually if the string does not start with a quote UE-231677
-			else if (PathString[0] != '\"' && PathString[PathString.length() - 1] == '\"')
+			if (PathString.ends_with(std::filesystem::path::preferred_separator) || PathString.starts_with('/'))
 			{
 				PathString.pop_back();
 				Path = std::filesystem::path(PathString);
@@ -96,7 +87,7 @@ WorkspaceCommand::WorkspaceCommand()
 {
 	m_Options.add_options()("h,help", "Print help");
 	m_Options.add_option("", "u", "hosturl", "Host URL", cxxopts::value(m_HostName)->default_value(""), "<hosturl>");
-	m_Options.add_options()("system-dir", "Specify system root", cxxopts::value<std::filesystem::path>(m_SystemRootDir));
+	m_Options.add_options()("system-dir", "Specify system root", cxxopts::value(m_SystemRootDir));
 	m_Options.add_option("", "v", "verb", "Verb for workspace - create, remove, info", cxxopts::value(m_Verb), "<verb>");
 	m_Options.parse_positional({"verb"});
 	m_Options.positional_help("verb");
@@ -148,16 +139,18 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 
 	m_HostName = ResolveTargetHostSpec(m_HostName);
 
-	if (m_SystemRootDir.empty())
+	std::filesystem::path SystemRootDir = StringToPath(m_SystemRootDir);
+
+	if (SystemRootDir.empty())
 	{
-		m_SystemRootDir = PickDefaultSystemRootDirectory();
-		if (m_SystemRootDir.empty())
+		SystemRootDir = PickDefaultSystemRootDirectory();
+		if (SystemRootDir.empty())
 		{
 			throw zen::OptionParseException("unable to resolve system root directory");
 		}
 	}
 
-	std::filesystem::path StatePath = m_SystemRootDir / "workspaces";
+	std::filesystem::path StatePath = SystemRootDir / "workspaces";
 
 	if (!ParseOptions(*SubOption, gsl::narrow<int>(SubCommandArguments.size()), SubCommandArguments.data()))
 	{
@@ -171,12 +164,12 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 			throw zen::OptionParseException(fmt::format("path is required\n{}", m_CreateOptions.help()));
 		}
 
-		RemoveTrailingPathSeparator(m_Path);
+		std::filesystem::path Path = StringToPath(m_Path);
 
 		if (m_Id.empty())
 		{
-			m_Id = Workspaces::PathToId(m_Path).ToString();
-			ZEN_CONSOLE("Using generated workspace id {} from path '{}'", m_Id, m_Path);
+			m_Id = Workspaces::PathToId(Path).ToString();
+			ZEN_CONSOLE("Using generated workspace id {} from path '{}'", m_Id, Path);
 		}
 
 		if (Oid::TryFromHexString(m_Id) == Oid::Zero)
@@ -187,7 +180,7 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 		if (Workspaces::AddWorkspace(
 				Log(),
 				StatePath,
-				{.Id = Oid::FromHexString(m_Id), .RootPath = m_Path, .AllowShareCreationFromHttp = m_AllowShareCreationFromHttp}))
+				{.Id = Oid::FromHexString(m_Id), .RootPath = Path, .AllowShareCreationFromHttp = m_AllowShareCreationFromHttp}))
 		{
 			if (!m_HostName.empty())
 			{
@@ -287,7 +280,7 @@ WorkspaceShareCommand::WorkspaceShareCommand()
 {
 	m_Options.add_options()("h,help", "Print help");
 	m_Options.add_option("", "u", "hosturl", "Host URL", cxxopts::value(m_HostName)->default_value(""), "<hosturl>");
-	m_Options.add_options()("system-dir", "Specify system root", cxxopts::value<std::filesystem::path>(m_SystemRootDir));
+	m_Options.add_options()("system-dir", "Specify system root", cxxopts::value(m_SystemRootDir));
 	m_Options.add_option("", "v", "verb", "Verb for workspace - create, remove, info", cxxopts::value(m_Verb), "<verb>");
 	m_Options.parse_positional({"verb"});
 	m_Options.positional_help("verb");
@@ -399,16 +392,18 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 
 	m_HostName = ResolveTargetHostSpec(m_HostName);
 
-	if (m_SystemRootDir.empty())
+	std::filesystem::path SystemRootDir = StringToPath(m_SystemRootDir);
+
+	if (SystemRootDir.empty())
 	{
-		m_SystemRootDir = PickDefaultSystemRootDirectory();
-		if (m_SystemRootDir.empty())
+		SystemRootDir = PickDefaultSystemRootDirectory();
+		if (SystemRootDir.empty())
 		{
 			throw zen::OptionParseException("unable to resolve system root directory");
 		}
 	}
 
-	std::filesystem::path StatePath = m_SystemRootDir / "workspaces";
+	std::filesystem::path StatePath = SystemRootDir / "workspaces";
 
 	if (!ParseOptions(*SubOption, gsl::narrow<int>(SubCommandArguments.size()), SubCommandArguments.data()))
 	{
@@ -417,7 +412,8 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 
 	if (SubOption == &m_CreateOptions)
 	{
-		if (m_WorkspaceRoot.empty())
+		std::filesystem::path WorkspaceRoot = StringToPath(m_WorkspaceRoot);
+		if (WorkspaceRoot.empty())
 		{
 			if (m_WorkspaceId.empty())
 			{
@@ -436,15 +432,15 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 				ZEN_CONSOLE("Workspace {} does not exist", m_WorkspaceId);
 				return 0;
 			}
-			m_WorkspaceRoot = WorkspaceConfig.RootPath;
+			WorkspaceRoot = WorkspaceConfig.RootPath;
 		}
 		else
 		{
-			RemoveTrailingPathSeparator(m_WorkspaceRoot);
+			RemoveTrailingPathSeparator(WorkspaceRoot);
 			if (m_WorkspaceId.empty())
 			{
-				m_WorkspaceId = Workspaces::PathToId(m_WorkspaceRoot).ToString();
-				ZEN_CONSOLE("Using generated workspace id {} from path '{}'", m_WorkspaceId, m_WorkspaceRoot);
+				m_WorkspaceId = Workspaces::PathToId(WorkspaceRoot).ToString();
+				ZEN_CONSOLE("Using generated workspace id {} from path '{}'", m_WorkspaceId, WorkspaceRoot);
 			}
 			else
 			{
@@ -453,23 +449,25 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 					throw zen::OptionParseException(fmt::format("workspace id '{}' is invalid", m_WorkspaceId));
 				}
 			}
-			if (Workspaces::AddWorkspace(Log(), StatePath, {.Id = Oid::FromHexString(m_WorkspaceId), .RootPath = m_WorkspaceRoot}))
+			if (Workspaces::AddWorkspace(Log(), StatePath, {.Id = Oid::FromHexString(m_WorkspaceId), .RootPath = WorkspaceRoot}))
 			{
-				ZEN_CONSOLE("Created workspace {} using root path '{}'", m_WorkspaceId, m_WorkspaceRoot);
+				ZEN_CONSOLE("Created workspace {} using root path '{}'", m_WorkspaceId, WorkspaceRoot);
 			}
 			else
 			{
-				ZEN_CONSOLE("Using existing workspace {} with root path '{}'", m_WorkspaceId, m_WorkspaceRoot);
+				ZEN_CONSOLE("Using existing workspace {} with root path '{}'", m_WorkspaceId, WorkspaceRoot);
 			}
 		}
 
-		RemoveTrailingPathSeparator(m_SharePath);
-		RemoveLeadingPathSeparator(m_SharePath);
+		std::filesystem::path SharePath = StringToPath(m_SharePath);
+
+		RemoveLeadingPathSeparator(SharePath);
+		RemoveTrailingPathSeparator(SharePath);
 
 		if (m_ShareId.empty())
 		{
-			m_ShareId = Workspaces::PathToId(m_SharePath).ToString();
-			ZEN_CONSOLE("Using generated share id {}, for path '{}'", m_ShareId, m_SharePath);
+			m_ShareId = Workspaces::PathToId(SharePath).ToString();
+			ZEN_CONSOLE("Using generated share id {}, for path '{}'", m_ShareId, SharePath);
 		}
 
 		if (Oid::TryFromHexString(m_ShareId) == Oid::Zero)
@@ -478,8 +476,8 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 		}
 
 		if (Workspaces::AddWorkspaceShare(Log(),
-										  m_WorkspaceRoot,
-										  {.Id = Oid::FromHexString(m_ShareId), .SharePath = m_SharePath, .Alias = m_Alias}))
+										  WorkspaceRoot,
+										  {.Id = Oid::FromHexString(m_ShareId), .SharePath = SharePath, .Alias = m_Alias}))
 		{
 			if (!m_HostName.empty())
 			{
@@ -531,7 +529,8 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 			ZEN_CONSOLE("Workspace {} does not exist", m_WorkspaceId);
 			return 0;
 		}
-		m_WorkspaceRoot = WorkspaceConfig.RootPath;
+
+		std::filesystem::path WorkspaceRoot = WorkspaceConfig.RootPath;
 
 		if (m_ShareId.empty())
 		{
@@ -543,8 +542,7 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 			throw zen::OptionParseException(fmt::format("workspace id '{}' is invalid", m_ShareId));
 		}
 
-		Workspaces::WorkspaceShareConfiguration Share =
-			Workspaces::FindWorkspaceShare(Log(), m_WorkspaceRoot, Oid::FromHexString(m_ShareId));
+		Workspaces::WorkspaceShareConfiguration Share = Workspaces::FindWorkspaceShare(Log(), WorkspaceRoot, Oid::FromHexString(m_ShareId));
 		if (Share.Id == Oid::Zero)
 		{
 			ZEN_CONSOLE("Workspace share {} does not exist", m_ShareId);
@@ -556,6 +554,7 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 
 	if (SubOption == &m_RemoveOptions)
 	{
+		std::filesystem::path WorkspaceRoot;
 		if (!m_Alias.empty())
 		{
 			Workspaces::WorkspaceConfiguration		WorkspaceConfig;
@@ -566,9 +565,9 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 				ZEN_CONSOLE("Workspace share with alias {} does not exist", m_Alias);
 				return 0;
 			}
-			m_ShareId		= ShareConfig.Id.ToString();
-			m_WorkspaceId	= WorkspaceConfig.Id.ToString();
-			m_WorkspaceRoot = WorkspaceConfig.RootPath;
+			m_ShareId	  = ShareConfig.Id.ToString();
+			m_WorkspaceId = WorkspaceConfig.Id.ToString();
+			WorkspaceRoot = WorkspaceConfig.RootPath;
 		}
 
 		if (m_WorkspaceId.empty())
@@ -587,7 +586,7 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 			ZEN_CONSOLE("Workspace {} does not exist", m_WorkspaceId);
 			return 0;
 		}
-		m_WorkspaceRoot = WorkspaceConfig.RootPath;
+		WorkspaceRoot = WorkspaceConfig.RootPath;
 
 		if (m_ShareId.empty())
 		{
@@ -599,7 +598,7 @@ WorkspaceShareCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char**
 			throw zen::OptionParseException(fmt::format("workspace id '{}' is invalid", m_ShareId));
 		}
 
-		if (Workspaces::RemoveWorkspaceShare(Log(), m_WorkspaceRoot, Oid::FromHexString(m_ShareId)))
+		if (Workspaces::RemoveWorkspaceShare(Log(), WorkspaceRoot, Oid::FromHexString(m_ShareId)))
 		{
 			if (!m_HostName.empty())
 			{