Add template

microsoft · Nov 14, 2024 · e9d77e9 · e9d77e9
1 parent 3e66324
commit e9d77e9
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 1 deletion.
diff --git a/src/AppInstallerCommonCore/Public/winget/UserSettings.h b/src/AppInstallerCommonCore/Public/winget/UserSettings.h
@@ -205,7 +205,7 @@ namespace AppInstaller::Settings
 
         // Experiments
         using Experiments_t = std::map<std::string, bool>;
-        SETTINGMAPPING_SPECIALIZATION(Setting::Experiments, std::string, Experiments_t, {}, ".experiments"sv);
+        SETTINGMAPPING_SPECIALIZATION(Setting::Experiments, Experiments_t, Experiments_t, {}, ".experiments"sv);
 
         // Used to deduce the SettingVariant type; making a variant that includes std::monostate and all SettingMapping types.
         template <size_t... I>

diff --git a/src/AppInstallerCommonCore/UserSettings.cpp b/src/AppInstallerCommonCore/UserSettings.cpp
@@ -75,6 +75,32 @@ namespace AppInstaller::Settings
             return convertedValue;
         }
 
+        template<>
+        std::string GetValueString(std::map<std::string, bool> value)
+        {
+            std::stringstream convertedValue;
+            convertedValue << "{";
+
+            bool first = true;
+            for (auto const& entry : value)
+            {
+                if (first)
+                {
+                    first = false;
+                }
+                else
+                {
+                    convertedValue << ", ";
+                }
+
+                convertedValue << "'" << entry.first << "' = " << entry.second;
+            }
+
+            convertedValue << "}";
+
+            return convertedValue.str();
+        }
+
         std::optional<Json::Value> ParseSettingsContent(const std::string& content, std::string_view settingName, std::vector<UserSettings::Warning>& warnings)
         {
             Json::Value root;
@@ -278,6 +304,7 @@ namespace AppInstaller::Settings
         WINGET_VALIDATE_PASS_THROUGH(UninstallPurgePortablePackage)
         WINGET_VALIDATE_PASS_THROUGH(NetworkWingetAlternateSourceURL)
         WINGET_VALIDATE_PASS_THROUGH(MaxResumes)
+        WINGET_VALIDATE_PASS_THROUGH(Experiments)
 
 #ifndef AICLI_DISABLE_TEST_HOOKS
         WINGET_VALIDATE_PASS_THROUGH(EnableSelfInitiatedMinidump)

diff --git a/src/AppInstallerSharedLib/JsonUtil.cpp b/src/AppInstallerSharedLib/JsonUtil.cpp
@@ -67,6 +67,27 @@ namespace AppInstaller::JSON
 
         return std::nullopt;
     }
+
+    template<>
+    std::optional<std::map<std::string, bool>> GetValue(const Json::Value& node)
+    {
+        std::map<std::string, bool> result;
+
+        if (node.isObject())
+        {
+            for (const auto& entry : node.getMemberNames())
+            {
+                if (node[entry].isBool())
+                {
+                    result[entry] = node[entry].asBool();
+                }
+            }
+
+            return result;
+        }
+
+        return std::nullopt;
+    }
 
 #ifndef WINGET_DISABLE_FOR_FUZZING
     utility::string_t GetUtilityString(std::string_view nodeName)

diff --git a/src/AppInstallerSharedLib/Public/winget/JsonUtil.h b/src/AppInstallerSharedLib/Public/winget/JsonUtil.h
@@ -33,6 +33,9 @@ namespace AppInstaller::JSON
 
     template<>
     std::optional<std::vector<std::string>> GetValue<std::vector<std::string>>(const Json::Value& node);
+
+    template<>
+    std::optional<std::map<std::string, bool>> GetValue(const Json::Value& node);
 
 #ifndef WINGET_DISABLE_FOR_FUZZING
     // For cpprestsdk JSON