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

Prefer using the backup file if it exists

Browse Source
This commit is contained in:
smoogipoo 2021-06-23 15:09:42 +09:00
parent c9a203cc11
commit 5828606c13
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ namespace osu.Game.Collections
private const int database_version = 30000000; private const int database_version = 30000000;
private const string database_name = "collection.db"; private const string database_name = "collection.db";
private const string database_backup_name = "collection.db.bak";
public readonly BindableList<BeatmapCollection> Collections = new BindableList<BeatmapCollection>(); public readonly BindableList<BeatmapCollection> Collections = new BindableList<BeatmapCollection>();
@ -56,11 +57,14 @@ namespace osu.Game.Collections
{ {
Collections.CollectionChanged += collectionsChanged; Collections.CollectionChanged += collectionsChanged;
if (storage.Exists(database_name)) // If a backup file exists, it means the previous write operation didn't complete successfully. Always prefer the backup file in such a case.
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(database_name)) using (var stream = storage.GetStream(filename))
beatmapCollections = readCollections(stream); beatmapCollections = readCollections(stream);
// intentionally fire-and-forget async. // intentionally fire-and-forget async.
@ -286,13 +290,21 @@ namespace osu.Game.Collections
using (var fs = File.OpenWrite(tempPath)) using (var fs = File.OpenWrite(tempPath))
ms.WriteTo(fs); ms.WriteTo(fs);
var storagePath = storage.GetFullPath(database_name); var databasePath = storage.GetFullPath(database_name);
var storageBackupPath = storage.GetFullPath($"{database_name}.bak"); var databaseBackupPath = storage.GetFullPath(database_backup_name);
if (File.Exists(storageBackupPath))
File.Delete(storageBackupPath); // Back up the existing database, clearing any existing backup.
if (File.Exists(storagePath)) if (File.Exists(databaseBackupPath))
File.Move(storagePath, storageBackupPath); File.Delete(databaseBackupPath);
File.Move(tempPath, storagePath); if (File.Exists(databasePath))
File.Move(databasePath, databaseBackupPath);
// Move the new database in-place of the existing one.
File.Move(tempPath, databasePath);
// If everything succeeded up to this point, remove the backup file.
if (File.Exists(databaseBackupPath))
File.Delete(databaseBackupPath);
} }
if (saveFailures < 10) if (saveFailures < 10)