Merge pull request #3561 from onesounds/250520-FixFilesConfig

onesounds · web-flow · commit ac614696b1ba · 2025-05-21T20:49:11.000+09:00
Improve File Manager Configuration Error Handling
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -226,8 +226,8 @@ public CustomExplorerViewModel CustomExplorer
             new()
             {
                 Name = "Files",
-                Path = "Files",
-                DirectoryArgument = "-select \"%d\"",
+                Path = "Files-Stable",
+                DirectoryArgument = "\"%d\"",
                 FileArgument = "-select \"%f\""
             }
         };
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
@@ -98,6 +98,10 @@ public App()
                         .AddTransient<SettingsPanePluginStoreViewModel>()
                         .AddTransient<SettingsPaneProxyViewModel>()
                         .AddTransient<SettingsPaneThemeViewModel>()
+                        // Use transient instance for dialog view models because
+                        // settings will change and we need to recreate them
+                        .AddTransient<SelectBrowserViewModel>()
+                        .AddTransient<SelectFileManagerViewModel>()
                     ).Build();
                 Ioc.Default.ConfigureServices(host.Services);
             }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -366,13 +366,16 @@
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
+    <system:String x:Key="fileManager_learnMore">Learn more</system:String>
     <system:String x:Key="fileManager_tips">Please specify the file location of the file manager you using and add arguments as required. The &quot;%d&quot; represents the directory path to open for, used by the Arg for Folder field and for commands opening specific directories. The &quot;%f&quot; represents the file path to open for, used by the Arg for File field and for commands opening specific files.</system:String>
     <system:String x:Key="fileManager_tips2">For example, if the file manager uses a command such as &quot;totalcmd.exe /A c:\windows&quot; to open the c:\windows directory, the File Manager Path will be totalcmd.exe, and the Arg For Folder will be /A &quot;%d&quot;. Certain file managers like QTTabBar may just require a path to be supplied, in this instance use &quot;%d&quot; as the File Manager Path and leave the rest of the fileds blank.</system:String>
     <system:String x:Key="fileManager_name">File Manager</system:String>
     <system:String x:Key="fileManager_profile_name">Profile Name</system:String>
     <system:String x:Key="fileManager_path">File Manager Path</system:String>
     <system:String x:Key="fileManager_directory_arg">Arg For Folder</system:String>
     <system:String x:Key="fileManager_file_arg">Arg For File</system:String>
+    <system:String x:Key="fileManagerPathNotFound">The file manager '{0}' could not be located at '{1}'. Would you like to continue?</system:String>
+    <system:String x:Key="fileManagerPathError">File Manager Path Error</system:String>
 
     <!--  DefaultBrowser Setting Dialog  -->
     <system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
@@ -462,6 +465,14 @@
     <system:String x:Key="reportWindow_upload_log">1. Upload log file: {0}</system:String>
     <system:String x:Key="reportWindow_copy_below">2. Copy below exception message</system:String>
 
+    <!--  File Open Error  -->
+    <system:String x:Key="fileManagerNotFoundTitle">File Manager Error</system:String>
+    <system:String x:Key="fileManagerNotFound">
+        The specified file manager could not be found. Please check the Custom File Manager setting under Settings > General.
+    </system:String>
+    <system:String x:Key="errorTitle">Error</system:String>
+    <system:String x:Key="folderOpenError">An error occurred while opening the folder. {0}</system:String>
+
     <!--  General Notice  -->
     <system:String x:Key="pleaseWait">Please wait...</system:String>
 
diff --git a/Flow.Launcher/MessageBoxEx.xaml.cs b/Flow.Launcher/MessageBoxEx.xaml.cs
@@ -22,9 +22,6 @@ private MessageBoxEx(MessageBoxButton button)
             InitializeComponent();
         }
 
-        public static MessageBoxResult Show(string messageBoxText)
-            => Show(messageBoxText, string.Empty, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
-
         public static MessageBoxResult Show(
             string messageBoxText,
             string caption = "",
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
@@ -32,11 +32,14 @@
 using JetBrains.Annotations;
 using Squirrel;
 using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
+using System.ComponentModel;
 
 namespace Flow.Launcher
 {
     public class PublicAPIInstance : IPublicAPI, IRemovable
     {
+        private static readonly string ClassName = nameof(PublicAPIInstance);
+
         private readonly Settings _settings;
         private readonly MainViewModel _mainVM;
 
@@ -316,40 +319,63 @@ public void SavePluginSettings()
 
         public void OpenDirectory(string DirectoryPath, string FileNameOrFilePath = null)
         {
-            using var explorer = new Process();
-            var explorerInfo = _settings.CustomExplorer;
-            var explorerPath = explorerInfo.Path.Trim().ToLowerInvariant();
-            var targetPath = FileNameOrFilePath is null
-                ? DirectoryPath
-                : Path.IsPathRooted(FileNameOrFilePath)
-                    ? FileNameOrFilePath
-                    : Path.Combine(DirectoryPath, FileNameOrFilePath);
-
-            if (Path.GetFileNameWithoutExtension(explorerPath) == "explorer")
+            try
             {
-                // Windows File Manager
-                // We should ignore and pass only the path to Shell to prevent zombie explorer.exe processes
-                explorer.StartInfo = new ProcessStartInfo
+                using var explorer = new Process();
+                var explorerInfo = _settings.CustomExplorer;
+                var explorerPath = explorerInfo.Path.Trim().ToLowerInvariant();
+                var targetPath = FileNameOrFilePath is null
+                    ? DirectoryPath
+                    : Path.IsPathRooted(FileNameOrFilePath)
+                        ? FileNameOrFilePath
+                        : Path.Combine(DirectoryPath, FileNameOrFilePath);
+
+                if (Path.GetFileNameWithoutExtension(explorerPath) == "explorer")
                 {
-                    FileName = targetPath,         // Not explorer, Only path.
-                    UseShellExecute = true         // Must be true to open folder
-                };
+                    // Windows File Manager
+                    explorer.StartInfo = new ProcessStartInfo
+                    {
+                        FileName = targetPath,
+                        UseShellExecute = true
+                    };
+                }
+                else
+                {
+                    // Custom File Manager
+                    explorer.StartInfo = new ProcessStartInfo
+                    {
+                        FileName = explorerInfo.Path.Replace("%d", DirectoryPath),
+                        UseShellExecute = true,
+                        Arguments = FileNameOrFilePath is null
+                            ? explorerInfo.DirectoryArgument.Replace("%d", DirectoryPath)
+                            : explorerInfo.FileArgument
+                                .Replace("%d", DirectoryPath)
+                                .Replace("%f", targetPath)
+                    };
+                }
+
+                explorer.Start();
             }
-            else
+            catch (Win32Exception ex) when (ex.NativeErrorCode == 2)
             {
-                // Custom File Manager
-                explorer.StartInfo = new ProcessStartInfo
-                {
-                    FileName = explorerInfo.Path.Replace("%d", DirectoryPath),
-                    UseShellExecute = true,
-                    Arguments = FileNameOrFilePath is null
-                        ? explorerInfo.DirectoryArgument.Replace("%d", DirectoryPath)
-                        : explorerInfo.FileArgument
-                            .Replace("%d", DirectoryPath)
-                            .Replace("%f", targetPath)
-                };
+                LogError(ClassName, "File Manager not found");
+                ShowMsgBox(
+                    string.Format(GetTranslation("fileManagerNotFound"), ex.Message),
+                    GetTranslation("fileManagerNotFoundTitle"),
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error
+                );
+            }
+            catch (Exception ex)
+            {
+                LogException(ClassName, "Failed to open folder", ex);
+                ShowMsgBox(
+                    string.Format(GetTranslation("folderOpenError"), ex.Message),
+                    GetTranslation("errorTitle"),
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error
+                );
             }
-            explorer.Start();
         }
 
         private void OpenUri(Uri uri, bool? inPrivate = null)
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml
@@ -6,10 +6,11 @@
     xmlns:local="clr-namespace:Flow.Launcher"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
+    xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     Title="{DynamicResource defaultBrowserTitle}"
     Width="550"
+    d:DataContext="{d:DesignInstance vm:SelectBrowserViewModel}"
     Background="{DynamicResource PopuBGColor}"
-    DataContext="{Binding RelativeSource={RelativeSource Self}}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
@@ -97,11 +98,11 @@
                     </ComboBox>
                     <Button
                         Margin="10 0 0 0"
-                        Click="btnAdd_Click"
+                        Command="{Binding AddCommand}"
                         Content="{DynamicResource add}" />
                     <Button
                         Margin="10 0 0 0"
-                        Click="btnDelete_Click"
+                        Command="{Binding DeleteCommand}"
                         Content="{DynamicResource delete}"
                         IsEnabled="{Binding CustomBrowser.Editable}" />
 
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml.cs b/Flow.Launcher/SelectBrowserWindow.xaml.cs
@@ -1,36 +1,18 @@
-﻿using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows;
+﻿using System.Windows;
 using System.Windows.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Flow.Launcher.Infrastructure.UserSettings;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
-    [INotifyPropertyChanged]
     public partial class SelectBrowserWindow : Window
     {
-        private readonly Settings _settings;
+        private readonly SelectBrowserViewModel _viewModel;
 
-        private int selectedCustomBrowserIndex;
-
-        public int SelectedCustomBrowserIndex
-        {
-            get => selectedCustomBrowserIndex;
-            set
-            {
-                selectedCustomBrowserIndex = value;
-                OnPropertyChanged(nameof(CustomBrowser));
-            }
-        }
-        public ObservableCollection<CustomBrowserViewModel> CustomBrowsers { get; set; }
-
-        public CustomBrowserViewModel CustomBrowser => CustomBrowsers[SelectedCustomBrowserIndex];
-        public SelectBrowserWindow(Settings settings)
+        public SelectBrowserWindow()
         {
-            _settings = settings;
-            CustomBrowsers = new ObservableCollection<CustomBrowserViewModel>(_settings.CustomBrowserList.Select(x => x.Copy()));
-            SelectedCustomBrowserIndex = _settings.CustomBrowserIndex;
+            _viewModel = Ioc.Default.GetRequiredService<SelectBrowserViewModel>();
+            DataContext = _viewModel;
             InitializeComponent();
         }
 
@@ -41,33 +23,20 @@ private void btnCancel_Click(object sender, RoutedEventArgs e)
 
         private void btnDone_Click(object sender, RoutedEventArgs e)
         {
-            _settings.CustomBrowserList = CustomBrowsers.ToList();
-            _settings.CustomBrowserIndex = SelectedCustomBrowserIndex;
-            Close();
-        }
-
-        private void btnAdd_Click(object sender, RoutedEventArgs e)
-        {
-            CustomBrowsers.Add(new()
+            if (_viewModel.SaveSettings())
             {
-                Name = "New Profile"
-            });
-            SelectedCustomBrowserIndex = CustomBrowsers.Count - 1;
-        }
-
-        private void btnDelete_Click(object sender, RoutedEventArgs e)
-        {
-            CustomBrowsers.RemoveAt(SelectedCustomBrowserIndex--);
+                Close();
+            }
         }
 
         private void btnBrowseFile_Click(object sender, RoutedEventArgs e)
         {
-            Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();
-            var result = dlg.ShowDialog();
-            if (result == true)
+            var selectedFilePath = _viewModel.SelectFile();
+
+            if (!string.IsNullOrEmpty(selectedFilePath))
             {
-                TextBox path = (TextBox)(((FrameworkElement)sender).Parent as FrameworkElement).FindName("PathTextBox");
-                path.Text = dlg.FileName;
+                var path = (TextBox)(((FrameworkElement)sender).Parent as FrameworkElement).FindName("PathTextBox");
+                path.Text = selectedFilePath;
                 path.Focus();
                 ((Button)sender).Focus();
             }
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -6,10 +6,11 @@
     xmlns:local="clr-namespace:Flow.Launcher"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
+    xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     Title="{DynamicResource fileManagerWindow}"
     Width="600"
+    d:DataContext="{d:DesignInstance vm:SelectFileManagerViewModel}"
     Background="{DynamicResource PopuBGColor}"
-    DataContext="{Binding RelativeSource={RelativeSource Self}}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
@@ -73,9 +74,17 @@
                         <TextBlock Margin="0 14 0 0" FontSize="14">
                             <TextBlock Text="{DynamicResource fileManager_tips2}" TextWrapping="WrapWithOverflow" />
                         </TextBlock>
+                        <TextBlock Margin="0 14 0 0" VerticalAlignment="Center">
+                            <Hyperlink NavigateUri="https://www.flowlauncher.com/docs/#/filemanager" RequestNavigate="Hyperlink_RequestNavigate">
+                                <TextBlock FontSize="14" Text="{DynamicResource fileManager_learnMore}" />
+                            </Hyperlink>
+                        </TextBlock>
                     </StackPanel>
-
-                    <StackPanel Margin="14 28 0 0" Orientation="Horizontal">
+                    <Rectangle
+                        Height="1"
+                        Margin="0 20 0 20"
+                        Fill="{StaticResource SeparatorForeground}" />
+                    <StackPanel Margin="14 0 0 0" Orientation="Horizontal">
                         <TextBlock
                             Grid.Column="1"
                             HorizontalAlignment="Left"
@@ -99,19 +108,19 @@
                         </ComboBox>
                         <Button
                             Margin="10 0 0 0"
-                            Click="btnAdd_Click"
+                            Command="{Binding AddCommand}"
                             Content="{DynamicResource add}" />
                         <Button
                             Margin="10 0 0 0"
-                            Click="btnDelete_Click"
+                            Command="{Binding DeleteCommand}"
                             Content="{DynamicResource delete}"
                             IsEnabled="{Binding CustomExplorer.Editable}" />
 
                     </StackPanel>
                     <Rectangle
                         Height="1"
                         Margin="0 20 0 12"
-                        Fill="{StaticResource Color03B}" />
+                        Fill="{StaticResource SeparatorForeground}" />
                     <StackPanel
                         Margin="0 0 0 0"
                         HorizontalAlignment="Stretch"
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml.cs b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
diff --git a/Flow.Launcher/ViewModel/SelectBrowserViewModel.cs b/Flow.Launcher/ViewModel/SelectBrowserViewModel.cs
diff --git a/Flow.Launcher/ViewModel/SelectFileManagerViewModel.cs b/Flow.Launcher/ViewModel/SelectFileManagerViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -226,8 +226,8 @@ public CustomExplorerViewModel CustomExplorer`
`226`	`226`	`new()`
`227`	`227`	`{`
`228`	`228`	`Name = "Files",`
`229`		`- Path = "Files",`
`230`		`- DirectoryArgument = "-select \"%d\"",`
	`229`	`+ Path = "Files-Stable",`
	`230`	`+ DirectoryArgument = "\"%d\"",`
`231`	`231`	`FileArgument = "-select \"%f\""`
`232`	`232`	`}`
`233`	`233`	`};`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,6 @@ private MessageBoxEx(MessageBoxButton button)`
`22`	`22`	`InitializeComponent();`
`23`	`23`	`}`
`24`	`24`
`25`		`- public static MessageBoxResult Show(string messageBoxText)`
`26`		`- => Show(messageBoxText, string.Empty, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);`
`27`		`-`
`28`	`25`	`public static MessageBoxResult Show(`
`29`	`26`	`string messageBoxText,`
`30`	`27`	`string caption = "",`