From e11692fc7e2d96cd25c828df7e6b35a9f2146e91 Mon Sep 17 00:00:00 2001 From: Elijah Tamarchenko Date: Tue, 22 Oct 2024 10:55:35 -0400 Subject: [PATCH 1/2] Process input to Configure --- CHANGELOG.md | 1 + cls/SourceControl/Git/Settings.cls | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c047138..7f0be556 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added feedback to settings page (#550) - Fix "Home" navigation to point to current namespace (#548) - Force export of item if it has been modified (#354) +- Remove leading/trailing spaces from input to Configure() (#356) ## [2.6.0] - 2024-10-07 diff --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls index 19181c92..591457bf 100644 --- a/cls/SourceControl/Git/Settings.cls +++ b/cls/SourceControl/Git/Settings.cls @@ -180,6 +180,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ] do %code.WriteLine(" set valid = 0") do %code.WriteLine(" while ('valid) {") do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")") + do %code.WriteLine(" set value = inst.CleanInput(value)") do %code.WriteLine(" set status = inst.ConfigureBinPath(.value)") do %code.WriteLine(" if (status) { set valid = 1 }") do %code.WriteLine(" }") @@ -206,6 +207,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ] do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")") } do %code.WriteLine(" if response '= $$$SuccessResponse { quit 0 }") + do %code.WriteLine(" set value = inst.CleanInput(value)") do %code.WriteLine(" set inst."_property_" = value") } @@ -386,4 +388,16 @@ Method ConfigureBinPath(ByRef path As %String) As %Boolean return 1 } +ClassMethod CleanInput(value As %String) +{ + while ($extract(value,1) = " ") || ($extract(value,1) = $char(9)) { + set value = $extract(value,2,$length(value)) + } + + while ($extract(value, $length(value)) = " ") || ($extract(value,$length(value)) = $char(9)) { + set value = $extract(value,1,$length(value) - 1) + } + return value +} + } From f056c2ff2cc66ef50a03d45d386f1a07433df583 Mon Sep 17 00:00:00 2001 From: Elijah Tamarchenko Date: Tue, 22 Oct 2024 11:05:09 -0400 Subject: [PATCH 2/2] Simplified trimming leading spaces --- cls/SourceControl/Git/Settings.cls | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls index 591457bf..fa8ab472 100644 --- a/cls/SourceControl/Git/Settings.cls +++ b/cls/SourceControl/Git/Settings.cls @@ -180,7 +180,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ] do %code.WriteLine(" set valid = 0") do %code.WriteLine(" while ('valid) {") do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")") - do %code.WriteLine(" set value = inst.CleanInput(value)") + do %code.WriteLine(" set value = $zstrip(value,""<>W"")") do %code.WriteLine(" set status = inst.ConfigureBinPath(.value)") do %code.WriteLine(" if (status) { set valid = 1 }") do %code.WriteLine(" }") @@ -207,7 +207,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ] do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")") } do %code.WriteLine(" if response '= $$$SuccessResponse { quit 0 }") - do %code.WriteLine(" set value = inst.CleanInput(value)") + do %code.WriteLine(" set value = $zstrip(value,""<>W"")") do %code.WriteLine(" set inst."_property_" = value") } @@ -388,16 +388,4 @@ Method ConfigureBinPath(ByRef path As %String) As %Boolean return 1 } -ClassMethod CleanInput(value As %String) -{ - while ($extract(value,1) = " ") || ($extract(value,1) = $char(9)) { - set value = $extract(value,2,$length(value)) - } - - while ($extract(value, $length(value)) = " ") || ($extract(value,$length(value)) = $char(9)) { - set value = $extract(value,1,$length(value) - 1) - } - return value -} - }