From 5f23bd725941a94304481d7aa37409162426e8ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:48:32 +0900
Subject: [PATCH] Revert most of the changes to ArchiveModeManager by using
better code
---
osu.Game/Beatmaps/BeatmapManager.cs | 8 ++------
osu.Game/Database/ArchiveModelManager.cs | 26 ++++++++++++++----------
osu.Game/Scoring/ScoreManager.cs | 7 +++----
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 4825569ee4..f23e135c68 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -64,13 +64,9 @@ namespace osu.Game.Beatmaps
protected override string[] HashableFileTypes => new[] { ".osu" };
- protected override bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
+ protected override string ImportFromStablePath => ".";
- protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
- {
- var songStorage = stableStorage.GetSongStorage();
- return songStorage.GetDirectories(".").Select(path => songStorage.GetFullPath(path));
- }
+ protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();
private readonly RulesetStore rulesets;
private readonly BeatmapStore beatmaps;
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index fd94660a4b..b55020c437 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -637,16 +637,11 @@ namespace osu.Game.Database
/// </summary>
protected virtual string ImportFromStablePath => null;
- /// <summary>
- /// Checks for the existence of an osu-stable directory.
- /// </summary>
- protected virtual bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
-
/// <summary>
/// Select paths to import from stable where all paths should be absolute. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
/// </summary>
- protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
- .Select(path => stableStorage.GetFullPath(path));
+ protected virtual IEnumerable<string> GetStableImportPaths(Storage storage) => storage.GetDirectories(ImportFromStablePath)
+ .Select(path => storage.GetFullPath(path));
/// <summary>
/// Whether this specified path should be removed after successful import.
@@ -660,24 +655,33 @@ namespace osu.Game.Database
/// </summary>
public Task ImportFromStableAsync()
{
- var stable = GetStableStorage?.Invoke();
+ var stableStorage = GetStableStorage?.Invoke();
- if (stable == null)
+ if (stableStorage == null)
{
Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
return Task.CompletedTask;
}
- if (!StableDirectoryExists(stable))
+ var storage = PrepareStableStorage(stableStorage);
+
+ if (!storage.ExistsDirectory(ImportFromStablePath))
{
// This handles situations like when the user does not have a Skins folder
Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
return Task.CompletedTask;
}
- return Task.Run(async () => await Import(GetStableImportPaths(stable).ToArray()));
+ return Task.Run(async () => await Import(GetStableImportPaths(storage).ToArray()));
}
+ /// <summary>
+ /// Run any required traversal operations on the stable storage location before performing operations.
+ /// </summary>
+ /// <param name="stableStorage">The stable storage.</param>
+ /// <returns>The usable storage. Return the unchanged <paramref name="stableStorage"/> if no traversal is required.</returns>
+ protected virtual Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage;
+
#endregion
/// <summary>
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 6aa0a30a75..a6beb19876 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -16,7 +16,6 @@ using osu.Framework.Platform;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Database;
-using osu.Game.IO;
using osu.Game.IO.Archives;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
@@ -72,9 +71,9 @@ namespace osu.Game.Scoring
}
}
- protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
- => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
- .Select(path => stableStorage.GetFullPath(path));
+ protected override IEnumerable<string> GetStableImportPaths(Storage storage)
+ => storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
+ .Select(path => storage.GetFullPath(path));
public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);