Update bool conversion and arguments

Author: dkbennett

src/AppInstallerCLICore/Commands/SourceCommand.cpp

@@ -344,7 +344,8 @@ namespace AppInstaller::CLI
         if (execArgs.Contains(Execution::Args::Type::SourceEditExplicit))
         {
             std::string_view explicitArg = execArgs.GetArg(Execution::Args::Type::SourceEditExplicit);
-            if (!Utility::CaseInsensitiveEquals(explicitArg, "true") && !Utility::CaseInsensitiveEquals(explicitArg, "false"))
+            auto convertedArg = Utility::TryConvertStringToBool(explicitArg);
+            if (!convertedArg.has_value())
             {
                 auto validOptions = Utility::Join(", "_liv, std::vector<Utility::LocIndString>{
                     "true"_lis,

src/AppInstallerCLICore/Workflows/SourceFlow.cpp

@@ -283,11 +283,10 @@ namespace AppInstaller::CLI::Workflow
             Repository::Source targetSource{ sd.Name };
             auto oldExplicitValue = sd.Explicit;
 
-            // Default to the current explicit value unless we are overriding it.
-            auto isExplicit = oldExplicitValue;
+            std::optional<bool> isExplicit;
             if (context.Args.Contains(Execution::Args::Type::SourceEditExplicit))
             {
-                isExplicit = Utility::ConvertStringToBool(context.Args.GetArg(Execution::Args::Type::SourceEditExplicit));
+                isExplicit = Utility::TryConvertStringToBool(context.Args.GetArg(Execution::Args::Type::SourceEditExplicit));
             }
 
             Repository::SourceEdit edits{ std::optional<bool>{ isExplicit } };

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

@@ -3476,11 +3476,11 @@ An unlocalized JSON fragment will follow on another line.</comment>
     <value>Font package is already installed.</value>
   </data>
   <data name="SourceEditOldValue" xml:space="preserve">
-    <value>Old value</value>
+    <value>Old Value</value>
     <comment>Column title for listing edit changes.</comment>
   </data>
   <data name="SourceEditNewValue" xml:space="preserve">
-    <value>New value</value>
+    <value>New Value</value>
     <comment>Column title for listing the new value.</comment>
   </data>
 </root>

src/AppInstallerSharedLib/AppInstallerStrings.cpp

@@ -939,11 +939,18 @@ namespace AppInstaller::Utility
         return value ? "true"sv : "false"sv;
     }
 
-    bool ConvertStringToBool(const std::string_view& input)
+    std::optional<bool> TryConvertStringToBool(const std::string_view& input)
     {
-        bool value;
-        std::istringstream(std::string(input)) >> std::boolalpha >> value;
-        return value;
+        try
+        {
+            bool value;
+            std::istringstream(std::string(input)) >> std::boolalpha >> value;
+            return { value };
+        }
+        catch
+        {
+            return {};
+        }
     }
 
     std::string ConvertGuidToString(const GUID& value)

src/AppInstallerSharedLib/Public/AppInstallerStrings.h

@@ -3,6 +3,7 @@
 #pragma once
 #include <filesystem>
 #include <ostream>
+#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -291,7 +292,7 @@ namespace AppInstaller::Utility
     std::string_view ConvertBoolToString(bool value);
 
     // Converts the given string view into a bool.
-    bool ConvertStringToBool(const std::string_view& value);
+    std::optional<bool> TryConvertStringToBool(const std::string_view& value);
 
     // Converts the given GUID value to a string.
     std::string ConvertGuidToString(const GUID& value);