Merge branch 'master' into carousel-performance-n

osu.Game/Database/EFToRealmMigrator.cs

@@ -26,8 +26,6 @@ namespace osu.Game.Database
         private readonly OsuConfigManager config;
         private readonly Storage storage;
 
-        private bool hasTakenBackup;
-
         public EFToRealmMigrator(DatabaseContextFactory efContextFactory, RealmContextFactory realmContextFactory, OsuConfigManager config, Storage storage)
         {
             this.efContextFactory = efContextFactory;
@@ -38,6 +36,8 @@ namespace osu.Game.Database
 
         public void Run()
         {
+            createBackup();
+
             using (var ef = efContextFactory.Get())
             {
                 migrateSettings(ef);
@@ -77,8 +77,6 @@ namespace osu.Game.Database
             {
                 Logger.Log($"Found {count} beatmaps in EF", LoggingTarget.Database);
 
-                ensureBackup();
-
                 // only migrate data if the realm database is empty.
                 // note that this cannot be written as: `realm.All<BeatmapSetInfo>().All(s => s.Protected)`, because realm does not support `.All()`.
                 if (realm.All<BeatmapSetInfo>().Any(s => !s.Protected))
@@ -210,8 +208,6 @@ namespace osu.Game.Database
             {
                 Logger.Log($"Found {count} scores in EF", LoggingTarget.Database);
 
-                ensureBackup();
-
                 // only migrate data if the realm database is empty.
                 if (realm.All<ScoreInfo>().Any())
                 {
@@ -291,8 +287,6 @@ namespace osu.Game.Database
             if (!existingSkins.Any())
                 return;
 
-            ensureBackup();
-
             var userSkinChoice = config.GetBindable<string>(OsuSetting.Skin);
             int.TryParse(userSkinChoice.Value, out int userSkinInt);
 
@@ -363,7 +357,6 @@ namespace osu.Game.Database
                 return;
 
             Logger.Log("Beginning settings migration to realm", LoggingTarget.Database);
-            ensureBackup();
 
             using (var realm = realmContextFactory.CreateContext())
             using (var transaction = realm.BeginWrite())
@@ -400,21 +393,16 @@ namespace osu.Game.Database
         private string? getRulesetShortNameFromLegacyID(long rulesetId) =>
             efContextFactory.Get().RulesetInfo.FirstOrDefault(r => r.ID == rulesetId)?.ShortName;
 
-        private void ensureBackup()
+        private void createBackup()
         {
-            if (!hasTakenBackup)
-            {
-                string migration = $"before_final_migration_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
+            string migration = $"before_final_migration_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
 
-                efContextFactory.CreateBackup($"client.{migration}.db");
-                realmContextFactory.CreateBackup($"client.{migration}.realm");
+            efContextFactory.CreateBackup($"client.{migration}.db");
+            realmContextFactory.CreateBackup($"client.{migration}.realm");
 
-                using (var source = storage.GetStream("collection.db"))
-                using (var destination = storage.GetStream($"collection.{migration}.db", FileAccess.Write, FileMode.CreateNew))
-                    source.CopyTo(destination);
-
-                hasTakenBackup = true;
-            }
+            using (var source = storage.GetStream("collection.db"))
+            using (var destination = storage.GetStream($"collection.{migration}.db", FileAccess.Write, FileMode.CreateNew))
+                source.CopyTo(destination);
         }
     }
 }

osu.Game/Database/RealmContextFactory.cs

@@ -367,9 +367,24 @@ namespace osu.Game.Database
             using (BlockAllOperations())
             {
                 Logger.Log($"Creating full realm database backup at {backupFilename}", LoggingTarget.Database);
-                using (var source = storage.GetStream(Filename))
-                using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
-                    source.CopyTo(destination);
+
+                int attempts = 10;
+
+                while (attempts-- > 0)
+                {
+                    try
+                    {
+                        using (var source = storage.GetStream(Filename))
+                        using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
+                            source.CopyTo(destination);
+                        return;
+                    }
+                    catch (IOException)
+                    {
+                        // file may be locked during use.
+                        Thread.Sleep(500);
+                    }
+                }
             }
         }
 

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -305,17 +305,20 @@ namespace osu.Game.Screens.Select
             {
                 root.AddChild(newSet);
 
-                // only reset scroll position if already near the scroll target.
-                // without this, during a large beatmap import it is impossible to navigate the carousel.
-                applyActiveCriteria(false, alwaysResetScrollPosition: false);
-
                 // check if we can/need to maintain our current selection.
                 if (previouslySelectedID != null)
                     select((CarouselItem)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
             }
 
             itemsCache.Invalidate();
-            Schedule(() => BeatmapSetsChanged?.Invoke());
+
+            Schedule(() =>
+            {
+                if (!Scroll.UserScrolling)
+                    ScrollToSelected(true);
+
+                BeatmapSetsChanged?.Invoke();
+            });
         });
 
         /// <summary>

osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
 
-            if (match)
+            if (match && criteria.SearchTerms.Length > 0)
             {
                 string[] terms = BeatmapInfo.GetSearchableTerms();
 

osu.Game/Screens/Select/Carousel/CarouselGroup.cs

@@ -4,6 +4,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
+#nullable enable
+
 namespace osu.Game.Screens.Select.Carousel
 {
     /// <summary>
@@ -11,7 +13,7 @@ namespace osu.Game.Screens.Select.Carousel
     /// </summary>
     public class CarouselGroup : CarouselItem
     {
-        public override DrawableCarouselItem CreateDrawableRepresentation() => null;
+        public override DrawableCarouselItem? CreateDrawableRepresentation() => null;
 
         public IReadOnlyList<CarouselItem> Children => InternalChildren;
 
@@ -23,6 +25,10 @@ namespace osu.Game.Screens.Select.Carousel
         /// </summary>
         private ulong currentChildID;
 
+        private Comparer<CarouselItem>? criteriaComparer;
+
+        private FilterCriteria? lastCriteria;
+
         public virtual void RemoveChild(CarouselItem i)
         {
             InternalChildren.Remove(i);
@@ -36,10 +42,24 @@ namespace osu.Game.Screens.Select.Carousel
         {
             i.State.ValueChanged += state => ChildItemStateChanged(i, state.NewValue);
             i.ChildID = ++currentChildID;
-            InternalChildren.Add(i);
+
+            if (lastCriteria != null)
+            {
+                i.Filter(lastCriteria);
+
+                int index = InternalChildren.BinarySearch(i, criteriaComparer);
+                if (index < 0) index = ~index; // BinarySearch hacks multiple return values with 2's complement.
+
+                InternalChildren.Insert(index, i);
+            }
+            else
+            {
+                // criteria may be null for initial population. the filtering will be applied post-add.
+                InternalChildren.Add(i);
+            }
         }
 
-        public CarouselGroup(List<CarouselItem> items = null)
+        public CarouselGroup(List<CarouselItem>? items = null)
         {
             if (items != null) InternalChildren = items;
 
@@ -67,9 +87,12 @@ namespace osu.Game.Screens.Select.Carousel
             base.Filter(criteria);
 
             InternalChildren.ForEach(c => c.Filter(criteria));
+
             // IEnumerable<T>.OrderBy() is used instead of List<T>.Sort() to ensure sorting stability
-            var criteriaComparer = Comparer<CarouselItem>.Create((x, y) => x.CompareTo(criteria, y));
+            criteriaComparer = Comparer<CarouselItem>.Create((x, y) => x.CompareTo(criteria, y));
             InternalChildren = InternalChildren.OrderBy(c => c, criteriaComparer).ToList();
+
+            lastCriteria = criteria;
         }
 
         protected virtual void ChildItemStateChanged(CarouselItem item, CarouselItemState value)