mirror of
https://github.com/ppy/osu.git
synced 2025-01-27 10:23:03 +08:00
Move static properties to parent class and inherit OsuStorage from it
This commit is contained in:
parent
dd9697032c
commit
21774b8967
@ -151,13 +151,13 @@ namespace osu.Game.Tests.NonVisual
|
|||||||
Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
|
Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
|
||||||
Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
|
Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
|
||||||
|
|
||||||
foreach (var file in OsuStorage.IGNORE_FILES)
|
foreach (var file in MigratableStorage.IGNORE_FILES)
|
||||||
{
|
{
|
||||||
Assert.That(host.Storage.Exists(file), Is.True);
|
Assert.That(host.Storage.Exists(file), Is.True);
|
||||||
Assert.That(storage.Exists(file), Is.False);
|
Assert.That(storage.Exists(file), Is.False);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var dir in OsuStorage.IGNORE_DIRECTORIES)
|
foreach (var dir in MigratableStorage.IGNORE_DIRECTORIES)
|
||||||
{
|
{
|
||||||
Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
|
Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
|
||||||
Assert.That(storage.ExistsDirectory(dir), Is.False);
|
Assert.That(storage.ExistsDirectory(dir), Is.False);
|
||||||
|
@ -14,9 +14,13 @@ namespace osu.Game.IO
|
|||||||
public abstract class MigratableStorage : WrappedStorage
|
public abstract class MigratableStorage : WrappedStorage
|
||||||
{
|
{
|
||||||
|
|
||||||
virtual protected string[] IGNORE_DIRECTORIES { get; set; } = Array.Empty<string>();
|
internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };
|
||||||
|
|
||||||
virtual protected string[] IGNORE_FILES { get; set; } = Array.Empty<string>();
|
internal static readonly string[] IGNORE_FILES =
|
||||||
|
{
|
||||||
|
"framework.ini",
|
||||||
|
"storage.ini"
|
||||||
|
};
|
||||||
|
|
||||||
public MigratableStorage(Storage storage, string subPath = null)
|
public MigratableStorage(Storage storage, string subPath = null)
|
||||||
: base(storage, subPath)
|
: base(storage, subPath)
|
||||||
|
@ -11,19 +11,11 @@ using osu.Game.Configuration;
|
|||||||
|
|
||||||
namespace osu.Game.IO
|
namespace osu.Game.IO
|
||||||
{
|
{
|
||||||
public class OsuStorage : WrappedStorage
|
public class OsuStorage : MigratableStorage
|
||||||
{
|
{
|
||||||
private readonly GameHost host;
|
private readonly GameHost host;
|
||||||
private readonly StorageConfigManager storageConfig;
|
private readonly StorageConfigManager storageConfig;
|
||||||
|
|
||||||
internal static readonly string[] IGNORE_DIRECTORIES = { "cache" };
|
|
||||||
|
|
||||||
internal static readonly string[] IGNORE_FILES =
|
|
||||||
{
|
|
||||||
"framework.ini",
|
|
||||||
"storage.ini"
|
|
||||||
};
|
|
||||||
|
|
||||||
public OsuStorage(GameHost host)
|
public OsuStorage(GameHost host)
|
||||||
: base(host.Storage, string.Empty)
|
: base(host.Storage, string.Empty)
|
||||||
{
|
{
|
||||||
@ -76,73 +68,5 @@ namespace osu.Game.IO
|
|||||||
|
|
||||||
deleteRecursive(source);
|
deleteRecursive(source);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void deleteRecursive(DirectoryInfo target, bool topLevelExcludes = true)
|
|
||||||
{
|
|
||||||
foreach (System.IO.FileInfo fi in target.GetFiles())
|
|
||||||
{
|
|
||||||
if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
attemptOperation(() => fi.Delete());
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (DirectoryInfo dir in target.GetDirectories())
|
|
||||||
{
|
|
||||||
if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
attemptOperation(() => dir.Delete(true));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
|
|
||||||
attemptOperation(target.Delete);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void copyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
|
|
||||||
{
|
|
||||||
// based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
|
|
||||||
Directory.CreateDirectory(destination.FullName);
|
|
||||||
|
|
||||||
foreach (System.IO.FileInfo fi in source.GetFiles())
|
|
||||||
{
|
|
||||||
if (topLevelExcludes && IGNORE_FILES.Contains(fi.Name))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
attemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (DirectoryInfo dir in source.GetDirectories())
|
|
||||||
{
|
|
||||||
if (topLevelExcludes && IGNORE_DIRECTORIES.Contains(dir.Name))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
copyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Attempt an IO operation multiple times and only throw if none of the attempts succeed.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="action">The action to perform.</param>
|
|
||||||
/// <param name="attempts">The number of attempts (250ms wait between each).</param>
|
|
||||||
private static void attemptOperation(Action action, int attempts = 10)
|
|
||||||
{
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
action();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
if (attempts-- == 0)
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
|
|
||||||
Thread.Sleep(250);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user