From 20b49bea4b516180bfcddfd40cbc57635c38c84a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 01:49:03 +0300
Subject: [PATCH] Refactor SearchBeatmapSetsRequest

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 43 +++++++++++--------
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 16 +++----
 osu.Game/Overlays/DirectOverlay.cs            | 10 ++---
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 58a41b6e08..aef0788b49 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -12,24 +12,31 @@ namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
+        public BeatmapSearchCategory SearchCategory { get; set; }
+
+        public DirectSortCriteria SortCriteria { get; set; }
+
+        public SortDirection SortDirection { get; set; }
+
+        public BeatmapSearchGenre Genre { get; set; }
+
+        public BeatmapSearchLanguage Language { get; set; }
+
         private readonly string query;
         private readonly RulesetInfo ruleset;
-        private readonly BeatmapSearchCategory searchCategory;
-        private readonly DirectSortCriteria sortCriteria;
-        private readonly SortDirection direction;
-        private readonly BeatmapSearchGenre genre;
-        private readonly BeatmapSearchLanguage language;
-        private string directionString => direction == SortDirection.Descending ? @"desc" : @"asc";
 
-        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset, BeatmapSearchCategory searchCategory = BeatmapSearchCategory.Any, DirectSortCriteria sortCriteria = DirectSortCriteria.Ranked, SortDirection direction = SortDirection.Descending, BeatmapSearchGenre genre = BeatmapSearchGenre.Any, BeatmapSearchLanguage language = BeatmapSearchLanguage.Any)
+        private string directionString => SortDirection == SortDirection.Descending ? @"desc" : @"asc";
+
+        public SearchBeatmapSetsRequest(string query, RulesetInfo ruleset)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
-            this.searchCategory = searchCategory;
-            this.sortCriteria = sortCriteria;
-            this.direction = direction;
-            this.genre = genre;
-            this.language = language;
+
+            SearchCategory = BeatmapSearchCategory.Any;
+            SortCriteria = DirectSortCriteria.Ranked;
+            SortDirection = SortDirection.Descending;
+            Genre = BeatmapSearchGenre.Any;
+            Language = BeatmapSearchLanguage.Any;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -40,15 +47,15 @@ namespace osu.Game.Online.API.Requests
             if (ruleset.ID.HasValue)
                 req.AddParameter("m", ruleset.ID.Value.ToString());
 
-            req.AddParameter("s", searchCategory.ToString().ToLowerInvariant());
+            req.AddParameter("s", SearchCategory.ToString().ToLowerInvariant());
 
-            if (genre != BeatmapSearchGenre.Any)
-                req.AddParameter("g", ((int)genre).ToString());
+            if (Genre != BeatmapSearchGenre.Any)
+                req.AddParameter("g", ((int)Genre).ToString());
 
-            if (language != BeatmapSearchLanguage.Any)
-                req.AddParameter("l", ((int)language).ToString());
+            if (Language != BeatmapSearchLanguage.Any)
+                req.AddParameter("l", ((int)Language).ToString());
 
-            req.AddParameter("sort", $"{sortCriteria.ToString().ToLowerInvariant()}_{directionString}");
+            req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
             return req;
         }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 414dabd7c1..5b7466df0d 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -233,14 +233,14 @@ namespace osu.Game.Overlays
 
             currentContent?.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
 
-            getSetsRequest = new SearchBeatmapSetsRequest(
-                searchSection.Query.Value,
-                searchSection.Ruleset.Value,
-                searchSection.Category.Value,
-                sortControl.Current.Value,
-                sortControl.SortDirection.Value,
-                searchSection.Genre.Value,
-                searchSection.Language.Value);
+            getSetsRequest = new SearchBeatmapSetsRequest(searchSection.Query.Value, searchSection.Ruleset.Value)
+            {
+                SearchCategory = searchSection.Category.Value,
+                SortCriteria = sortControl.Current.Value,
+                SortDirection = sortControl.SortDirection.Value,
+                Genre = searchSection.Genre.Value,
+                Language = searchSection.Language.Value,
+            };
 
             getSetsRequest.Success += response => Schedule(() => recreatePanels(response));
 
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index a6f8b65a0d..0620e687e5 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -254,11 +254,11 @@ namespace osu.Game.Overlays
 
             previewTrackManager.StopAnyPlaying(this);
 
-            getSetsRequest = new SearchBeatmapSetsRequest(
-                currentQuery.Value,
-                ((FilterControl)Filter).Ruleset.Value,
-                Filter.DisplayStyleControl.Dropdown.Current.Value,
-                Filter.Tabs.Current.Value); //todo: sort direction (?)
+            getSetsRequest = new SearchBeatmapSetsRequest(currentQuery.Value, ((FilterControl)Filter).Ruleset.Value)
+            {
+                SearchCategory = Filter.DisplayStyleControl.Dropdown.Current.Value,
+                SortCriteria = Filter.Tabs.Current.Value
+            };
 
             getSetsRequest.Success += response =>
             {