From 2403bd4f3cf9108ca0ed8ada40b55d8374161bfb Mon Sep 17 00:00:00 2001 From: GreemDev Date: Wed, 2 Jul 2025 14:49:15 -0500 Subject: [PATCH] use extension members for StorageProviderExtensions --- .../Utilities/StorageProviderExtensions.cs | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/Ryujinx/Utilities/StorageProviderExtensions.cs b/src/Ryujinx/Utilities/StorageProviderExtensions.cs index 1efabfbaa..68cde0f3d 100644 --- a/src/Ryujinx/Utilities/StorageProviderExtensions.cs +++ b/src/Ryujinx/Utilities/StorageProviderExtensions.cs @@ -8,21 +8,24 @@ namespace Ryujinx.Ava.Utilities { public static class StorageProviderExtensions { - public static async Task> OpenSingleFolderPickerAsync(this IStorageProvider storageProvider, FolderPickerOpenOptions openOptions = null) => - await storageProvider.OpenFolderPickerAsync(FixOpenOptions(openOptions, false)) - .Then(folders => folders.FindFirst()); - - public static async Task> OpenSingleFilePickerAsync(this IStorageProvider storageProvider, FilePickerOpenOptions openOptions = null) => - await storageProvider.OpenFilePickerAsync(FixOpenOptions(openOptions, false)) - .Then(files => files.FindFirst()); - - public static async Task>> OpenMultiFolderPickerAsync(this IStorageProvider storageProvider, FolderPickerOpenOptions openOptions = null) => - await storageProvider.OpenFolderPickerAsync(FixOpenOptions(openOptions, true)) - .Then(folders => folders.Count > 0 ? Optional.Of(folders) : default); - - public static async Task>> OpenMultiFilePickerAsync(this IStorageProvider storageProvider, FilePickerOpenOptions openOptions = null) => - await storageProvider.OpenFilePickerAsync(FixOpenOptions(openOptions, true)) - .Then(files => files.Count > 0 ? Optional.Of(files) : default); + extension(IStorageProvider storageProvider) + { + public Task> OpenSingleFolderPickerAsync(FolderPickerOpenOptions openOptions = null) => + storageProvider.OpenFolderPickerAsync(FixOpenOptions(openOptions, false)) + .Then(folders => folders.FindFirst()); + + public Task> OpenSingleFilePickerAsync(FilePickerOpenOptions openOptions = null) => + storageProvider.OpenFilePickerAsync(FixOpenOptions(openOptions, false)) + .Then(files => files.FindFirst()); + + public Task>> OpenMultiFolderPickerAsync(FolderPickerOpenOptions openOptions = null) => + storageProvider.OpenFolderPickerAsync(FixOpenOptions(openOptions, true)) + .Then(folders => folders.Count > 0 ? Optional.Of(folders) : default); + + public Task>> OpenMultiFilePickerAsync(FilePickerOpenOptions openOptions = null) => + storageProvider.OpenFilePickerAsync(FixOpenOptions(openOptions, true)) + .Then(files => files.Count > 0 ? Optional.Of(files) : default); + } private static FilePickerOpenOptions FixOpenOptions(this FilePickerOpenOptions openOptions, bool allowMultiple) {