From a16bf35581551befae89f3db8db66b6854b6811e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Jul 2022 18:16:30 +0900
Subject: [PATCH] Rename button class and add basic progress display

---
 .../Select/Carousel/SetPanelContent.cs        |  2 +-
 ...uiredIcon.cs => UpdateBeatmapSetButton.cs} | 38 +++++++++++++++++--
 2 files changed, 35 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/Select/Carousel/{UpdateRequiredIcon.cs => UpdateBeatmapSetButton.cs} (73%)

diff --git a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
index 8b921fe400..a95d9078a2 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Select.Carousel
                                     RelativeSizeAxes = Axes.Y,
                                     Children = new Drawable[]
                                     {
-                                        new UpdateRequiredIcon(beatmapSet),
+                                        new UpdateBeatmapSetButton(beatmapSet),
                                     }
                                 },
                             new BeatmapSetOnlineStatusPill
diff --git a/osu.Game/Screens/Select/Carousel/UpdateRequiredIcon.cs b/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
similarity index 73%
rename from osu.Game/Screens/Select/Carousel/UpdateRequiredIcon.cs
rename to osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
index 42539f2836..a11a29a5c6 100644
--- a/osu.Game/Screens/Select/Carousel/UpdateRequiredIcon.cs
+++ b/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
@@ -5,6 +5,7 @@
 using osu.Framework.Allocation;
 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;
@@ -12,15 +13,18 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Select.Carousel
 {
-    public class UpdateRequiredIcon : OsuAnimatedButton
+    public class UpdateBeatmapSetButton : OsuAnimatedButton
     {
         private readonly BeatmapSetInfo beatmapSetInfo;
         private SpriteIcon icon;
 
-        public UpdateRequiredIcon(BeatmapSetInfo beatmapSetInfo)
+        private Box progressFill;
+
+        public UpdateBeatmapSetButton(BeatmapSetInfo beatmapSetInfo)
         {
             this.beatmapSetInfo = beatmapSetInfo;
 
@@ -31,7 +35,7 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         [Resolved]
-        private BeatmapModelDownloader beatmaps { get; set; } = null!;
+        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -43,6 +47,14 @@ namespace osu.Game.Screens.Select.Carousel
 
             Content.AddRange(new Drawable[]
             {
+                progressFill = new Box
+                {
+                    Colour = Color4.White,
+                    Alpha = 0.2f,
+                    Blending = BlendingParameters.Additive,
+                    RelativeSizeAxes = Axes.Both,
+                    Width = 0,
+                },
                 new FillFlowContainer
                 {
                     Padding = new MarginPadding { Horizontal = 5, Vertical = 3 },
@@ -80,7 +92,12 @@ namespace osu.Game.Screens.Select.Carousel
 
             TooltipText = "Update beatmap with online changes";
 
-            Action = () => beatmaps.Download(beatmapSetInfo);
+            Action = () =>
+            {
+                beatmapDownloader.Download(beatmapSetInfo);
+
+                attachExistingDownload();
+            };
         }
 
         protected override void LoadComplete()
@@ -90,6 +107,19 @@ namespace osu.Game.Screens.Select.Carousel
             icon.Spin(4000, RotationDirection.Clockwise);
         }
 
+        private void attachExistingDownload()
+        {
+            var download = beatmapDownloader.GetExistingDownload(beatmapSetInfo);
+
+            if (download != null)
+            {
+                Enabled.Value = false;
+                TooltipText = string.Empty;
+
+                download.DownloadProgressed += progress => progressFill.ResizeWidthTo(progress, 100);
+            }
+        }
+
         protected override bool OnHover(HoverEvent e)
         {
             icon.Spin(400, RotationDirection.Clockwise);