sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-05 21:57:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

Safeguard load procedure a bit more

Browse Source
This commit is contained in:
smoogipoo 2021-06-23 16:14:05 +09:00
parent 0510282dcb
commit e7981eae9b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Collections/CollectionManager.cs
View File

@ -55,16 +55,26 @@ namespace osu.Game.Collections
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
if (storage.Exists(database_backup_name))
{
// If a backup file exists, it means the previous write operation didn't run to completion.
// Always prefer the backup file in such a case as it's the most recent copy that is guaranteed to not be malformed.
//
// The database is saved 100ms after any change, and again when the game is closed, so there shouldn't be a large diff between the two files in the worst case.
if (storage.Exists(database_name))
storage.Delete(database_name);
File.Copy(storage.GetFullPath(database_backup_name), storage.GetFullPath(database_name));
}
// Only accept changes after/if the above succeeds to prevent simultaneously accessing either file.
// Todo: This really should not be delayed like this, but is unlikely to cause issues because CollectionManager loads very early in execution.
Collections.CollectionChanged += collectionsChanged; Collections.CollectionChanged += collectionsChanged;
// If a backup file exists, it means the previous write operation didn't complete successfully. Always prefer the backup file in such a case. if (storage.Exists(database_name))
string filename = storage.Exists(database_backup_name) ? database_backup_name : database_name;
if (storage.Exists(filename))
{ {
List<BeatmapCollection> beatmapCollections; List<BeatmapCollection> beatmapCollections;
using (var stream = storage.GetStream(filename)) using (var stream = storage.GetStream(database_name))
beatmapCollections = readCollections(stream); beatmapCollections = readCollections(stream);
// intentionally fire-and-forget async. // intentionally fire-and-forget async.