Merge #4440 Fix Missions folder cloning and hard link info retrieval

Author: HebaruSan

CHANGELOG.md

@@ -30,7 +30,7 @@ All notable changes to this project will be documented in this file.
 - [Netkan] Exclude internal .ckan files from `install_size` (#4348 by: HebaruSan)
 - [Core] Generate and tidy up XML docs for Core (#4351 by: HebaruSan)
 - [Core] Use setter instead of reflection to set max transaction timeout (#4365 by: doinkythederp; reviewed: HebaruSan)
-- [Build] Coverage and more tests (#4383, #4396, #4408, #4420, #4422, #4423, #4425, #4426, #4429, #4435, #4439 by: HebaruSan)
+- [Build] Coverage and more tests (#4383, #4396, #4408, #4420, #4422, #4423, #4425, #4426, #4429, #4435, #4439, #4440 by: HebaruSan)
 - [Multiple] Switch Inflator from Mono to dotnet (#4387 by: HebaruSan)
 - [Multiple] Migrate metadata tester from Mono to dotnet (#4390 by: HebaruSan)
 - [Multiple] Writethrough when saving files, add Netkan tests (#4392 by: HebaruSan)

Core/GameInstanceManager.cs

@@ -15,6 +15,7 @@
 using CKAN.Games;
 using CKAN.Games.KerbalSpaceProgram;
 using CKAN.Games.KerbalSpaceProgram.GameVersionProviders;
+using CKAN.DLC;
 
 namespace CKAN
 {
@@ -324,7 +325,7 @@ public void CloneInstance(GameInstance existingInstance,
         /// <exception cref="InstanceNameTakenKraken">Thrown if the instance name is already in use.</exception>
         /// <exception cref="NotGameDirKraken">Thrown by AddInstance() if created instance is not valid, e.g. if a write operation didn't complete for whatever reason.</exception>
         public void FakeInstance(IGame game, string newName, string newPath, GameVersion version,
-                                 Dictionary<DLC.IDlcDetector, GameVersion>? dlcs = null)
+                                 Dictionary<IDlcDetector, GameVersion>? dlcs = null)
         {
             TxFileManager fileMgr = new TxFileManager();
             using (TransactionScope transaction = CkanTransaction.CreateTransactionScope())
@@ -375,11 +376,8 @@ public void FakeInstance(IGame game, string newName, string newPath, GameVersion
                 // Create the needed folder structure and the readme.txt for DLCs that should be simulated.
                 if (dlcs != null)
                 {
-                    foreach (KeyValuePair<DLC.IDlcDetector, GameVersion> dlc in dlcs)
+                    foreach ((IDlcDetector dlcDetector, GameVersion dlcVersion) in dlcs)
                     {
-                        DLC.IDlcDetector dlcDetector = dlc.Key;
-                        GameVersion dlcVersion = dlc.Value;
-
                         if (!dlcDetector.AllowedOnBaseVersion(version))
                         {
                             throw new WrongGameVersionKraken(

Core/Games/KerbalSpaceProgram.cs

@@ -72,7 +72,6 @@ public string PrimaryModDirectory(GameInstance inst)
             "saves",
             "Screenshots",
             "thumbs",
-            "Missions",
             "Logs",
             "CKAN/history",
             "CKAN/downloads",

Core/IO/HardLink.cs

@@ -175,7 +175,7 @@ private enum StatArg
             foreach (var pathsString in LimitedStringJoins(paths.Select(p => $"\"{p}\""),
                                                            " ", STAT_ARG_MAX))
             {
-                if (Process.Start(new ProcessStartInfo("stat", $"-c '{fmt}' {pathsString}")
+                if (Process.Start(new ProcessStartInfo("stat", $"-c \"{fmt}\" {pathsString}")
                                   {
                                       UseShellExecute        = false,
                                       RedirectStandardOutput = true,

Core/Utilities.cs

@@ -117,16 +117,10 @@ private static void CopyDirectory(string        sourceDirPath,
             // Get the files in the directory and copy them to the new location
             foreach (var file in sourceDir.GetFiles())
             {
-                if (file.Name == "registry.locked")
+                if (file.Name is "registry.locked" or "playtime.json")
                 {
                     continue;
                 }
-
-                else if (file.Name == "playtime.json")
-                {
-                    continue;
-                }
-
                 InstalledFilesDeduplicator.CreateOrCopy(file,
                                                         Path.Combine(destDirPath, file.Name),
                                                         file_transaction);