From d21ffce47af56b25bbf14e36d7b475ce3e7f4689 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 12:21:56 +0800 Subject: [PATCH 01/14] Use get window to get owner --- .../SettingPages/ViewModels/SettingsPanePluginsViewModel.cs | 4 ++-- Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs index 916fd1ece..de7cf15c3 100644 --- a/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs +++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginsViewModel.cs @@ -111,11 +111,11 @@ public partial class SettingsPanePluginsViewModel : BaseModel .ToList(); [RelayCommand] - private async Task OpenHelperAsync() + private async Task OpenHelperAsync(Button button) { var helpDialog = new ContentDialog() { - Owner = Application.Current.MainWindow, + Owner = Window.GetWindow(button), Content = new StackPanel { Children = diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml index f9f708314..f3d630306 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml @@ -57,6 +57,7 @@ Height="34" Margin="0 0 20 0" Command="{Binding OpenHelperCommand}" + CommandParameter="{Binding RelativeSource={RelativeSource Self}}" Content="" FontFamily="{DynamicResource SymbolThemeFontFamily}" FontSize="14" /> From c382732f974d99211b4d739340f6fcd7fa3cedc9 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 12:49:09 +0800 Subject: [PATCH 02/14] Improve windows exiting --- Plugins/Flow.Launcher.Plugin.Sys/Main.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs index 043eb7a19..39bf49654 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs @@ -362,6 +362,7 @@ namespace Flow.Launcher.Plugin.Sys Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe89f"), Action = c => { + _context.API.HideMainWindow(); Application.Current.MainWindow.Close(); return true; } From 8e51096ba9ded910e3c2c2906404e5bc5f247701 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 12:51:38 +0800 Subject: [PATCH 03/14] Improve log messages --- Flow.Launcher.Infrastructure/Image/ImageLoader.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs index a49385a02..86df01a30 100644 --- a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs +++ b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs @@ -171,8 +171,8 @@ namespace Flow.Launcher.Infrastructure.Image } catch (System.Exception e2) { - Log.Exception(ClassName, $"|ImageLoader.Load|Failed to get thumbnail for {path} on first try", e); - Log.Exception(ClassName, $"|ImageLoader.Load|Failed to get thumbnail for {path} on second try", e2); + Log.Exception(ClassName, $"Failed to get thumbnail for {path} on first try", e); + Log.Exception(ClassName, $"Failed to get thumbnail for {path} on second try", e2); ImageSource image = ImageCache[Constant.MissingImgIcon, false]; ImageCache[path, false] = image; From a1b5941039da7370ee3c69d2c90ec61d7859ce35 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 12:52:09 +0800 Subject: [PATCH 04/14] Improve WindowsThumbnailProvider --- .../Image/ThumbnailReader.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs b/Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs index b98ea50fe..fe389a331 100644 --- a/Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs +++ b/Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs @@ -12,7 +12,7 @@ using Windows.Win32.Graphics.Gdi; namespace Flow.Launcher.Infrastructure.Image { /// - /// Subclass of + /// Subclass of /// [Flags] public enum ThumbnailOptions @@ -33,6 +33,8 @@ namespace Flow.Launcher.Infrastructure.Image private static readonly HRESULT S_ExtractionFailed = (HRESULT)0x8004B200; + private static readonly HRESULT S_PATHNOTFOUND = (HRESULT)0x8004B205; + public static BitmapSource GetThumbnail(string fileName, int width, int height, ThumbnailOptions options) { HBITMAP hBitmap = GetHBitmap(Path.GetFullPath(fileName), width, height, options); @@ -79,9 +81,10 @@ namespace Flow.Launcher.Infrastructure.Image { imageFactory.GetImage(size, (SIIGBF)options, &hBitmap); } - catch (COMException ex) when (ex.HResult == S_ExtractionFailed && options == ThumbnailOptions.ThumbnailOnly) + catch (COMException ex) when (options == ThumbnailOptions.ThumbnailOnly && + (ex.HResult == S_PATHNOTFOUND || ex.HResult == S_ExtractionFailed)) { - // Fallback to IconOnly if ThumbnailOnly fails + // Fallback to IconOnly if extraction fails or files cannot be found imageFactory.GetImage(size, (SIIGBF)ThumbnailOptions.IconOnly, &hBitmap); } catch (FileNotFoundException) when (options == ThumbnailOptions.ThumbnailOnly) @@ -89,6 +92,11 @@ namespace Flow.Launcher.Infrastructure.Image // Fallback to IconOnly if files cannot be found imageFactory.GetImage(size, (SIIGBF)ThumbnailOptions.IconOnly, &hBitmap); } + catch (System.Exception ex) + { + // Handle other exceptions + throw new InvalidOperationException("Failed to get thumbnail", ex); + } } finally { From 83fa654e2733ef28af1bef3d4f85ac607b1000b9 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 12:59:58 +0800 Subject: [PATCH 05/14] Improve constant name --- Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs b/Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs index fe389a331..4ce0df026 100644 --- a/Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs +++ b/Flow.Launcher.Infrastructure/Image/ThumbnailReader.cs @@ -31,7 +31,7 @@ namespace Flow.Launcher.Infrastructure.Image private static readonly Guid GUID_IShellItem = typeof(IShellItem).GUID; - private static readonly HRESULT S_ExtractionFailed = (HRESULT)0x8004B200; + private static readonly HRESULT S_EXTRACTIONFAILED = (HRESULT)0x8004B200; private static readonly HRESULT S_PATHNOTFOUND = (HRESULT)0x8004B205; @@ -82,7 +82,7 @@ namespace Flow.Launcher.Infrastructure.Image imageFactory.GetImage(size, (SIIGBF)options, &hBitmap); } catch (COMException ex) when (options == ThumbnailOptions.ThumbnailOnly && - (ex.HResult == S_PATHNOTFOUND || ex.HResult == S_ExtractionFailed)) + (ex.HResult == S_PATHNOTFOUND || ex.HResult == S_EXTRACTIONFAILED)) { // Fallback to IconOnly if extraction fails or files cannot be found imageFactory.GetImage(size, (SIIGBF)ThumbnailOptions.IconOnly, &hBitmap); From 81007f79aee6ca7671880afaa8e329e99bacb9f4 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:18:06 +0800 Subject: [PATCH 06/14] Remove mvvm command for code quality --- Flow.Launcher/ViewModel/RelayCommand.cs | 29 ---------- .../Flow.Launcher.Plugin.Explorer.csproj | 1 + .../ViewModels/RelayCommand.cs | 27 --------- .../ViewModels/SettingsViewModel.cs | 55 +++++++------------ .../Views/ExplorerSettings.xaml | 6 +- 5 files changed, 24 insertions(+), 94 deletions(-) delete mode 100644 Flow.Launcher/ViewModel/RelayCommand.cs delete mode 100644 Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/RelayCommand.cs diff --git a/Flow.Launcher/ViewModel/RelayCommand.cs b/Flow.Launcher/ViewModel/RelayCommand.cs deleted file mode 100644 index e8d4af8b5..000000000 --- a/Flow.Launcher/ViewModel/RelayCommand.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Windows.Input; - -namespace Flow.Launcher.ViewModel -{ - public class RelayCommand : ICommand - { - private readonly Action _action; - - public RelayCommand(Action action) - { - _action = action; - } - - public virtual bool CanExecute(object parameter) - { - return true; - } - -#pragma warning disable CS0067 // the event is never used - public event EventHandler CanExecuteChanged; -#pragma warning restore CS0067 - - public virtual void Execute(object parameter) - { - _action?.Invoke(parameter); - } - } -} diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj index 549217027..f13460d3f 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj @@ -46,6 +46,7 @@ + diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/RelayCommand.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/RelayCommand.cs deleted file mode 100644 index ff704b679..000000000 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/RelayCommand.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Windows.Input; - -namespace Flow.Launcher.Plugin.Explorer.ViewModels -{ - internal class RelayCommand : ICommand - { - private Action _action; - - public RelayCommand(Action action) - { - _action = action; - } - - public virtual bool CanExecute(object parameter) - { - return true; - } - - public event EventHandler CanExecuteChanged; - - public virtual void Execute(object parameter) - { - _action?.Invoke(parameter); - } - } -} diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs index 407300924..cf9ebd33f 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs @@ -1,9 +1,4 @@ #nullable enable -using Flow.Launcher.Plugin.Explorer.Search; -using Flow.Launcher.Plugin.Explorer.Search.Everything; -using Flow.Launcher.Plugin.Explorer.Search.Everything.Exceptions; -using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks; -using Flow.Launcher.Plugin.Explorer.Views; using System; using System.Collections.Generic; using System.Diagnostics; @@ -13,11 +8,16 @@ using System.IO; using System.Linq; using System.Windows; using System.Windows.Forms; -using System.Windows.Input; +using CommunityToolkit.Mvvm.Input; +using Flow.Launcher.Plugin.Explorer.Search; +using Flow.Launcher.Plugin.Explorer.Search.Everything; +using Flow.Launcher.Plugin.Explorer.Search.Everything.Exceptions; +using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks; +using Flow.Launcher.Plugin.Explorer.Views; namespace Flow.Launcher.Plugin.Explorer.ViewModels { - public class SettingsViewModel : BaseModel + public partial class SettingsViewModel : BaseModel { public Settings Settings { get; set; } @@ -36,7 +36,6 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels InitializeActionKeywordModels(); } - public void Save() { Context.API.SaveSettingJsonStorage(); @@ -48,7 +47,6 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels private EnumBindingModel _selectedContentSearchEngine; private EnumBindingModel _selectedPathEnumerationEngine; - public EnumBindingModel SelectedIndexSearchEngine { get => _selectedIndexSearchEngine; @@ -261,8 +259,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels public ActionKeywordModel? SelectedActionKeyword { get; set; } - public ICommand EditActionKeywordCommand => new RelayCommand(EditActionKeyword); - + [RelayCommand] private void EditActionKeyword(object obj) { if (SelectedActionKeyword is not { } actionKeyword) @@ -307,12 +304,6 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels public AccessLink? SelectedQuickAccessLink { get; set; } public AccessLink? SelectedIndexSearchExcludedPath { get; set; } - - - public ICommand RemoveLinkCommand => new RelayCommand(RemoveLink); - public ICommand EditLinkCommand => new RelayCommand(EditLink); - public ICommand AddLinkCommand => new RelayCommand(AddLink); - public void AppendLink(string containerName, AccessLink link) { var container = containerName switch @@ -324,6 +315,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels container.Add(link); } + [RelayCommand] private void EditLink(object commandParameter) { var (selectedLink, collection) = commandParameter switch @@ -360,7 +352,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels Context.API.ShowMsgBox(warning); } - + [RelayCommand] private void AddLink(object commandParameter) { var container = commandParameter switch @@ -385,6 +377,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels container.Add(newAccessLink); } + [RelayCommand] private void RemoveLink(object obj) { if (obj is not string container) return; @@ -435,7 +428,6 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels return path; } - internal static void OpenWindowsIndexingOptions() { var psi = new ProcessStartInfo @@ -448,39 +440,35 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels Process.Start(psi); } - private ICommand? _openFileEditorPathCommand; - - public ICommand OpenFileEditorPath => _openFileEditorPathCommand ??= new RelayCommand(_ => + [RelayCommand] + private void OpenFileEditorPath() { var path = PromptUserSelectPath(ResultType.File, Settings.EditorPath != null ? Path.GetDirectoryName(Settings.EditorPath) : null); if (path is null) return; FileEditorPath = path; - }); + } - private ICommand? _openFolderEditorPathCommand; - - public ICommand OpenFolderEditorPath => _openFolderEditorPathCommand ??= new RelayCommand(_ => + [RelayCommand] + private void OpenFolderEditorPath() { var path = PromptUserSelectPath(ResultType.File, Settings.FolderEditorPath != null ? Path.GetDirectoryName(Settings.FolderEditorPath) : null); if (path is null) return; FolderEditorPath = path; - }); + } - private ICommand? _openShellPathCommand; - - public ICommand OpenShellPath => _openShellPathCommand ??= new RelayCommand(_ => + [RelayCommand] + private void OpenShellPath() { var path = PromptUserSelectPath(ResultType.File, Settings.EditorPath != null ? Path.GetDirectoryName(Settings.EditorPath) : null); if (path is null) return; ShellPath = path; - }); - + } public string FileEditorPath { @@ -537,7 +525,6 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels } } - #region Everything FastSortWarning public Visibility FastSortWarningVisibility @@ -593,7 +580,5 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels } #endregion - - } } diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml index 6ca7be84d..e5999da41 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml @@ -245,7 +245,7 @@ Margin="{StaticResource SettingPanelItemLeftMargin}" HorizontalAlignment="Left" VerticalAlignment="Center" - Command="{Binding OpenFileEditorPath}" + Command="{Binding OpenFileEditorPathCommand}" Content="{DynamicResource select}" /> @@ -272,7 +272,7 @@ Margin="{StaticResource SettingPanelItemLeftMargin}" HorizontalAlignment="Left" VerticalAlignment="Center" - Command="{Binding OpenFolderEditorPath}" + Command="{Binding OpenFolderEditorPathCommand}" Content="{DynamicResource select}" /> @@ -299,7 +299,7 @@ Margin="{StaticResource SettingPanelItemLeftMargin}" HorizontalAlignment="Left" VerticalAlignment="Center" - Command="{Binding OpenShellPath}" + Command="{Binding OpenShellPathCommand}" Content="{DynamicResource select}" /> From 1e603ea20f800704b939ccf1941a8d14d8274f73 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:21:00 +0800 Subject: [PATCH 07/14] Code quality --- .../Helper/SortOptionTranslationHelper.cs | 2 +- .../Views/ActionKeywordSetting.xaml.cs | 3 +++ .../Views/ExplorerSettings.xaml.cs | 12 +++--------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Helper/SortOptionTranslationHelper.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Helper/SortOptionTranslationHelper.cs index 0a3a2ae43..72f58f5b6 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Helper/SortOptionTranslationHelper.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Helper/SortOptionTranslationHelper.cs @@ -16,7 +16,7 @@ public static class SortOptionTranslationHelper ArgumentNullException.ThrowIfNull(API); var enumName = Enum.GetName(sortOption); - var splited = enumName.Split('_'); + var splited = enumName!.Split('_'); var name = string.Join('_', splited[..^1]); var direction = splited[^1]; diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs index 73c35b1c8..000b2558d 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs @@ -85,6 +85,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views DialogResult = false; Close(); } + private void TxtCurrentActionKeyword_OnKeyDown(object sender, KeyEventArgs e) { if (e.Key == Key.Enter) @@ -94,11 +95,13 @@ namespace Flow.Launcher.Plugin.Explorer.Views e.Handled = true; } } + public event PropertyChangedEventHandler PropertyChanged; protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null) { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } + private bool SetField(ref T field, T value, [CallerMemberName] string propertyName = null) { if (EqualityComparer.Default.Equals(field, value)) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs index b7f5efc3c..9203ece9a 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs @@ -1,11 +1,10 @@ -using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks; -using Flow.Launcher.Plugin.Explorer.ViewModels; -using System.Collections.Generic; -using System.ComponentModel; +using System.ComponentModel; using System.IO; using System.Linq; using System.Windows; using System.Windows.Controls; +using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks; +using Flow.Launcher.Plugin.Explorer.ViewModels; using DataFormats = System.Windows.DataFormats; using DragDropEffects = System.Windows.DragDropEffects; using DragEventArgs = System.Windows.DragEventArgs; @@ -19,9 +18,6 @@ namespace Flow.Launcher.Plugin.Explorer.Views { private readonly SettingsViewModel viewModel; - private List actionKeywordsListView; - - public ExplorerSettings(SettingsViewModel viewModel) { DataContext = viewModel; @@ -39,8 +35,6 @@ namespace Flow.Launcher.Plugin.Explorer.Views lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending)); } - - private void AccessLinkDragDrop(string containerName, DragEventArgs e) { var files = (string[])e.Data.GetData(DataFormats.FileDrop); From 1d16b30b64924af0b51dedf4d6f7f9186e9d1984 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:22:22 +0800 Subject: [PATCH 08/14] Suppress async void --- Flow.Launcher/Msg.xaml.cs | 1 + .../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs | 4 ++++ .../SearchSourceSetting.xaml.cs | 2 ++ 3 files changed, 7 insertions(+) diff --git a/Flow.Launcher/Msg.xaml.cs b/Flow.Launcher/Msg.xaml.cs index 110235cb5..923c3692f 100644 --- a/Flow.Launcher/Msg.xaml.cs +++ b/Flow.Launcher/Msg.xaml.cs @@ -59,6 +59,7 @@ namespace Flow.Launcher Close(); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")] public async void Show(string title, string subTitle, string iconPath) { tbTitle.Text = title; diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs index c42bd4f30..deb110698 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs @@ -146,6 +146,7 @@ namespace Flow.Launcher.Plugin.Program.Views programSourceView.Items.Refresh(); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")] private async void ReIndexing() { ViewRefresh(); @@ -183,6 +184,7 @@ namespace Flow.Launcher.Plugin.Program.Views EditProgramSource(selectedProgramSource); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")] private async void EditProgramSource(ProgramSource selectedProgramSource) { if (selectedProgramSource == null) @@ -277,6 +279,7 @@ namespace Flow.Launcher.Plugin.Program.Views } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")] private async void btnLoadAllProgramSource_OnClick(object sender, RoutedEventArgs e) { await ProgramSettingDisplay.DisplayAllProgramsAsync(); @@ -284,6 +287,7 @@ namespace Flow.Launcher.Plugin.Program.Views ViewRefresh(); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")] private async void btnProgramSourceStatus_OnClick(object sender, RoutedEventArgs e) { var selectedItems = programSourceView diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs index 58577dbc1..b44f130e4 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs @@ -28,6 +28,7 @@ namespace Flow.Launcher.Plugin.WebSearch Initialize(sources, context, Action.Add); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")] private async void Initialize(IList sources, PluginInitContext context, Action action) { InitializeComponent(); @@ -124,6 +125,7 @@ namespace Flow.Launcher.Plugin.WebSearch } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "")] private async void OnSelectIconClick(object sender, RoutedEventArgs e) { const string filter = "Image files (*.jpg, *.jpeg, *.gif, *.png, *.bmp) |*.jpg; *.jpeg; *.gif; *.png; *.bmp"; From abee9ba01550f3371c2018b5d50e97a9d8f5f3a7 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:24:25 +0800 Subject: [PATCH 09/14] Fix nullable warning --- .../ViewModels/ActionKeywordModel.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs index 2f614ead8..d4cd1348e 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs @@ -1,13 +1,15 @@ using System.ComponentModel; using System.Runtime.CompilerServices; +#nullable enable + namespace Flow.Launcher.Plugin.Explorer.Views { public class ActionKeywordModel : INotifyPropertyChanged { - private static Settings _settings; + private static Settings _settings = null!; - public event PropertyChangedEventHandler PropertyChanged; + public event PropertyChangedEventHandler? PropertyChanged; public static void Init(Settings settings) { @@ -54,4 +56,4 @@ namespace Flow.Launcher.Plugin.Explorer.Views } } } -} \ No newline at end of file +} From 113bc589bda874eeba207d867032d0465cd12e43 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:24:41 +0800 Subject: [PATCH 10/14] Remove unused variable --- Flow.Launcher/ReportWindow.xaml.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Flow.Launcher/ReportWindow.xaml.cs b/Flow.Launcher/ReportWindow.xaml.cs index 0ab785a17..24801cf52 100644 --- a/Flow.Launcher/ReportWindow.xaml.cs +++ b/Flow.Launcher/ReportWindow.xaml.cs @@ -15,8 +15,6 @@ namespace Flow.Launcher { internal partial class ReportWindow { - private static readonly string ClassName = nameof(ReportWindow); - public ReportWindow(Exception exception) { InitializeComponent(); From 5df56334eee4b0647803755d5713042a1e1c1ba7 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:28:47 +0800 Subject: [PATCH 11/14] Code quality --- .../Helper/ShellContextMenu.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Helper/ShellContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Helper/ShellContextMenu.cs index abb76580d..58b4e86f9 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Helper/ShellContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Helper/ShellContextMenu.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Text; using System.Runtime.InteropServices; using System.Drawing; @@ -341,7 +341,7 @@ namespace Peter return null; } - IShellFolder oParentFolder = GetParentFolder(arrFI[0].Parent.FullName); + IShellFolder oParentFolder = GetParentFolder(arrFI[0].Parent!.FullName); if (null == oParentFolder) { return null; @@ -1535,7 +1535,7 @@ namespace Peter m_hookType, m_filterFunc, IntPtr.Zero, - (int)AppDomain.GetCurrentThreadId()); + Environment.CurrentManagedThreadId); } // ************************************************************************ From 222ef41c8f755fc76109f9c9f040863f583ec1ca Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:29:26 +0800 Subject: [PATCH 12/14] Fix nullabl warnings --- .../Search/EnvironmentVariables.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/EnvironmentVariables.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/EnvironmentVariables.cs index e526fb85a..6c4e6a3ed 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/EnvironmentVariables.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/EnvironmentVariables.cs @@ -47,7 +47,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search foreach (DictionaryEntry special in Environment.GetEnvironmentVariables()) { - var path = special.Value.ToString(); + var path = special.Value!.ToString(); // we add a trailing slash to the path to make sure drive paths become valid absolute paths. // for example, if %systemdrive% is C: we turn it to C:\ path = path.EnsureTrailingSlash(); @@ -61,7 +61,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search { // Variables are returned with a mixture of all upper/lower case. // Call ToUpper() to make the results look consistent - _envStringPaths.Add(special.Key.ToString().ToUpper(), path); + _envStringPaths.Add(special.Key.ToString()!.ToUpper(), path); } } } From a3daac66ecc997020e13e4924c2a9318acdd080e Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:30:46 +0800 Subject: [PATCH 13/14] Code quality --- Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs index 22de4fcc0..f4c103ade 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs @@ -1,8 +1,8 @@ -using System.Windows.Navigation; +using System.Windows.Navigation; using CommunityToolkit.Mvvm.DependencyInjection; using Flow.Launcher.SettingPages.ViewModels; -using Page = ModernWpf.Controls.Page; using Flow.Launcher.Infrastructure.UserSettings; +using Page = ModernWpf.Controls.Page; namespace Flow.Launcher.SettingPages.Views; From 476829045d8eb9cbec9faae7fa4f298f65c3cfa8 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 15 Apr 2025 13:36:32 +0800 Subject: [PATCH 14/14] Adjust code comments --- .../Flow.Launcher.Plugin.Explorer.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj index f13460d3f..98164f489 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj @@ -45,8 +45,8 @@ - +