From ae44f17205961116baef018bae0b8fe9196b27f0 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Wed, 7 Dec 2016 22:43:05 -0500
Subject: fix installer not moving mods out of appdata if the game isn't
 installed on the same Windows partition (#184)

---
 release-notes.md                                   |  3 +-
 .../InteractiveInstaller.cs                        | 32 +++++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/release-notes.md b/release-notes.md
index 133ae929..e7712011 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -7,7 +7,8 @@ For players:
   * Installing SMAPI will now automatically clean up old SMAPI files.
   * Each mod now has its own `.cache` folder, so removing the mod won't leave orphaned cache files behind.
   * Tweaked installer wording to avoid confusion.
-  * Fixed the installer not removing TrainerMod from the legacy appdata mods directory if it's already present in the game mods directory.
+  * Fixed the installer not removing TrainerMod from appdata if it's already in the game mods directory.
+  * Fixed the installer not moving mods out of appdata if the game isn't installed on the same Windows partition.
 
 For developers:
   * Added a searchable `list_items` command to replace the `out_items`, `out_melee`, and `out_rings` commands.
diff --git a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
index cfd64458..ffdef37b 100644
--- a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
+++ b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
@@ -406,10 +406,7 @@ namespace StardewModdingApi.Installer
 
                 // move into mods
                 this.PrintDebug($"   Moving {entry.Name} into the game's mod directory...");
-                if (isDir)
-                    (entry as DirectoryInfo).MoveTo(newPath);
-                else
-                    (entry as FileInfo).MoveTo(newPath);
+                this.Move(entry, newPath);
             }
 
             // delete if empty
@@ -421,5 +418,32 @@ namespace StardewModdingApi.Installer
                 modDir.Delete();
             }
         }
+
+        /// <summary>Move a filesystem entry to a new parent directory.</summary>
+        /// <param name="entry">The filesystem entry to move.</param>
+        /// <param name="newPath">The destination path.</param>
+        /// <remarks>We can't use <see cref="FileInfo.MoveTo"/> or <see cref="DirectoryInfo.MoveTo"/>, because those don't work across partitions.</remarks>
+        private void Move(FileSystemInfo entry, string newPath)
+        {
+            // file
+            if (entry is FileInfo)
+            {
+                FileInfo file = (FileInfo)entry;
+                file.CopyTo(newPath);
+                file.Delete();
+            }
+
+            // directory
+            else
+            {
+                Directory.CreateDirectory(newPath);
+
+                DirectoryInfo directory = (DirectoryInfo)entry;
+                foreach (FileSystemInfo child in directory.EnumerateFileSystemInfos())
+                    this.Move(child, Path.Combine(newPath, child.Name));
+
+                directory.Delete();
+            }
+        }
     }
 }
-- 
cgit