From 2f2c498477f4038315fcbcd0029bbc013ace3a60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jan 2022 23:31:42 +0900
Subject: [PATCH] Fix importer not considering that some EF beatmaps have no
 local metadata

---
 osu.Game/Database/EFToRealmMigrator.cs | 44 +++++++++++++++-----------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Database/EFToRealmMigrator.cs b/osu.Game/Database/EFToRealmMigrator.cs
index ad0f2c5982..7683accc5c 100644
--- a/osu.Game/Database/EFToRealmMigrator.cs
+++ b/osu.Game/Database/EFToRealmMigrator.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Database
                                         .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata)
                                         .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
                                         .Include(s => s.Files).ThenInclude(f => f.FileInfo)
+                                        .Include(s => s.Metadata)
                                         .ToList();
 
             // previous entries in EF are removed post migration.
@@ -105,24 +106,7 @@ namespace osu.Game.Database
                                 Bookmarks = beatmap.Bookmarks,
                                 Ruleset = realm.Find<RulesetInfo>(beatmap.RulesetInfo.ShortName),
                                 Difficulty = new BeatmapDifficulty(beatmap.BaseDifficulty),
-                                Metadata = new BeatmapMetadata
-                                {
-                                    Title = beatmap.Metadata.Title,
-                                    TitleUnicode = beatmap.Metadata.TitleUnicode,
-                                    Artist = beatmap.Metadata.Artist,
-                                    ArtistUnicode = beatmap.Metadata.ArtistUnicode,
-                                    Author = new RealmUser
-                                    {
-                                        OnlineID = beatmap.Metadata.Author.Id,
-                                        Username = beatmap.Metadata.Author.Username,
-                                    },
-                                    Source = beatmap.Metadata.Source,
-                                    Tags = beatmap.Metadata.Tags,
-                                    PreviewTime = beatmap.Metadata.PreviewTime,
-                                    AudioFile = beatmap.Metadata.AudioFile,
-                                    BackgroundFile = beatmap.Metadata.BackgroundFile,
-                                    AuthorString = beatmap.Metadata.AuthorString,
-                                },
+                                Metadata = getBestMetadata(beatmap.Metadata, beatmapSet.Metadata),
                                 BeatmapSet = realmBeatmapSet,
                             };
 
@@ -140,6 +124,30 @@ namespace osu.Game.Database
             }
         }
 
+        private BeatmapMetadata getBestMetadata(EFBeatmapMetadata? beatmapMetadata, EFBeatmapMetadata? beatmapSetMetadata)
+        {
+            var metadata = beatmapMetadata ?? beatmapSetMetadata ?? new EFBeatmapMetadata();
+
+            return new BeatmapMetadata
+            {
+                Title = metadata.Title,
+                TitleUnicode = metadata.TitleUnicode,
+                Artist = metadata.Artist,
+                ArtistUnicode = metadata.ArtistUnicode,
+                Author = new RealmUser
+                {
+                    OnlineID = metadata.Author.Id,
+                    Username = metadata.Author.Username,
+                },
+                Source = metadata.Source,
+                Tags = metadata.Tags,
+                PreviewTime = metadata.PreviewTime,
+                AudioFile = metadata.AudioFile,
+                BackgroundFile = metadata.BackgroundFile,
+                AuthorString = metadata.AuthorString,
+            };
+        }
+
         private void migrateScores(DatabaseWriteUsage db)
         {
             // can be removed 20220730.