code_review: PR #1484

- Check `Type` instead of `Name` while selecting external shell/terminal
- External merge tool named `Custom` is not supported
- Add `try-catch` statement to other file pickers in `Preferences` window

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/ViewModels/ExecuteCustomAction.cs

@@ -77,7 +77,7 @@ public class CustomActionControlComboBox : ObservableObject, ICustomActionContro
         public string Label { get; set; } = string.Empty;
         public string Description { get; set; } = string.Empty;
         public List<string> Options { get; set; } = [];
-        
+
         public string Value
         {
             get => _value;

src/Views/Preferences.axaml.cs

@@ -214,10 +214,15 @@ private async void SelectThemeOverrideFile(object _, RoutedEventArgs e)
                 AllowMultiple = false,
             };
 
-            var selected = await StorageProvider.OpenFilePickerAsync(options);
-            if (selected.Count == 1)
+            try
             {
-                ViewModels.Preferences.Instance.ThemeOverrides = selected[0].Path.LocalPath;
+                var selected = await StorageProvider.OpenFilePickerAsync(options);
+                if (selected is { Count: 1 })
+                    ViewModels.Preferences.Instance.ThemeOverrides = selected[0].Path.LocalPath;
+            }
+            catch (Exception ex)
+            {
+                App.RaiseException(string.Empty, $"Failed to select theme: {ex.Message}");
             }
 
             e.Handled = true;
@@ -232,11 +237,18 @@ private async void SelectGitExecutable(object _, RoutedEventArgs e)
                 AllowMultiple = false,
             };
 
-            var selected = await StorageProvider.OpenFilePickerAsync(options);
-            if (selected.Count == 1)
+            try
+            {
+                var selected = await StorageProvider.OpenFilePickerAsync(options);
+                if (selected is { Count: 1 })
+                {
+                    ViewModels.Preferences.Instance.GitInstallPath = selected[0].Path.LocalPath;
+                    UpdateGitVersion();
+                }
+            }
+            catch (Exception ex)
             {
-                ViewModels.Preferences.Instance.GitInstallPath = selected[0].Path.LocalPath;
-                UpdateGitVersion();
+                App.RaiseException(string.Empty, $"Failed to select git executable: {ex.Message}");
             }
 
             e.Handled = true;
@@ -277,10 +289,15 @@ private async void SelectGPGExecutable(object _, RoutedEventArgs e)
                 AllowMultiple = false,
             };
 
-            var selected = await StorageProvider.OpenFilePickerAsync(options);
-            if (selected.Count == 1)
+            try
+            {
+                var selected = await StorageProvider.OpenFilePickerAsync(options);
+                if (selected is { Count: 1 })
+                    GPGExecutableFile = selected[0].Path.LocalPath;
+            }
+            catch (Exception ex)
             {
-                GPGExecutableFile = selected[0].Path.LocalPath;
+                App.RaiseException(string.Empty, $"Failed to select gpg program: {ex.Message}");
             }
 
             e.Handled = true;
@@ -293,9 +310,8 @@ private async void SelectShellOrTerminal(object _, RoutedEventArgs e)
                 return;
 
             var shell = Models.ShellOrTerminal.Supported[type];
-
             var options = new FilePickerOpenOptions() { AllowMultiple = false };
-            if (shell.Name != "Custom")
+            if (shell.Type != "custom")
             {
                 options = new FilePickerOpenOptions()
                 {
@@ -304,59 +320,47 @@ private async void SelectShellOrTerminal(object _, RoutedEventArgs e)
                 };
             }
 
-            IReadOnlyList<IStorageFile> selected = null;
             try
             {
-                selected = await StorageProvider.OpenFilePickerAsync(options);
+                var selected = await StorageProvider.OpenFilePickerAsync(options);
+                if (selected is { Count: 1 })
+                    ViewModels.Preferences.Instance.ShellOrTerminalPath = selected[0].Path.LocalPath;
             }
             catch (Exception ex)
             {
                 App.RaiseException(string.Empty, $"Failed to select shell/terminal: {ex.Message}");
             }
 
-            if (selected is { Count: 1 })
-            {
-                ViewModels.Preferences.Instance.ShellOrTerminalPath = selected[0].Path.LocalPath;
-            }
-
             e.Handled = true;
         }
 
         private async void SelectExternalMergeTool(object _, RoutedEventArgs e)
         {
             var type = ViewModels.Preferences.Instance.ExternalMergeToolType;
-            if (type < 0 || type >= Models.ExternalMerger.Supported.Count)
+            if (type <= 0 || type >= Models.ExternalMerger.Supported.Count)
             {
                 ViewModels.Preferences.Instance.ExternalMergeToolType = 0;
                 e.Handled = true;
                 return;
             }
 
             var tool = Models.ExternalMerger.Supported[type];
-            var options = new FilePickerOpenOptions() { AllowMultiple = false };
-            if (tool.Name != "Custom")
+            var options = new FilePickerOpenOptions()
             {
-                options = new FilePickerOpenOptions()
-                {
-                    FileTypeFilter = [new FilePickerFileType(tool.Name) { Patterns = tool.GetPatterns() }],
-                    AllowMultiple = false,
-                };
-            }
+                FileTypeFilter = [new FilePickerFileType(tool.Name) { Patterns = tool.GetPatterns() }],
+                AllowMultiple = false,
+            };
 
-            IReadOnlyList<IStorageFile> selected = null;
             try
             {
-                selected = await StorageProvider.OpenFilePickerAsync(options);
+                var selected = await StorageProvider.OpenFilePickerAsync(options);
+                if (selected is { Count: 1 })
+                    ViewModels.Preferences.Instance.ExternalMergeToolPath = selected[0].Path.LocalPath;
             }
             catch (Exception ex)
             {
                 App.RaiseException(string.Empty, $"Failed to select merge tool: {ex.Message}");
             }
-            
-            if (selected is { Count: 1 })
-            {
-                ViewModels.Preferences.Instance.ExternalMergeToolPath = selected[0].Path.LocalPath;
-            }
 
             e.Handled = true;
         }
@@ -425,9 +429,16 @@ private async void SelectExecutableForCustomAction(object sender, RoutedEventArg
                 AllowMultiple = false,
             };
 
-            var selected = await StorageProvider.OpenFilePickerAsync(options);
-            if (selected.Count == 1 && sender is Button { DataContext: Models.CustomAction action })
-                action.Executable = selected[0].Path.LocalPath;
+            try
+            {
+                var selected = await StorageProvider.OpenFilePickerAsync(options);
+                if (selected is { Count: 1 } && sender is Button { DataContext: Models.CustomAction action })
+                    action.Executable = selected[0].Path.LocalPath;
+            }
+            catch (Exception ex)
+            {
+                App.RaiseException(string.Empty, $"Failed to select program for custom action: {ex.Message}");
+            }
 
             e.Handled = true;
         }