Merge branch 'master' of https://github.com/ppy/osu into carousel-perform-selection

 Conflicts:

	osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs

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

@@ -129,12 +129,13 @@ namespace osu.Game.Screens.Select.Carousel
         public override void Filter(FilterCriteria criteria)
         {
             base.Filter(criteria);
-            bool match = Items.All(i => i.Filtered.Value);
 
-            match &= criteria.Sort != SortMode.DateRanked || BeatmapSet?.DateRanked != null;
-            match &= criteria.Sort != SortMode.DateSubmitted || BeatmapSet?.DateSubmitted != null;
+            bool filtered = Items.All(i => i.Filtered.Value);
 
-            Filtered.Value = match;
+            filtered |= criteria.Sort == SortMode.DateRanked && BeatmapSet?.DateRanked == null;
+            filtered |= criteria.Sort == SortMode.DateSubmitted && BeatmapSet?.DateSubmitted == null;
+
+            Filtered.Value = filtered;
         }
 
         public override string ToString() => BeatmapSet.ToString();

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

@@ -1,13 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Models;
@@ -20,27 +19,39 @@ using Realms;
 
 namespace osu.Game.Screens.Select.Carousel
 {
-    public class TopLocalRank : UpdateableRank
+    public class TopLocalRank : CompositeDrawable
     {
         private readonly BeatmapInfo beatmapInfo;
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
         [Resolved]
-        private RealmAccess realm { get; set; }
+        private RealmAccess realm { get; set; } = null!;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private ScoreManager scoreManager { get; set; } = null!;
 
-        private IDisposable scoreSubscription;
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private IDisposable? scoreSubscription;
+
+        private readonly UpdateableRank updateable;
+
+        public ScoreRank? DisplayedRank => updateable.Rank;
 
         public TopLocalRank(BeatmapInfo beatmapInfo)
-            : base(null)
         {
             this.beatmapInfo = beatmapInfo;
 
-            Size = new Vector2(40, 20);
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = updateable = new UpdateableRank
+            {
+                Size = new Vector2(40, 20),
+                Alpha = 0,
+            };
         }
 
         protected override void LoadComplete()
@@ -55,23 +66,27 @@ namespace osu.Game.Screens.Select.Carousel
                          .Filter($"{nameof(ScoreInfo.User)}.{nameof(RealmUser.OnlineID)} == $0"
                                  + $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $1"
                                  + $" && {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $2"
-                                 + $" && {nameof(ScoreInfo.DeletePending)} == false", api.LocalUser.Value.Id, beatmapInfo.ID, ruleset.Value.ShortName)
-                         .OrderByDescending(s => s.TotalScore),
-                    (items, _, _) =>
-                    {
-                        Rank = items.FirstOrDefault()?.Rank;
-                        // Required since presence is changed via IsPresent override
-                        Invalidate(Invalidation.Presence);
-                    });
+                                 + $" && {nameof(ScoreInfo.DeletePending)} == false", api.LocalUser.Value.Id, beatmapInfo.ID, ruleset.Value.ShortName),
+                    localScoresChanged);
             }, true);
-        }
 
-        public override bool IsPresent => base.IsPresent && Rank != null;
+            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes, Exception _)
+            {
+                // This subscription may fire from changes to linked beatmaps, which we don't care about.
+                // It's currently not possible for a score to be modified after insertion, so we can safely ignore callbacks with only modifications.
+                if (changes?.HasCollectionChanges() == false)
+                    return;
+
+                ScoreInfo? topScore = scoreManager.OrderByTotalScore(sender.Detach()).FirstOrDefault();
+
+                updateable.Rank = topScore?.Rank;
+                updateable.Alpha = topScore != null ? 1 : 0;
+            }
+        }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-
             scoreSubscription?.Dispose();
         }
     }

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

@@ -2,15 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
@@ -22,6 +26,18 @@ namespace osu.Game.Screens.Select.Carousel
         private SpriteIcon icon = null!;
         private Box progressFill = null!;
 
+        [Resolved]
+        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved]
+        private LoginOverlay? loginOverlay { get; set; }
+
+        [Resolved]
+        private IDialogOverlay? dialogOverlay { get; set; }
+
         public UpdateBeatmapSetButton(BeatmapSetInfo beatmapSetInfo)
         {
             this.beatmapSetInfo = beatmapSetInfo;
@@ -32,14 +48,15 @@ namespace osu.Game.Screens.Select.Carousel
             Origin = Anchor.CentreLeft;
         }
 
-        [Resolved]
-        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
+        private Bindable<bool> preferNoVideo = null!;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager config)
         {
             const float icon_size = 14;
 
+            preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
+
             Content.Anchor = Anchor.CentreLeft;
             Content.Origin = Anchor.CentreLeft;
 
@@ -88,11 +105,34 @@ namespace osu.Game.Screens.Select.Carousel
                 },
             });
 
-            Action = () =>
+            Action = updateBeatmap;
+        }
+
+        private bool updateConfirmed;
+
+        private void updateBeatmap()
+        {
+            if (!api.IsLoggedIn)
             {
-                beatmapDownloader.DownloadAsUpdate(beatmapSetInfo);
-                attachExistingDownload();
-            };
+                loginOverlay?.Show();
+                return;
+            }
+
+            if (dialogOverlay != null && beatmapSetInfo.Status == BeatmapOnlineStatus.LocallyModified && !updateConfirmed)
+            {
+                dialogOverlay.Push(new UpdateLocalConfirmationDialog(() =>
+                {
+                    updateConfirmed = true;
+                    updateBeatmap();
+                }));
+
+                return;
+            }
+
+            updateConfirmed = false;
+
+            beatmapDownloader.DownloadAsUpdate(beatmapSetInfo, preferNoVideo.Value);
+            attachExistingDownload();
         }
 
         protected override void LoadComplete()

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

@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+using osu.Game.Localisation;
+
+namespace osu.Game.Screens.Select.Carousel
+{
+    public class UpdateLocalConfirmationDialog : DeleteConfirmationDialog
+    {
+        public UpdateLocalConfirmationDialog(Action onConfirm)
+        {
+            HeaderText = PopupDialogStrings.UpdateLocallyModifiedText;
+            BodyText = PopupDialogStrings.UpdateLocallyModifiedDescription;
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+            DeleteAction = onConfirm;
+        }
+    }
+}