sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add migration of existing collections database

Browse Source
This commit is contained in:
Dean Herbert
2022-07-27 23:19:00 +09:00
parent 34a2d1a6e1
commit 1669208a54
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Database/LegacyCollectionImporter.cs
View File

@ -7,8 +7,8 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Game.Collections;
using osu.Game.IO;
using osu.Game.IO.Legacy;
using osu.Game.Overlays.Notifications;
@ -27,14 +27,14 @@ namespace osu.Game.Database
this.realm = realm;
}
public Task<int> GetAvailableCount(StableStorage stableStorage)
public Task<int> GetAvailableCount(Storage storage)
{
if (!stableStorage.Exists(database_name))
if (!storage.Exists(database_name))
return Task.FromResult(0);
return Task.Run(() =>
{
using (var stream = stableStorage.GetStream(database_name))
using (var stream = storage.GetStream(database_name))
return readCollections(stream).Count;
});
}
@ -42,9 +42,9 @@ namespace osu.Game.Database
/// <summary>
/// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
/// </summary>
public Task ImportFromStableAsync(StableStorage stableStorage)
public Task ImportFromStorage(Storage storage)
{
if (!stableStorage.Exists(database_name))
if (!storage.Exists(database_name))
{
// This handles situations like when the user does not have a collections.db file
Logger.Log($"No {database_name} available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
@ -53,7 +53,7 @@ namespace osu.Game.Database
return Task.Run(async () =>
{
using (var stream = stableStorage.GetStream(database_name))
using (var stream = storage.GetStream(database_name))
await Import(stream).ConfigureAwait(false);
});
}