h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 16:32:54 +08:00
Code Issues Releases Wiki Activity

Revert most of the changes to ArchiveModeManager by using better code

Browse Source
This commit is contained in:
Dean Herbert 2021-02-12 12:48:32 +09:00
parent f0dfa9f8f3
commit 5f23bd7259
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -64,13 +64,9 @@ namespace osu.Game.Beatmaps
protected override string[] HashableFileTypes => new[] { ".osu" }; 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) protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();
{
var songStorage = stableStorage.GetSongStorage();
return songStorage.GetDirectories(".").Select(path => songStorage.GetFullPath(path));
}
private readonly RulesetStore rulesets; private readonly RulesetStore rulesets;
private readonly BeatmapStore beatmaps; private readonly BeatmapStore beatmaps;

26
osu.Game/Database/ArchiveModelManager.cs
View File

@ -637,16 +637,11 @@ namespace osu.Game.Database
/// </summary> /// </summary>
protected virtual string ImportFromStablePath => null; 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> /// <summary>
/// Select paths to import from stable where all paths should be absolute. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>. /// Select paths to import from stable where all paths should be absolute. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
/// </summary> /// </summary>
protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath) protected virtual IEnumerable<string> GetStableImportPaths(Storage storage) => storage.GetDirectories(ImportFromStablePath)
.Select(path => stableStorage.GetFullPath(path)); .Select(path => storage.GetFullPath(path));
/// <summary> /// <summary>
/// Whether this specified path should be removed after successful import. /// Whether this specified path should be removed after successful import.
@ -660,24 +655,33 @@ namespace osu.Game.Database
/// </summary> /// </summary>
public Task ImportFromStableAsync() 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); Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
return Task.CompletedTask; 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 // 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); Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
return Task.CompletedTask; 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 #endregion
/// <summary> /// <summary>

7
osu.Game/Scoring/ScoreManager.cs
View File

@ -16,7 +16,6 @@ using osu.Framework.Platform;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.IO;
using osu.Game.IO.Archives; using osu.Game.IO.Archives;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
@ -72,9 +71,9 @@ namespace osu.Game.Scoring
} }
} }
protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) protected override IEnumerable<string> GetStableImportPaths(Storage storage)
=> stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false)) => storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
.Select(path => stableStorage.GetFullPath(path)); .Select(path => storage.GetFullPath(path));
public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store); public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);