Add initial beatmap submission support

osu.Game.Tests/Visual/Editing/TestSceneBeatmapSubmissionOverlay.cs

@@ -24,7 +24,11 @@ public void SetUpSteps()
                 Child = new DependencyProvidingContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    CachedDependencies = new[] { (typeof(ScreenFooter), (object)footer) },
+                    CachedDependencies = new[]
+                    {
+                        (typeof(ScreenFooter), (object)footer),
+                        (typeof(BeatmapSubmissionSettings), new BeatmapSubmissionSettings()),
+                    },
                     Children = new Drawable[]
                     {
                         receptor,

osu.Game/Database/LegacyBeatmapExporter.cs

@@ -61,6 +61,20 @@ public LegacyBeatmapExporter(Storage storage)
                 Configuration = new LegacySkinDecoder().Decode(skinStreamReader)
             };
 
+            MutateBeatmap(model, playableBeatmap);
+
+            // Encode to legacy format
+            var stream = new MemoryStream();
+            using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                new LegacyBeatmapEncoder(playableBeatmap, beatmapSkin).Encode(sw);
+
+            stream.Seek(0, SeekOrigin.Begin);
+
+            return stream;
+        }
+
+        protected virtual void MutateBeatmap(BeatmapSetInfo beatmapSet, IBeatmap playableBeatmap)
+        {
             // Convert beatmap elements to be compatible with legacy format
             // So we truncate time and position values to integers, and convert paths with multiple segments to Bézier curves
 
@@ -145,15 +159,6 @@ public LegacyBeatmapExporter(Storage storage)
                         hasPath.Path.ControlPoints.Add(new PathControlPoint(position));
                 }
             }
-
-            // Encode to legacy format
-            var stream = new MemoryStream();
-            using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                new LegacyBeatmapEncoder(playableBeatmap, beatmapSkin).Encode(sw);
-
-            stream.Seek(0, SeekOrigin.Begin);
-
-            return stream;
         }
 
         protected override string FileExtension => @".osz";

osu.Game/Localisation/BeatmapSubmissionStrings.cs

@@ -39,6 +39,31 @@ public static class BeatmapSubmissionStrings
         /// </summary>
         public static LocalisableString SubmissionSettings => new TranslatableString(getKey(@"submission_settings"), @"Submission settings");
 
+        /// <summary>
+        /// "Submit beatmap!"
+        /// </summary>
+        public static LocalisableString ConfirmSubmission => new TranslatableString(getKey(@"confirm_submission"), @"Submit beatmap!");
+
+        /// <summary>
+        /// "Exporting beatmap for compatibility..."
+        /// </summary>
+        public static LocalisableString Exporting => new TranslatableString(getKey(@"exporting"), @"Exporting beatmap for compatibility...");
+
+        /// <summary>
+        /// "Preparing for upload..."
+        /// </summary>
+        public static LocalisableString Preparing => new TranslatableString(getKey(@"preparing"), @"Preparing for upload...");
+
+        /// <summary>
+        /// "Uploading beatmap contents..."
+        /// </summary>
+        public static LocalisableString Uploading => new TranslatableString(getKey(@"uploading"), @"Uploading beatmap contents...");
+
+        /// <summary>
+        /// "Finishing up..."
+        /// </summary>
+        public static LocalisableString Finishing => new TranslatableString(getKey(@"finishing"), @"Finishing up...");
+
         /// <summary>
         /// "Before you continue, we ask you to check whether the content you are uploading has been cleared for upload. Please understand that you are responsible for the content you upload to the platform and if in doubt, should ask permission from the creators before uploading!"
         /// </summary>
@@ -115,9 +140,24 @@ public static class BeatmapSubmissionStrings
         public static LocalisableString LoadInBrowserAfterSubmission => new TranslatableString(getKey(@"load_in_browser_after_submission"), @"Load in browser after submission");
 
         /// <summary>
-        /// "Note: In order to make it possible for users of all osu! versions to enjoy your beatmap, it will be exported in a backwards-compatible format. While we have made efforts to ensure that that process keeps the beatmap playable in its intended form, some data related to features that previous versions of osu! do not support may be lost."
+        /// "Note: In order to make it possible for users of all osu! versions to enjoy your beatmap, it will be exported in a backwards-compatible format. While we have made efforts to ensure that process keeps the beatmap playable in its intended form, some data related to features that previous versions of osu! do not support may be lost."
+        /// </summary>
+        public static LocalisableString LegacyExportDisclaimer => new TranslatableString(getKey(@"legacy_export_disclaimer"), @"Note: In order to make it possible for users of all osu! versions to enjoy your beatmap, it will be exported in a backwards-compatible format. While we have made efforts to ensure that process keeps the beatmap playable in its intended form, some data related to features that previous versions of osu! do not support may be lost.");
+
+        /// <summary>
+        /// "Empty beatmaps cannot be submitted."
+        /// </summary>
+        public static LocalisableString EmptyBeatmapsCannotBeSubmitted => new TranslatableString(getKey(@"empty_beatmaps_cannot_be_submitted"), @"Empty beatmaps cannot be submitted.");
+
+        /// <summary>
+        /// "Update beatmap!"
+        /// </summary>
+        public static LocalisableString UpdateBeatmap => new TranslatableString(getKey(@"update_beatmap"), @"Update beatmap!");
+
+        /// <summary>
+        /// "Upload NEW beatmap!"
         /// </summary>
-        public static LocalisableString LegacyExportDisclaimer => new TranslatableString(getKey(@"legacy_export_disclaimer"), @"Note: In order to make it possible for users of all osu! versions to enjoy your beatmap, it will be exported in a backwards-compatible format. While we have made efforts to ensure that that process keeps the beatmap playable in its intended form, some data related to features that previous versions of osu! do not support may be lost.");
+        public static LocalisableString UploadNewBeatmap => new TranslatableString(getKey(@"upload_new_beatmap"), @"Upload NEW beatmap!");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }

osu.Game/Localisation/EditorStrings.cs

@@ -69,6 +69,16 @@ public static class EditorStrings
         /// </summary>
         public static LocalisableString DeleteDifficulty => new TranslatableString(getKey(@"delete_difficulty"), @"Delete difficulty");
 
+        /// <summary>
+        /// "Edit externally"
+        /// </summary>
+        public static LocalisableString EditExternally => new TranslatableString(getKey(@"edit_externally"), @"Edit externally");
+
+        /// <summary>
+        /// "Submit beatmap"
+        /// </summary>
+        public static LocalisableString SubmitBeatmap => new TranslatableString(getKey(@"submit_beatmap"), @"Submit beatmap");
+
         /// <summary>
         /// "setup"
         /// </summary>

osu.Game/Online/API/Requests/PatchBeatmapPackageRequest.cs

@@ -26,10 +26,8 @@ protected override string Uri
 
         public uint BeatmapSetID { get; }
 
-        // ReSharper disable once CollectionNeverUpdated.Global
         public Dictionary<string, byte[]> FilesChanged { get; } = new Dictionary<string, byte[]>();
 
-        // ReSharper disable once CollectionNeverUpdated.Global
         public HashSet<string> FilesDeleted { get; } = new HashSet<string>();
 
         public PatchBeatmapPackageRequest(uint beatmapSetId)
@@ -48,7 +46,7 @@ protected override WebRequest CreateWebRequest()
             foreach (string filename in FilesDeleted)
                 request.AddParameter(@"filesDeleted", filename, RequestParameterType.Form);
 
-            request.Timeout = 60_000;
+            request.Timeout = 600_000;
             return request;
         }
     }

osu.Game/Online/API/Requests/ReplaceBeatmapPackageRequest.cs

@@ -38,7 +38,7 @@ protected override WebRequest CreateWebRequest()
             var request = base.CreateWebRequest();
             request.AddFile(@"beatmapArchive", oszPackage);
             request.Method = HttpMethod.Put;
-            request.Timeout = 60_000;
+            request.Timeout = 600_000;
             return request;
         }
     }

osu.Game/Online/DevelopmentEndpointConfiguration.cs

@@ -13,6 +13,7 @@ public DevelopmentEndpointConfiguration()
             SpectatorUrl = $@"{APIUrl}/signalr/spectator";
             MultiplayerUrl = $@"{APIUrl}/signalr/multiplayer";
             MetadataUrl = $@"{APIUrl}/signalr/metadata";
+            BeatmapSubmissionServiceUrl = $@"{APIUrl}/beatmap-submission";
         }
     }
 }

osu.Game/Overlays/WizardOverlay.cs

@@ -45,6 +45,8 @@ public partial class WizardOverlay : ShearedOverlayContainer
         private LoadingSpinner loading = null!;
         private ScheduledDelegate? loadingShowDelegate;
 
+        public bool Completed { get; private set; }
+
         protected WizardOverlay(OverlayColourScheme scheme)
             : base(scheme)
         {
@@ -221,6 +223,7 @@ protected virtual void ShowNextStep()
             else
             {
                 CurrentStepIndex = null;
+                Completed = true;
                 Hide();
             }
 

osu.Game/Screens/Edit/Editor.cs

@@ -32,6 +32,7 @@
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.Extensions;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
@@ -52,6 +53,7 @@
 using osu.Game.Screens.Edit.Design;
 using osu.Game.Screens.Edit.GameplayTest;
 using osu.Game.Screens.Edit.Setup;
+using osu.Game.Screens.Edit.Submission;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Screens.Edit.Verify;
 using osu.Game.Screens.OnlinePlay;
@@ -111,6 +113,10 @@ protected bool HasUnsavedChanges
         [Resolved(canBeNull: true)]
         private INotificationOverlay notifications { get; set; }
 
+        [Resolved(canBeNull: true)]
+        [CanBeNull]
+        private LoginOverlay loginOverlay { get; set; }
+
         [Resolved]
         private RealmAccess realm { get; set; }
 
@@ -1251,11 +1257,22 @@ private IEnumerable<MenuItem> createFileMenuItems()
 
             if (RuntimeInfo.IsDesktop)
             {
-                var externalEdit = new EditorMenuItem("Edit externally", MenuItemType.Standard, editExternally);
+                var externalEdit = new EditorMenuItem(EditorStrings.EditExternally, MenuItemType.Standard, editExternally);
                 saveRelatedMenuItems.Add(externalEdit);
                 yield return externalEdit;
             }
 
+            bool isSetMadeOfLegacyRulesetBeatmaps = (isNewBeatmap && Ruleset.Value.IsLegacyRuleset())
+                                                    || (!isNewBeatmap && Beatmap.Value.BeatmapSetInfo.Beatmaps.All(b => b.Ruleset.IsLegacyRuleset()));
+            bool submissionAvailable = api.Endpoints.BeatmapSubmissionServiceUrl != null;
+
+            if (isSetMadeOfLegacyRulesetBeatmaps && submissionAvailable)
+            {
+                var upload = new EditorMenuItem(EditorStrings.SubmitBeatmap, MenuItemType.Standard, submitBeatmap);
+                saveRelatedMenuItems.Add(upload);
+                yield return upload;
+            }
+
             if (editorBeatmap.BeatmapInfo.OnlineID > 0)
             {
                 yield return new OsuMenuItemSpacer();
@@ -1304,6 +1321,42 @@ void startEdit()
             }
         }
 
+        private void submitBeatmap()
+        {
+            if (api.State.Value != APIState.Online)
+            {
+                loginOverlay?.Show();
+                return;
+            }
+
+            if (!editorBeatmap.HitObjects.Any())
+            {
+                notifications?.Post(new SimpleNotification
+                {
+                    Text = BeatmapSubmissionStrings.EmptyBeatmapsCannotBeSubmitted,
+                });
+                return;
+            }
+
+            if (HasUnsavedChanges)
+            {
+                dialogOverlay.Push(new SaveRequiredPopupDialog(() => attemptMutationOperation(() =>
+                {
+                    if (!Save())
+                        return false;
+
+                    startSubmission();
+                    return true;
+                })));
+            }
+            else
+            {
+                startSubmission();
+            }
+
+            void startSubmission() => this.Push(new BeatmapSubmissionScreen());
+        }
+
         private void exportBeatmap(bool legacy)
         {
             if (HasUnsavedChanges)

osu.Game/Screens/Edit/Submission/BeatmapSubmissionOverlay.cs

@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Localisation;
 
@@ -15,10 +17,14 @@ public BeatmapSubmissionOverlay()
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IBindable<WorkingBeatmap> beatmap)
         {
-            AddStep<ScreenContentPermissions>();
-            AddStep<ScreenFrequentlyAskedQuestions>();
+            if (beatmap.Value.BeatmapSetInfo.OnlineID <= 0)
+            {
+                AddStep<ScreenContentPermissions>();
+                AddStep<ScreenFrequentlyAskedQuestions>();
+            }
+
             AddStep<ScreenSubmissionSettings>();
 
             Header.Title = BeatmapSubmissionStrings.BeatmapSubmissionTitle;