Move general purpose migration to MigratableStorage

osu.Game.Tournament/IO/TournamentStorage.cs

@@ -28,19 +28,16 @@ public TournamentStorage(Storage storage)
                 ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
             }
             else
-            {
-                Migrate(GetFullPath(default_tournament));
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(default_tournament));
-            }
+                Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
 
             VideoStore = new TournamentVideoResourceStore(this);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
         }
 
-        public override void Migrate(string newLocation)
+        public override void Migrate(Storage newStorage)
         {
             var source = new DirectoryInfo(storage.GetFullPath("tournament"));
-            var destination = new DirectoryInfo(newLocation);
+            var destination = new DirectoryInfo(newStorage.GetFullPath("."));
 
             if (source.Exists)
             {
@@ -53,6 +50,7 @@ public override void Migrate(string newLocation)
             moveFileIfExists("drawings.txt", destination);
             moveFileIfExists("drawings_results.txt", destination);
             moveFileIfExists("drawings.ini", destination);
+            ChangeTargetStorage(newStorage);
             storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
             storageConfig.Save();
         }

osu.Game/IO/MigratableStorage.cs

@@ -22,7 +22,36 @@ protected MigratableStorage(Storage storage, string subPath = null)
         {
         }
 
-        public abstract void Migrate(string newLocation);
+        /// <summary>
+        /// A general purpose migration method to move the storage to a different location.
+        /// <param name="newStorage">The target storage of the migration.</param>
+        /// </summary>
+        public virtual void Migrate(Storage newStorage)
+        {
+            var source = new DirectoryInfo(GetFullPath("."));
+            var destination = new DirectoryInfo(newStorage.GetFullPath("."));
+
+            // using Uri is the easiest way to check equality and contains (https://stackoverflow.com/a/7710620)
+            var sourceUri = new Uri(source.FullName + Path.DirectorySeparatorChar);
+            var destinationUri = new Uri(destination.FullName + Path.DirectorySeparatorChar);
+
+            if (sourceUri == destinationUri)
+                throw new ArgumentException("Destination provided is already the current location", nameof(newStorage));
+
+            if (sourceUri.IsBaseOf(destinationUri))
+                throw new ArgumentException("Destination provided is inside the source", nameof(newStorage));
+
+            // ensure the new location has no files present, else hard abort
+            if (destination.Exists)
+            {
+                if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
+                    throw new ArgumentException("Destination provided already has files or directories present", nameof(newStorage));
+            }
+
+            CopyRecursive(source, destination);
+            ChangeTargetStorage(newStorage);
+            DeleteRecursive(source);
+        }
 
         protected void DeleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
         {

osu.Game/IO/OsuStorage.cs

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.IO;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -11,7 +9,6 @@ namespace osu.Game.IO
 {
     public class OsuStorage : MigratableStorage
     {
-        private readonly GameHost host;
         private readonly StorageConfigManager storageConfig;
 
         public override string[] IgnoreDirectories => new[] { "cache" };
@@ -25,8 +22,6 @@ public class OsuStorage : MigratableStorage
         public OsuStorage(GameHost host)
             : base(host.Storage, string.Empty)
         {
-            this.host = host;
-
             storageConfig = new StorageConfigManager(host.Storage);
 
             var customStoragePath = storageConfig.Get<string>(StorageConfig.FullPath);
@@ -41,36 +36,11 @@ protected override void ChangeTargetStorage(Storage newStorage)
             Logger.Storage = UnderlyingStorage.GetStorageForDirectory("logs");
         }
 
-        public override void Migrate(string newLocation)
+        public override void Migrate(Storage newStorage)
         {
-            var source = new DirectoryInfo(GetFullPath("."));
-            var destination = new DirectoryInfo(newLocation);
-
-            // using Uri is the easiest way to check equality and contains (https://stackoverflow.com/a/7710620)
-            var sourceUri = new Uri(source.FullName + Path.DirectorySeparatorChar);
-            var destinationUri = new Uri(destination.FullName + Path.DirectorySeparatorChar);
-
-            if (sourceUri == destinationUri)
-                throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
-
-            if (sourceUri.IsBaseOf(destinationUri))
-                throw new ArgumentException("Destination provided is inside the source", nameof(newLocation));
-
-            // ensure the new location has no files present, else hard abort
-            if (destination.Exists)
-            {
-                if (destination.GetFiles().Length > 0 || destination.GetDirectories().Length > 0)
-                    throw new ArgumentException("Destination provided already has files or directories present", nameof(newLocation));
-            }
-
-            CopyRecursive(source, destination);
-
-            ChangeTargetStorage(host.GetStorage(newLocation));
-
-            storageConfig.Set(StorageConfig.FullPath, newLocation);
+            base.Migrate(newStorage);
+            storageConfig.Set(StorageConfig.FullPath, newStorage.GetFullPath("."));
             storageConfig.Save();
-
-            DeleteRecursive(source);
         }
     }
 }

osu.Game/OsuGameBase.cs

@@ -370,7 +370,7 @@ public RightMouseManager(MouseButton button)
         public void Migrate(string path)
         {
             contextFactory.FlushConnections();
-            (Storage as OsuStorage)?.Migrate(path);
+            (Storage as OsuStorage)?.Migrate(Host.GetStorage(path));
         }
     }
 }