updatws

unitystation · Dec 10, 2024 · b1c6f48 · b1c6f48
1 parent 3d7c1b2
commit b1c6f48
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/UnitystationLauncher/Services/CodeScanConfigService.cs b/UnitystationLauncher/Services/CodeScanConfigService.cs
@@ -47,11 +47,11 @@ public CodeScanConfigService(HttpClient httpClient, IPreferencesService preferen
 
         string pathBase = _preferencesService.GetPreferences().InstallationPath;
         string folderName = GetFolderName(version);
-        string versionPath = Path.Combine(pathBase, version, folderName);
+        string versionPath = Path.Combine(pathBase, "nonbuild", version, folderName);
 
         if (Directory.Exists(versionPath) == false)
         {
-            string zipExtractPath = Path.Combine(pathBase, version);
+            string zipExtractPath = Path.Combine(pathBase, "nonbuild", version);
             HttpResponseMessage request = await _httpClient.GetAsync($"{ApiUrls.GoodFilesBaseUrl}/{version}/{folderName}.zip", HttpCompletionOption.ResponseHeadersRead);
             await using Stream responseStream = await request.Content.ReadAsStreamAsync();
             ZipArchive archive = new(responseStream);
@@ -183,12 +183,12 @@ private string GetZipFolderName()
         switch (os)
         {
             case CurrentEnvironment.WindowsStandalone:
-                return "Windows";
+                return "StandaloneWindows64";
             case CurrentEnvironment.LinuxFlatpak:
             case CurrentEnvironment.LinuxStandalone:
-                return "Linux";
+                return "StandaloneLinux64";
             case CurrentEnvironment.MacOsStandalone:
-                return "Mac";
+                return "StandaloneOSX";
             default:
                 throw new UnsupportedPlatformException($"Unable to determine OS Version {os}");
         }

diff --git a/UnitystationLauncher/Services/CodeScanService.cs b/UnitystationLauncher/Services/CodeScanService.cs
@@ -36,8 +36,10 @@ public async Task<bool> OnScanAsync(ZipArchive archive, string targetDirectory,
         // TODO: Enable extraction cancelling
         DirectoryInfo root = new(_preferencesService.GetPreferences().InstallationPath);
 
-        DirectoryInfo stagingDirectory = root.CreateSubdirectory("UnsafeBuildZipDirectory");
-        DirectoryInfo processingDirectory = root.CreateSubdirectory("UnsafeBuildProcessing");
+        var nonbuild = root.CreateSubdirectory("nonbuild");
+
+        DirectoryInfo stagingDirectory = nonbuild.CreateSubdirectory("UnsafeBuildZipDirectory");
+        DirectoryInfo processingDirectory = nonbuild.CreateSubdirectory("UnsafeBuildProcessing");
         DirectoryInfo? dataPath = null;
         archive.ExtractToDirectory(stagingDirectory.ToString(), true);
         try

diff --git a/UnitystationLauncher/Services/InstallationService.cs b/UnitystationLauncher/Services/InstallationService.cs
@@ -115,6 +115,17 @@ public List<Installation> GetInstallations()
 
         string installationBasePath = _preferencesService.GetPreferences().InstallationPath;
         // should be something like {basePath}/{forkName}/{version}
+        if (server.ForkName.SanitiseStringPath() == "nonbuild")
+        {
+            throw new Exception($" bad server.ForkName {server.ForkName.SanitiseStringPath()}  Not allowed as save location (nonbuild)");
+        }
+
+        if (server.ForkName.SanitiseStringPath() == "tts")
+        {
+            throw new Exception($" bad server.ForkName {server.ForkName.SanitiseStringPath()}  Not allowed as save location (tts) ");
+        }
+
+
         string installationPath = Path.Combine(installationBasePath, server.ForkName.SanitiseStringPath(), server.GoodFileVersion.SanitiseStringPath(), server.BuildVersion.ToString());
 
         download = new(downloadUrl, installationPath, server.ForkName, server.BuildVersion, server.GoodFileVersion);