Remove options

ds5678 · ds5678 · commit c30ad8b089e7 · 2025-07-13T15:15:26.000-07:00
diff --git a/AssetRipper.NativeDialogs/OpenFileDialog.cs b/AssetRipper.NativeDialogs/OpenFileDialog.cs
@@ -1,7 +1,6 @@
 ﻿using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
-using System.Text;
 using TerraFX.Interop.Windows;
 
 namespace AssetRipper.NativeDialogs;
@@ -13,20 +12,19 @@ public static class OpenFileDialog
 		OperatingSystem.IsMacOS() ||
 		(OperatingSystem.IsLinux() && Gtk.Global.IsSupported);
 
-	public static Task<string?> OpenFileAsync(OpenFileDialogOptions? options = null)
+	public static Task<string?> OpenFileAsync()
 	{
-		options ??= OpenFileDialogOptions.Default;
 		if (OperatingSystem.IsWindows())
 		{
-			return OpenFileAsyncWindows(options);
+			return OpenFileAsyncWindows();
 		}
 		else if (OperatingSystem.IsMacOS())
 		{
-			return OpenFileAsyncMacOS(options);
+			return OpenFileAsyncMacOS();
 		}
 		else if (OperatingSystem.IsLinux())
 		{
-			return OpenFileAsyncLinux(options);
+			return OpenFileAsyncLinux();
 		}
 		else
 		{
@@ -35,30 +33,14 @@ public static class OpenFileDialog
 	}
 
 	[SupportedOSPlatform("windows")]
-	private unsafe static Task<string?> OpenFileAsyncWindows(OpenFileDialogOptions options)
+	private unsafe static Task<string?> OpenFileAsyncWindows()
 	{
 		// https://learn.microsoft.com/en-us/windows/win32/api/commdlg/ns-commdlg-openfilenamew
 
 		char[] buffer = ArrayPool<char>.Shared.Rent(ushort.MaxValue + 1); // Should be enough for the overwhelming majority of cases.
 		new Span<char>(buffer).Clear();
 
-		string filter;
-		if (options.Filters.Count == 0)
-		{
-			filter = "All Files\0*.*\0\0";
-		}
-		else
-		{
-			StringBuilder filterBuilder = new();
-			foreach (KeyValuePair<string, string> pair in options.Filters)
-			{
-				filterBuilder
-					.Append(pair.Key).Append('\0')
-					.Append("*.").Append(pair.Value).Append('\0');
-			}
-			filterBuilder.Append('\0'); // End of filter list
-			filter = filterBuilder.ToString();
-		}
+		string filter = "All Files\0*.*\0\0";
 
 		fixed (char* bufferPtr = buffer)
 		fixed (char* filterPtr = filter)
@@ -88,13 +70,13 @@ public static class OpenFileDialog
 	}
 
 	[SupportedOSPlatform("macos")]
-	private static Task<string?> OpenFileAsyncMacOS(OpenFileDialogOptions options)
+	private static Task<string?> OpenFileAsyncMacOS()
 	{
 		return ProcessExecutor.TryRun("osascript", "-e", "POSIX path of (choose file)");
 	}
 
 	[SupportedOSPlatform("linux")]
-	private static Task<string?> OpenFileAsyncLinux(OpenFileDialogOptions options)
+	private static Task<string?> OpenFileAsyncLinux()
 	{
 		if (Gtk.Global.IsSupported)
 		{
diff --git a/AssetRipper.NativeDialogs/OpenFileDialogOptions.cs b/AssetRipper.NativeDialogs/OpenFileDialogOptions.cs
diff --git a/AssetRipper.NativeDialogs/OpenFilesDialog.cs b/AssetRipper.NativeDialogs/OpenFilesDialog.cs
@@ -1,7 +1,6 @@
 ﻿using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
-using System.Text;
 using TerraFX.Interop.Windows;
 
 namespace AssetRipper.NativeDialogs;
@@ -13,20 +12,19 @@ public static class OpenFilesDialog
 		OperatingSystem.IsMacOS() ||
 		(OperatingSystem.IsLinux() && Gtk.Global.IsSupported);
 
-	public static Task<string[]?> OpenFilesAsync(OpenFileDialogOptions? options = null)
+	public static Task<string[]?> OpenFilesAsync()
 	{
-		options ??= OpenFileDialogOptions.Default;
 		if (OperatingSystem.IsWindows())
 		{
-			return OpenFilesAsyncWindows(options);
+			return OpenFilesAsyncWindows();
 		}
 		else if (OperatingSystem.IsMacOS())
 		{
-			return OpenFilesAsyncMacOS(options);
+			return OpenFilesAsyncMacOS();
 		}
 		else if (OperatingSystem.IsLinux())
 		{
-			return OpenFilesAsyncLinux(options);
+			return OpenFilesAsyncLinux();
 		}
 		else
 		{
@@ -35,30 +33,14 @@ public static class OpenFilesDialog
 	}
 
 	[SupportedOSPlatform("windows")]
-	private unsafe static Task<string[]?> OpenFilesAsyncWindows(OpenFileDialogOptions options)
+	private unsafe static Task<string[]?> OpenFilesAsyncWindows()
 	{
 		// https://learn.microsoft.com/en-us/windows/win32/api/commdlg/ns-commdlg-openfilenamew
 
 		char[] buffer = ArrayPool<char>.Shared.Rent(ushort.MaxValue + 1); // Should be enough for the overwhelming majority of cases.
 		new Span<char>(buffer).Clear();
 
-		string filter;
-		if (options.Filters.Count == 0)
-		{
-			filter = "All Files\0*.*\0\0";
-		}
-		else
-		{
-			StringBuilder filterBuilder = new();
-			foreach (KeyValuePair<string, string> pair in options.Filters)
-			{
-				filterBuilder
-					.Append(pair.Key).Append('\0')
-					.Append("*.").Append(pair.Value).Append('\0');
-			}
-			filterBuilder.Append('\0'); // End of filter list
-			filter = filterBuilder.ToString();
-		}
+		string filter = "All Files\0*.*\0\0";
 
 		fixed (char* bufferPtr = buffer)
 		fixed (char* filterPtr = filter)
@@ -105,7 +87,7 @@ public static class OpenFilesDialog
 	}
 
 	[SupportedOSPlatform("macos")]
-	private static async Task<string[]?> OpenFilesAsyncMacOS(OpenFileDialogOptions options)
+	private static async Task<string[]?> OpenFilesAsyncMacOS()
 	{
 		ReadOnlySpan<string> arguments =
 		[
@@ -126,7 +108,7 @@ public static class OpenFilesDialog
 	}
 
 	[SupportedOSPlatform("linux")]
-	private static async Task<string[]?> OpenFilesAsyncLinux(OpenFileDialogOptions options)
+	private static async Task<string[]?> OpenFilesAsyncLinux()
 	{
 		// Todo: proper Linux implementation
 		string? path = await OpenFileDialog.OpenFileAsync();
diff --git a/AssetRipper.NativeDialogs/OpenFolderDialog.cs b/AssetRipper.NativeDialogs/OpenFolderDialog.cs
@@ -9,20 +9,19 @@ public static class OpenFolderDialog
 		OperatingSystem.IsMacOS() ||
 		(OperatingSystem.IsLinux() && Gtk.Global.IsSupported);
 
-	public static Task<string?> OpenFolderAsync(OpenFileDialogOptions? options = null)
+	public static Task<string?> OpenFolderAsync()
 	{
-		options ??= OpenFileDialogOptions.Default;
 		if (OperatingSystem.IsWindows())
 		{
-			return OpenFolderAsyncWindows(options);
+			return OpenFolderAsyncWindows();
 		}
 		else if (OperatingSystem.IsMacOS())
 		{
-			return OpenFolderAsyncMacOS(options);
+			return OpenFolderAsyncMacOS();
 		}
 		else if (OperatingSystem.IsLinux())
 		{
-			return OpenFolderAsyncLinux(options);
+			return OpenFolderAsyncLinux();
 		}
 		else
 		{
@@ -31,19 +30,19 @@ public static class OpenFolderDialog
 	}
 
 	[SupportedOSPlatform("windows")]
-	private unsafe static Task<string?> OpenFolderAsyncWindows(OpenFileDialogOptions options)
+	private unsafe static Task<string?> OpenFolderAsyncWindows()
 	{
 		return Task.FromResult<string?>(null);
 	}
 
 	[SupportedOSPlatform("macos")]
-	private static Task<string?> OpenFolderAsyncMacOS(OpenFileDialogOptions options)
+	private static Task<string?> OpenFolderAsyncMacOS()
 	{
 		return ProcessExecutor.TryRun("osascript", "-e", "POSIX path of (choose folder)");
 	}
 
 	[SupportedOSPlatform("linux")]
-	private static Task<string?> OpenFolderAsyncLinux(OpenFileDialogOptions options)
+	private static Task<string?> OpenFolderAsyncLinux()
 	{
 		return Task.FromResult<string?>(null);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System.Buffers;`
`2`	`2`	`using System.Runtime.CompilerServices;`
`3`	`3`	`using System.Runtime.Versioning;`
`4`		`-using System.Text;`
`5`	`4`	`using TerraFX.Interop.Windows;`
`6`	`5`
`7`	`6`	`namespace AssetRipper.NativeDialogs;`
`@@ -13,20 +12,19 @@ public static class OpenFileDialog`
`13`	`12`	`OperatingSystem.IsMacOS() \|\|`
`14`	`13`	`(OperatingSystem.IsLinux() && Gtk.Global.IsSupported);`
`15`	`14`
`16`		`- public static Task<string?> OpenFileAsync(OpenFileDialogOptions? options = null)`
	`15`	`+ public static Task<string?> OpenFileAsync()`
`17`	`16`	`{`
`18`		`- options ??= OpenFileDialogOptions.Default;`
`19`	`17`	`if (OperatingSystem.IsWindows())`
`20`	`18`	`{`
`21`		`- return OpenFileAsyncWindows(options);`
	`19`	`+ return OpenFileAsyncWindows();`
`22`	`20`	`}`
`23`	`21`	`else if (OperatingSystem.IsMacOS())`
`24`	`22`	`{`
`25`		`- return OpenFileAsyncMacOS(options);`
	`23`	`+ return OpenFileAsyncMacOS();`
`26`	`24`	`}`
`27`	`25`	`else if (OperatingSystem.IsLinux())`
`28`	`26`	`{`
`29`		`- return OpenFileAsyncLinux(options);`
	`27`	`+ return OpenFileAsyncLinux();`
`30`	`28`	`}`
`31`	`29`	`else`
`32`	`30`	`{`
`@@ -35,30 +33,14 @@ public static class OpenFileDialog`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`[SupportedOSPlatform("windows")]`
`38`		`- private unsafe static Task<string?> OpenFileAsyncWindows(OpenFileDialogOptions options)`
	`36`	`+ private unsafe static Task<string?> OpenFileAsyncWindows()`
`39`	`37`	`{`
`40`	`38`	`// https://learn.microsoft.com/en-us/windows/win32/api/commdlg/ns-commdlg-openfilenamew`
`41`	`39`
`42`	`40`	`char[] buffer = ArrayPool<char>.Shared.Rent(ushort.MaxValue + 1); // Should be enough for the overwhelming majority of cases.`
`43`	`41`	`new Span<char>(buffer).Clear();`
`44`	`42`
`45`		`- string filter;`
`46`		`- if (options.Filters.Count == 0)`
`47`		`- {`
`48`		`- filter = "All Files\0.\0\0";`
`49`		`- }`
`50`		`- else`
`51`		`- {`
`52`		`- StringBuilder filterBuilder = new();`
`53`		`- foreach (KeyValuePair<string, string> pair in options.Filters)`
`54`		`- {`
`55`		`- filterBuilder`
`56`		`- .Append(pair.Key).Append('\0')`
`57`		`- .Append("*.").Append(pair.Value).Append('\0');`
`58`		`- }`
`59`		`- filterBuilder.Append('\0'); // End of filter list`
`60`		`- filter = filterBuilder.ToString();`
`61`		`- }`
	`43`	`+ string filter = "All Files\0.\0\0";`
`62`	`44`
`63`	`45`	`fixed (char* bufferPtr = buffer)`
`64`	`46`	`fixed (char* filterPtr = filter)`
`@@ -88,13 +70,13 @@ public static class OpenFileDialog`
`88`	`70`	`}`
`89`	`71`
`90`	`72`	`[SupportedOSPlatform("macos")]`
`91`		`- private static Task<string?> OpenFileAsyncMacOS(OpenFileDialogOptions options)`
	`73`	`+ private static Task<string?> OpenFileAsyncMacOS()`
`92`	`74`	`{`
`93`	`75`	`return ProcessExecutor.TryRun("osascript", "-e", "POSIX path of (choose file)");`
`94`	`76`	`}`
`95`	`77`
`96`	`78`	`[SupportedOSPlatform("linux")]`
`97`		`- private static Task<string?> OpenFileAsyncLinux(OpenFileDialogOptions options)`
	`79`	`+ private static Task<string?> OpenFileAsyncLinux()`
`98`	`80`	`{`
`99`	`81`	`if (Gtk.Global.IsSupported)`
`100`	`82`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,20 +9,19 @@ public static class OpenFolderDialog`
`9`	`9`	`OperatingSystem.IsMacOS() \|\|`
`10`	`10`	`(OperatingSystem.IsLinux() && Gtk.Global.IsSupported);`
`11`	`11`
`12`		`- public static Task<string?> OpenFolderAsync(OpenFileDialogOptions? options = null)`
	`12`	`+ public static Task<string?> OpenFolderAsync()`
`13`	`13`	`{`
`14`		`- options ??= OpenFileDialogOptions.Default;`
`15`	`14`	`if (OperatingSystem.IsWindows())`
`16`	`15`	`{`
`17`		`- return OpenFolderAsyncWindows(options);`
	`16`	`+ return OpenFolderAsyncWindows();`
`18`	`17`	`}`
`19`	`18`	`else if (OperatingSystem.IsMacOS())`
`20`	`19`	`{`
`21`		`- return OpenFolderAsyncMacOS(options);`
	`20`	`+ return OpenFolderAsyncMacOS();`
`22`	`21`	`}`
`23`	`22`	`else if (OperatingSystem.IsLinux())`
`24`	`23`	`{`
`25`		`- return OpenFolderAsyncLinux(options);`
	`24`	`+ return OpenFolderAsyncLinux();`
`26`	`25`	`}`
`27`	`26`	`else`
`28`	`27`	`{`
`@@ -31,19 +30,19 @@ public static class OpenFolderDialog`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`[SupportedOSPlatform("windows")]`
`34`		`- private unsafe static Task<string?> OpenFolderAsyncWindows(OpenFileDialogOptions options)`
	`33`	`+ private unsafe static Task<string?> OpenFolderAsyncWindows()`
`35`	`34`	`{`
`36`	`35`	`return Task.FromResult<string?>(null);`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`[SupportedOSPlatform("macos")]`
`40`		`- private static Task<string?> OpenFolderAsyncMacOS(OpenFileDialogOptions options)`
	`39`	`+ private static Task<string?> OpenFolderAsyncMacOS()`
`41`	`40`	`{`
`42`	`41`	`return ProcessExecutor.TryRun("osascript", "-e", "POSIX path of (choose folder)");`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`[SupportedOSPlatform("linux")]`
`46`		`- private static Task<string?> OpenFolderAsyncLinux(OpenFileDialogOptions options)`
	`45`	`+ private static Task<string?> OpenFolderAsyncLinux()`
`47`	`46`	`{`
`48`	`47`	`return Task.FromResult<string?>(null);`
`49`	`48`	`}`