From dfaa9531f8f4fc6470a5a4bb60bea87fc44eed76 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Oct 2019 18:48:50 +0900
Subject: [PATCH 1/2] Only lock the database for the duration of a deletion
---
osu.Game/Database/ArchiveModelManager.cs | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 17d1bd822e..2cc1e016d1 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -400,20 +400,17 @@ namespace osu.Game.Database
int i = 0;
- using (ContextFactory.GetForWrite())
+ foreach (var b in items)
{
- foreach (var b in items)
- {
- if (notification.State == ProgressNotificationState.Cancelled)
- // user requested abort
- return;
+ if (notification.State == ProgressNotificationState.Cancelled)
+ // user requested abort
+ return;
- notification.Text = $"Deleting {HumanisedModelName}s ({++i} of {items.Count})";
+ notification.Text = $"Deleting {HumanisedModelName}s ({++i} of {items.Count})";
- Delete(b);
+ Delete(b);
- notification.Progress = (float)i / items.Count;
- }
+ notification.Progress = (float)i / items.Count;
}
notification.State = ProgressNotificationState.Completed;
From f8eb07b21116e9ae3f01eba30cd626e50f097a32 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 3 Oct 2019 11:23:21 +0900
Subject: [PATCH 2/2] Only lock database for the duration of a model
restoration
---
osu.Game/Database/ArchiveModelManager.cs | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 2cc1e016d1..b567f0c0e3 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -436,20 +436,17 @@ namespace osu.Game.Database
int i = 0;
- using (ContextFactory.GetForWrite())
+ foreach (var item in items)
{
- foreach (var item in items)
- {
- if (notification.State == ProgressNotificationState.Cancelled)
- // user requested abort
- return;
+ if (notification.State == ProgressNotificationState.Cancelled)
+ // user requested abort
+ return;
- notification.Text = $"Restoring ({++i} of {items.Count})";
+ notification.Text = $"Restoring ({++i} of {items.Count})";
- Undelete(item);
+ Undelete(item);
- notification.Progress = (float)i / items.Count;
- }
+ notification.Progress = (float)i / items.Count;
}
notification.State = ProgressNotificationState.Completed;