Fix winget after a call to winget settings export

src/AppInstallerCLICore/Commands/RootCommand.cpp

@@ -27,6 +27,8 @@ using namespace AppInstaller::Utility::literals;
 
 namespace AppInstaller::CLI
 {
+    using namespace Settings;
+
     namespace
     {
         void OutputGroupPolicySourceList(Execution::Context& context, const std::vector<Settings::SourceFromPolicy>& sources, Resource::StringId header)
@@ -193,7 +195,7 @@ namespace AppInstaller::CLI
             };
 
             info << std::endl << Resource::String::Logs << ": "_liv << Runtime::GetPathTo(Runtime::PathName::DefaultLogLocationForDisplay).u8string() << std::endl;
-            info << std::endl << Resource::String::UserSettings << ": "_liv << Runtime::GetPathTo(Runtime::PathName::UserSettingsFileLocationForDisplay).u8string() << std::endl;
+            info << std::endl << Resource::String::UserSettings << ": "_liv << UserSettings::SettingsFilePath(true).u8string() << std::endl;
 
             info << std::endl;
 

src/AppInstallerCLICore/Workflows/SettingsFlow.cpp

@@ -20,7 +20,7 @@ namespace AppInstaller::CLI::Workflow
             {
                 root["$schema"] = "https://aka.ms/winget-settings-export.schema.json";
                 root["adminSettings"] = Json::ValueType::objectValue;
-                root["userSettingsFile"] = Runtime::GetPathTo(Runtime::PathName::UserSettingsFileLocation).u8string();
+                root["userSettingsFile"] = UserSettings::SettingsFilePath().u8string();
             }
 
             void AddAdminSetting(AdminSetting setting)

src/AppInstallerCommonCore/Filesystem.cpp

@@ -201,4 +201,41 @@ namespace AppInstaller::Filesystem
             return path;
         }
     }
+
+    void ReplaceCommonPathPrefix(std::filesystem::path& source, const std::filesystem::path& prefix, std::string_view replacement)
+    {
+        auto prefixItr = prefix.begin();
+        auto sourceItr = source.begin();
+
+        while (prefixItr != prefix.end() && sourceItr != source.end())
+        {
+            if (*prefixItr != *sourceItr)
+            {
+                break;
+            }
+
+            ++prefixItr;
+            ++sourceItr;
+        }
+
+        // Only replace source if we found all of prefix
+        if (prefixItr == prefix.end())
+        {
+            std::filesystem::path temp{ replacement };
+
+            for (; sourceItr != source.end(); ++sourceItr)
+            {
+                temp /= *sourceItr;
+            }
+
+            source = std::move(temp);
+        }
+    }
+
+    std::filesystem::path GetKnownFolderPath(const KNOWNFOLDERID& id)
+    {
+        wil::unique_cotaskmem_string knownFolder = nullptr;
+        THROW_IF_FAILED(SHGetKnownFolderPath(id, KF_FLAG_NO_ALIAS | KF_FLAG_DONT_VERIFY | KF_FLAG_NO_PACKAGE_REDIRECTION, NULL, &knownFolder));
+        return knownFolder.get();
+    }
 }

src/AppInstallerCommonCore/Public/AppInstallerRuntime.h

@@ -62,10 +62,6 @@ namespace AppInstaller::Runtime
         PortableLinksUserLocation,
         // The location where symlinks to portable packages are stored under machine scope.
         PortableLinksMachineLocation,
-        // The location of the user settings json file.
-        UserSettingsFileLocation,
-        // The location of the user settings json file, anonymized using environment variables.
-        UserSettingsFileLocationForDisplay,
     };
 
     // The principal that an ACE applies to.

src/AppInstallerCommonCore/Public/winget/Filesystem.h

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 #include <filesystem>
+#include <shtypes.h>
 
 namespace AppInstaller::Filesystem
 {
@@ -35,4 +36,10 @@ namespace AppInstaller::Filesystem
 
     // Get expanded file system path.
     std::filesystem::path GetExpandedPath(const std::string& path);
+
+    // If `source` begins with all of `prefix`, replace that with `replacement`.
+    void ReplaceCommonPathPrefix(std::filesystem::path& source, const std::filesystem::path& prefix, std::string_view replacement);
+
+    // Gets the path of a known folder.
+    std::filesystem::path GetKnownFolderPath(const KNOWNFOLDERID& id);
 }

src/AppInstallerCommonCore/Public/winget/UserSettings.h

@@ -206,7 +206,7 @@ namespace AppInstaller::Settings
 
         static UserSettings const& Instance(const std::optional<std::string>& content = std::nullopt);
 
-        static std::filesystem::path SettingsFilePath();
+        static std::filesystem::path SettingsFilePath(bool forDisplay = false);
 
         UserSettings(const UserSettings&) = delete;
         UserSettings& operator=(const UserSettings&) = delete;

src/AppInstallerCommonCore/Runtime.cpp

@@ -16,6 +16,7 @@ namespace AppInstaller::Runtime
 {
     using namespace Utility;
     using namespace Settings;
+    using namespace Filesystem;
 
     namespace
     {
@@ -96,13 +97,6 @@ namespace AppInstaller::Runtime
         static std::map<PathName, PathDetails> s_Path_TestHook_Overrides;
 #endif
 
-        std::filesystem::path GetKnownFolderPath(const KNOWNFOLDERID& id)
-        {
-            wil::unique_cotaskmem_string knownFolder = nullptr;
-            THROW_IF_FAILED(SHGetKnownFolderPath(id, KF_FLAG_NO_ALIAS | KF_FLAG_DONT_VERIFY | KF_FLAG_NO_PACKAGE_REDIRECTION, NULL, &knownFolder));
-            return knownFolder.get();
-        }
-
         // Gets the user's temp path
         std::filesystem::path GetPathToUserTemp()
         {
@@ -166,37 +160,6 @@ namespace AppInstaller::Runtime
             return result;
         }
 
-        // If `source` begins with all of `prefix`, replace that with `replacement`.
-        void ReplaceCommonPathPrefix(std::filesystem::path& source, const std::filesystem::path& prefix, std::string_view replacement)
-        {
-            auto prefixItr = prefix.begin();
-            auto sourceItr = source.begin();
-
-            while (prefixItr != prefix.end() && sourceItr != source.end())
-            {
-                if (*prefixItr != *sourceItr)
-                {
-                    break;
-                }
-
-                ++prefixItr;
-                ++sourceItr;
-            }
-
-            // Only replace source if we found all of prefix
-            if (prefixItr == prefix.end())
-            {
-                std::filesystem::path temp{ replacement };
-
-                for (; sourceItr != source.end(); ++sourceItr)
-                {
-                    temp /= *sourceItr;
-                }
-
-                source = std::move(temp);
-            }
-        }
-
         DWORD AccessPermissionsFrom(ACEPermissions permissions)
         {
             DWORD result = 0;
@@ -547,13 +510,6 @@ namespace AppInstaller::Runtime
         case PathName::PortableLinksMachineLocation:
             result = GetPathDetailsCommon(path);
             break;
-        case PathName::UserSettingsFileLocation:
-            result.Path = UserSettings::SettingsFilePath();
-            break;
-        case PathName::UserSettingsFileLocationForDisplay:
-            result.Path = UserSettings::SettingsFilePath();
-            ReplaceCommonPathPrefix(result.Path, GetKnownFolderPath(FOLDERID_LocalAppData), "%LOCALAPPDATA%");
-            break;
         default:
             THROW_HR(E_UNEXPECTED);
         }
@@ -624,13 +580,6 @@ namespace AppInstaller::Runtime
         case PathName::PortableLinksMachineLocation:
             result = GetPathDetailsCommon(path);
             break;
-        case PathName::UserSettingsFileLocation:
-            result.Path = UserSettings::SettingsFilePath();
-            break;
-        case PathName::UserSettingsFileLocationForDisplay:
-            result.Path = UserSettings::SettingsFilePath();
-            ReplaceCommonPathPrefix(result.Path, GetKnownFolderPath(FOLDERID_LocalAppData), "%LOCALAPPDATA%");
-            break;
         default:
             THROW_HR(E_UNEXPECTED);
         }

src/AppInstallerCommonCore/UserSettings.cpp

@@ -7,6 +7,7 @@
 #include "winget/JsonUtil.h"
 #include "winget/Settings.h"
 #include "winget/UserSettings.h"
+#include "winget/filesystem.h"
 
 #include "AppInstallerArchitecture.h"
 #include "winget/Locale.h"
@@ -18,6 +19,7 @@ namespace AppInstaller::Settings
     using namespace Utility;
     using namespace Logging;
     using namespace JSON;
+    using namespace Filesystem;
 
     static constexpr std::string_view s_SettingEmpty =
         R"({
@@ -93,11 +95,22 @@ namespace AppInstaller::Settings
 
         std::optional<Json::Value> ParseFile(const StreamDefinition& setting, std::vector<UserSettings::Warning>& warnings)
         {
-            auto stream = Stream{ setting }.Get();
-            if (stream)
+            try
             {
-                std::string settingsContentStr = Utility::ReadEntireStream(*stream);
-                return ParseSettingsContent(settingsContentStr, setting.Name, warnings);
+                auto stream = Stream{ setting }.Get();
+                if (stream)
+                {
+                    std::string settingsContentStr = Utility::ReadEntireStream(*stream);
+                    return ParseSettingsContent(settingsContentStr, setting.Name, warnings);
+                }
+            }
+            catch (const std::exception& e)
+            {
+                AICLI_LOG(Core, Error, << "Failed to read " << setting.Name << "Reason: " << e.what());
+            }
+            catch (...)
+            {
+                AICLI_LOG(Core, Error, << "Failed to read " << setting.Name << " Reason unknown.");
             }
 
             return {};
@@ -505,6 +518,10 @@ namespace AppInstaller::Settings
                     m_type = UserSettingsType::Backup;
                     settingsRoot = settingsBackupJson.value();
                 }
+                else
+                {
+                    AICLI_LOG(Core, Warning, << "Failed loading settings files.");
+                }
             }
         }
 
@@ -543,8 +560,15 @@ namespace AppInstaller::Settings
         }
     }
 
-    std::filesystem::path UserSettings::SettingsFilePath()
+    std::filesystem::path UserSettings::SettingsFilePath(bool forDisplay)
     {
-        return Stream{ Stream::PrimaryUserSettings }.GetPath();
+        auto path = Stream{ Stream::PrimaryUserSettings }.GetPath();
+
+        if (forDisplay)
+        {
+            ReplaceCommonPathPrefix(path, GetKnownFolderPath(FOLDERID_LocalAppData), "%LOCALAPPDATA%");
+        }
+
+        return path;
     }
 }