From dc73856f76fe71404aeb512ae4233be00309185b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Aug 2024 20:45:57 +0900
Subject: [PATCH] Fix original date not being restored when no changes are made
on an import-as-update operation
---
osu.Game/Beatmaps/BeatmapImporter.cs | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 71aa5b0333..8acaebd1a8 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Beatmaps
public override async Task<Live<BeatmapSetInfo>?> ImportAsUpdate(ProgressNotification notification, ImportTask importTask, BeatmapSetInfo original)
{
+ var originalDateAdded = original.DateAdded;
+
Guid originalId = original.ID;
var imported = await Import(notification, new[] { importTask }).ConfigureAwait(false);
@@ -57,8 +59,11 @@ namespace osu.Game.Beatmaps
// If there were no changes, ensure we don't accidentally nuke ourselves.
if (first.ID == originalId)
{
- first.PerformRead(s =>
+ first.PerformWrite(s =>
{
+ // Transfer local values which should be persisted across a beatmap update.
+ s.DateAdded = originalDateAdded;
+
// Re-run processing even in this case. We might have outdated metadata.
ProcessBeatmap?.Invoke(s, MetadataLookupScope.OnlineFirst);
});
@@ -79,7 +84,7 @@ namespace osu.Game.Beatmaps
original.DeletePending = true;
// Transfer local values which should be persisted across a beatmap update.
- updated.DateAdded = original.DateAdded;
+ updated.DateAdded = originalDateAdded;
transferCollectionReferences(realm, original, updated);
@@ -278,6 +283,9 @@ namespace osu.Game.Beatmaps
protected override void UndeleteForReuse(BeatmapSetInfo existing)
{
+ if (!existing.DeletePending)
+ return;
+
base.UndeleteForReuse(existing);
existing.DateAdded = DateTimeOffset.UtcNow;
}