sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use StableStorage in ArchiveModelManager.

Browse Source
This commit is contained in:
Lucas A
2021-01-24 19:46:10 +01:00
parent 9a5790cd31
commit d71ac83428
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop/OsuGameDesktop.cs
View File

@ -33,7 +33,7 @@ namespace osu.Desktop
noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false; noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
} }
public override Storage GetStorageForStableInstall() public override StableStorage GetStorageForStableInstall()
{ {
try try
{ {

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

@ -625,7 +625,7 @@ namespace osu.Game.Database
/// <summary> /// <summary>
/// Set a storage with access to an osu-stable install for import purposes. /// Set a storage with access to an osu-stable install for import purposes.
/// </summary> /// </summary>
public Func<Storage> GetStableStorage { private get; set; } public Func<StableStorage> GetStableStorage { private get; set; }
/// <summary> /// <summary>
/// Denotes whether an osu-stable installation is present to perform automated imports from. /// Denotes whether an osu-stable installation is present to perform automated imports from.
@ -640,7 +640,7 @@ namespace osu.Game.Database
/// <summary> /// <summary>
/// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>. /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
/// </summary> /// </summary>
protected virtual IEnumerable<string> GetStableImportPaths(Storage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath); protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath);
/// <summary> /// <summary>
/// Whether this specified path should be removed after successful import. /// Whether this specified path should be removed after successful import.

3
osu.Game/OsuGame.cs
View File

@ -52,6 +52,7 @@ using osu.Game.Updater;
using osu.Game.Utils; using osu.Game.Utils;
using LogLevel = osu.Framework.Logging.LogLevel; using LogLevel = osu.Framework.Logging.LogLevel;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.IO;
namespace osu.Game namespace osu.Game
{ {
@ -88,7 +89,7 @@ namespace osu.Game
protected SentryLogger SentryLogger; protected SentryLogger SentryLogger;
public virtual Storage GetStorageForStableInstall() => null; public virtual StableStorage GetStorageForStableInstall() => null;
public float ToolbarOffset => (Toolbar?.Position.Y ?? 0) + (Toolbar?.DrawHeight ?? 0); public float ToolbarOffset => (Toolbar?.Position.Y ?? 0) + (Toolbar?.DrawHeight ?? 0);

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

@ -16,6 +16,7 @@ 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;
@ -71,7 +72,7 @@ namespace osu.Game.Scoring
} }
} }
protected override IEnumerable<string> GetStableImportPaths(Storage stableStorage) protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
=> stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false)); => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false));
public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store); public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);