Prevent Importing non osu!mania beatmaps

Author: FuroYT

source/funkin/data/song/importer/OsuManiaData.hx

@@ -9,6 +9,7 @@ typedef OsuManiaData =
   var General:
     {
       var PreviewTime:Int;
+      var Mode:Int; // Should only be 3 if you are sure this is a mania beatmap
     };
   var Editor:
     {

source/funkin/ui/debug/charting/dialogs/ChartEditorWelcomeDialog.hx

@@ -33,9 +33,9 @@ class ChartEditorWelcomeDialog extends ChartEditorBaseDialog
     this.splashCreateFromSongBasicOnly.onClick = _ -> onClickLinkCreateBasicOnly();
     this.splashCreateFromSongErectOnly.onClick = _ -> onClickLinkCreateErectOnly();
     this.splashCreateFromSongBasicErect.onClick = _ -> onClickLinkCreateBasicErect();
-    this.splashImportChartLegacy.onClick = _ -> onClickLinkImportChartLegacy();
-    this.splashImportChartOsuMania.onClick = _ -> onClickLinkImportOsuMania();
-    this.splashImportChartStepMania.onClick = _ -> onClickLinkImportStepMania();
+    this.splashImportChartLegacy.onClick = _ -> onClickLinkImport("legacy");
+    this.splashImportChartOsuMania.onClick = _ -> onClickLinkImport("osumania");
+    this.splashImportChartStepMania.onClick = _ -> onClickLinkImport('stepmania');
 
     // Add items to the Recent Charts list
     #if sys
@@ -233,42 +233,16 @@ class ChartEditorWelcomeDialog extends ChartEditorBaseDialog
   }
 
   /**
-   * Called when the user clicks the "Import Chart: FNF Legacy" link in the dialog.
+   * Called when the user clicks on any "Import Chart" link in the dialog.
    * Reassign this function to change the behavior.
    */
-  public function onClickLinkImportChartLegacy():Void
+  public function onClickLinkImport(format:String):Void
   {
     // Hide the welcome dialog
     this.hideDialog(DialogButton.CANCEL);
 
-    // Open the "Import Chart" dialog
-    chartEditorState.openImportChartWizard('legacy', false);
-  }
-
-  /**
-   * Called when the user clicks the "Import Chart: Osu! Mania" link in the dialog.
-   * Reassign this function to change the behavior.
-   */
-  public function onClickLinkImportOsuMania():Void
-  {
-    // Hide the welcome dialog
-    this.hideDialog(DialogButton.CANCEL);
-
-    // Open the "Import Chart" dialog
-    chartEditorState.openImportChartWizard('osumania', false);
-  }
-
-  /**
-   * Called when the user clicks the "Import Chart: StepMania" link in the dialog.
-   * Reassign this function to change the behavior.
-   */
-  public function onClickLinkImportStepMania():Void
-  {
-    // Hide the welcome dialog
-    this.hideDialog(DialogButton.CANCEL);
-
-    // Open the "Import Chart" dialog
-    chartEditorState.openImportChartWizard('stepmania', false);
+    // Open the "Import Chart" dialog for specified format
+    chartEditorState.openImportChartWizard(format, false);
   }
 }
 #end

source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx

@@ -1065,25 +1065,11 @@ class ChartEditorDialogHandler
     {
       case 'legacy': 'FNF Legacy';
       case 'stepmania': 'StepMania';
-      case 'osumania': 'Osu!Mania';
+      case 'osumania': 'osu!Mania';
       default: 'Unknown';
     }
 
-    var fileFilter = switch (format)
-    {
-      case 'legacy':
-        [
-          {label: 'JSON Data File (.json)', extension: 'json'}];
-      case 'stepmania':
-        [
-          {label: 'StepMania File (.sm)', extension: 'sm'}];
-      case 'osumania':
-        [
-          {label: 'OSU! Beatmap File (.osu)', extension: 'osu'}];
-      default: null;
-    }
-
-    var fileExt = switch (format)
+    var fileExt:String = switch (format)
     {
       case 'osumania':
         "osu";
@@ -1092,6 +1078,18 @@ class ChartEditorDialogHandler
       default: "json";
     }
 
+    var fileFilterLabel:String = switch (fileExt)
+    {
+      case 'json':
+        'JSON Data File';
+      case 'sm':
+        'StepMania File';
+      case 'osu':
+        'osu! Beatmap File';
+      default: "Unknown File Type";
+    };
+    fileFilterLabel += ' (.$fileExt)';
+
     dialog.title = 'Import Chart - ${prettyFormat}';
 
     var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
@@ -1166,8 +1164,6 @@ class ChartEditorDialogHandler
             return;
           }
 
-          trace('Parsed StepMania data for ' + stepmaniaData.Metadata.Title);
-
           songMetadata = StepManiaImporter.migrateChartMetadata(stepmaniaData);
           songChartData = StepManiaImporter.migrateChartData(stepmaniaData);
 
@@ -1178,7 +1174,14 @@ class ChartEditorDialogHandler
 
           if (osuManiaData == null)
           {
-            state.error('Failure', 'Failed to parse Osu!Mania beatmap file (${path.file}.${path.ext})');
+            state.error('Failure', 'Failed to parse osu!Mania beatmap file (${path.file}.${path.ext})');
+            return;
+          }
+          else if (osuManiaData.General.Mode != 3)
+          {
+            var modes = ["osu!", "osu!taiko", "osu!catch"];
+            state.error('Failure',
+              'Not a osu!mania beatmap!\nGiven beatmap seems to be a ${modes[osuManiaData.General.Mode]} beatmap (${path.file}.${path.ext})');
             return;
           }
 
@@ -1199,9 +1202,11 @@ class ChartEditorDialogHandler
       state.success('Success', '$loadedText (${path.file}.${path.ext})');
     };
 
+    // TODO / BUG: File filtering not working on mac finder dialog, so we don't use it for now
+    var fileTypes = #if !mac [
+      {label: fileFilterLabel, extension: fileExt}] #else [] #end;
     importBox.onClick = function(_) {
-      // TODO / BUG: File filtering not working on mac finder dialog, so we don't use it for now
-      Dialogs.openBinaryFile('Import Chart - ${prettyFormat}', #if !mac fileFilter ?? [] #else [] #end, function(selectedFile:SelectedFileInfo) {
+      Dialogs.openBinaryFile('Import Chart - ${prettyFormat}', fileTypes, function(selectedFile:SelectedFileInfo) {
         if (selectedFile != null && selectedFile.bytes != null)
         {
           @:nullSafety(Off)