feat: Support for Millennium 3.0.0

Author: shdwmtr

src/routes/installer.cc

@@ -204,12 +204,6 @@ static bool UsesNewInstallLayout(const std::string& tagName)
     }
 }
 
-static std::string GetLocalAppDataPath()
-{
-    const char* localAppData = std::getenv("LOCALAPPDATA");
-    return localAppData ? std::string(localAppData) : std::string();
-}
-
 TaskScheduler::TaskResult InstallReleaseAssets(std::unique_ptr<double>& progress, const nlohmann::json& releaseInfo, const nlohmann::json& osReleaseInfo,
                                                const std::string& steamPath)
 {
@@ -222,30 +216,7 @@ TaskScheduler::TaskResult InstallReleaseAssets(std::unique_ptr<double>& progress
     std::string tagName = releaseInfo.contains("tag_name") ? releaseInfo["tag_name"].get<std::string>() : "";
 
     if (UsesNewInstallLayout(tagName)) {
-        std::string localAppData = GetLocalAppDataPath();
-        if (localAppData.empty()) {
-            return { false, "Failed to resolve %LOCALAPPDATA% path." };
-        }
-
-        auto millenniumPath = std::filesystem::path(localAppData) / "Millennium";
-        std::filesystem::create_directories(millenniumPath);
-
-        ExtractZippedArchive(fileName.string().c_str(), millenniumPath.string().c_str(), progress.get(), &currentFileProgress);
-
-        auto source = millenniumPath / "lib" / "millennium.bootstrap64.dll";
-        auto dest = std::filesystem::path(steamPath) / "wsock32.dll";
-
-        if (!std::filesystem::exists(source)) {
-            return { false, "millennium.bootstrap64.dll not found after extraction." };
-        }
-
-        std::error_code ec;
-        std::filesystem::remove(dest, ec);
-
-        std::filesystem::create_hard_link(source, dest, ec);
-        if (ec) {
-            return { false, std::format("Failed to create hardlink: {}", ec.message()) };
-        }
+        ExtractZippedArchive(fileName.string().c_str(), steamPath.c_str(), progress.get(), &currentFileProgress);
     } else {
         ExtractZippedArchive(fileName.string().c_str(), steamPath.c_str(), progress.get(), &currentFileProgress);
     }

src/routes/uninstall_select.cc

@@ -108,33 +108,23 @@ ComponentProps MakeComponentProps(std::vector<std::filesystem::path> pathList)
 
 std::vector<std::pair<std::string, std::tuple<ComponentState, ComponentProps>>> uninstallComponents;
 
-static std::filesystem::path GetMillenniumLocalPath()
-{
-    const char* localAppData = std::getenv("LOCALAPPDATA");
-    if (localAppData) {
-        return std::filesystem::path(localAppData) / "Millennium";
-    }
-    return {};
-}
-
 // clang-format off
 void InitializeUninstaller()
 {
     steamPath = GetSteamPath();
-    auto millenniumLocalPath = GetMillenniumLocalPath();
+    auto millenniumPath = steamPath / "millennium";
 
     isUninstalling = false;
     uninstallFinished = false;
 
-    bool isNewLayout = !millenniumLocalPath.empty() && std::filesystem::exists(millenniumLocalPath);
+    bool isNewLayout = std::filesystem::exists(millenniumPath);
 
     std::vector<std::filesystem::path> millenniumPaths;
 
     if (isNewLayout) {
-        // New install (>2.35.0): files in %LOCALAPPDATA%/Millennium + hardlink in Steam
         millenniumPaths = {
-            millenniumLocalPath / "lib",
-            millenniumLocalPath / "bin",
+            millenniumPath / "lib",
+            millenniumPath / "bin",
             steamPath / "wsock32.dll",
         };
     } else {
@@ -156,12 +146,17 @@ void InitializeUninstaller()
     uninstallComponents = {
         { "Millennium", std::make_tuple(ComponentState({ false, true }), MakeComponentProps(millenniumPaths)) },
         { "Custom Steam Components", std::make_tuple(ComponentState({ false, true }), MakeComponentProps({
+            millenniumPath / "ext" / "data" / "assets",
+            millenniumPath / "ext" / "data" / "shims",
             steamPath / "ext" / "data" / "assets",
             steamPath / "ext" / "data" / "shims"
         })) },
-        { "Dependencies", std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ steamPath / "ext" / "data" / "cache", steamPath / "ext" / "data" / "pyx64" })) },
-        { "Themes",       std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ steamPath / "steamui" / "skins" }))                                            },
-        { "Plugins",      std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ steamPath / "plugins" }))                                                      },
+        { "Dependencies", std::make_tuple(ComponentState({ false, true }), MakeComponentProps({
+            steamPath / "ext" / "data" / "cache",
+            steamPath / "ext" / "data" / "pyx64"
+        })) },
+        { "Themes",  std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ millenniumPath / "themes", steamPath / "steamui" / "skins" })) },
+        { "Plugins", std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ millenniumPath / "plugins", steamPath / "plugins" }))          },
     };
 }
 // clang-format on