Merge pull request #33 from ccloli/feature/move-directory

Prefer to move the directory to reduce disk writing
Goobwabber · Jul 1, 2023 · 4f8359e · 4f8359e
2 parents 67deb24 + 15bd325
commit 4f8359e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/LegacyInstaller/MainWindow.xaml.cs b/LegacyInstaller/MainWindow.xaml.cs
@@ -262,14 +262,22 @@ private async Task InstallVersion(Version version)
             await _steamProcess.Downloader.DownloadDepot(version.ManifestId, FileSystemChanged);
 
             // Copy files
-            this.Dispatcher.Invoke((Action)delegate { installStateLabel.Content = "Copying..."; });
-            Directory.CreateDirectory(SelectedVersionInstallDir);
-            var watcher = new FileSystemWatcher(SelectedVersionInstallDir);
-            watcher.NotifyFilter = NotifyFilters.Attributes | NotifyFilters.CreationTime | NotifyFilters.DirectoryName | NotifyFilters.FileName | NotifyFilters.LastAccess | NotifyFilters.LastWrite | NotifyFilters.Security | NotifyFilters.Size;
-            watcher.IncludeSubdirectories = true;
-            watcher.EnableRaisingEvents = true;
-            watcher.Changed += FileSystemChanged;
-            await Utilities.CopyDirectory(_steamProcess.Downloader.ContentAppDepotDir, SelectedVersionInstallDir);
+            try
+            {
+                this.Dispatcher.Invoke((Action)delegate { installStateLabel.Content = "Moving..."; });
+                Utilities.MoveDirectory(_steamProcess.Downloader.ContentAppDepotDir, SelectedVersionInstallDir);
+            }
+            catch
+            {
+                this.Dispatcher.Invoke((Action)delegate { installStateLabel.Content = "Copying..."; });
+                Directory.CreateDirectory(SelectedVersionInstallDir);
+                var watcher = new FileSystemWatcher(SelectedVersionInstallDir);
+                watcher.NotifyFilter = NotifyFilters.Attributes | NotifyFilters.CreationTime | NotifyFilters.DirectoryName | NotifyFilters.FileName | NotifyFilters.LastAccess | NotifyFilters.LastWrite | NotifyFilters.Security | NotifyFilters.Size;
+                watcher.IncludeSubdirectories = true;
+                watcher.EnableRaisingEvents = true;
+                watcher.Changed += FileSystemChanged;
+                await Utilities.CopyDirectory(_steamProcess.Downloader.ContentAppDepotDir, SelectedVersionInstallDir);
+            }
 
             // Create Junction Links for custom levels
             if (customLevelsLinkCheckbox.IsChecked.GetValueOrDefault())

diff --git a/LegacyInstaller/Utilities.cs b/LegacyInstaller/Utilities.cs
@@ -30,6 +30,11 @@ public static async Task CopyDirectory(string sourceDir, string targetDir)
             catch { }
         }
 
+        public static void MoveDirectory(string sourceDir, string targetDir)
+        {
+            Directory.Move(sourceDir, targetDir);
+        }
+
         public static int Search(byte[] src, byte[] pattern)
         {
             int maxFirstCharSlot = src.Length - pattern.Length + 1;