From 2bba75b27a0feefe6e645f5ef60b52e71fec15b3 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Wed, 19 Apr 2023 21:07:40 +0800 Subject: [PATCH 01/23] Print windows build number in log --- .../Exception/ExceptionFormatter.cs | 19 +++++++++++++++++-- Flow.Launcher/Helper/ErrorReporting.cs | 6 ++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs b/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs index 54c19c048..b853f885d 100644 --- a/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs +++ b/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Text; -using System.Xml; using Microsoft.Win32; namespace Flow.Launcher.Infrastructure.Exception @@ -63,7 +62,7 @@ namespace Flow.Launcher.Infrastructure.Exception sb.AppendLine($"* Command Line: {Environment.CommandLine}"); sb.AppendLine($"* Timestamp: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}"); sb.AppendLine($"* Flow Launcher version: {Constant.Version}"); - sb.AppendLine($"* OS Version: {Environment.OSVersion.VersionString}"); + sb.AppendLine($"* OS Version: {GetWindowsBuildVersionFromRegistry()}"); sb.AppendLine($"* IntPtr Length: {IntPtr.Size}"); sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}"); sb.AppendLine($"* Python Path: {Constant.PythonPath}"); @@ -173,5 +172,21 @@ namespace Flow.Launcher.Infrastructure.Exception } } + public static string GetWindowsBuildVersionFromRegistry() + { + try + { + using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\")) + { + var buildRevision = registryKey.GetValue("UBR").ToString(); + var currentBuild = registryKey.GetValue("CurrentBuild").ToString(); + return currentBuild + "." + buildRevision; + } + } + catch + { + return Environment.OSVersion.VersionString; + } + } } } diff --git a/Flow.Launcher/Helper/ErrorReporting.cs b/Flow.Launcher/Helper/ErrorReporting.cs index a7ce7444c..db5a11f74 100644 --- a/Flow.Launcher/Helper/ErrorReporting.cs +++ b/Flow.Launcher/Helper/ErrorReporting.cs @@ -3,8 +3,6 @@ using System.Windows.Threading; using NLog; using Flow.Launcher.Infrastructure; using Flow.Launcher.Infrastructure.Exception; -using NLog.Fluent; -using Log = Flow.Launcher.Infrastructure.Logger.Log; namespace Flow.Launcher.Helper { @@ -31,11 +29,11 @@ namespace Flow.Launcher.Helper //prevent application exist, so the user can copy prompted error info e.Handled = true; } - + public static string RuntimeInfo() { var info = $"\nFlow Launcher version: {Constant.Version}" + - $"\nOS Version: {Environment.OSVersion.VersionString}" + + $"\nOS Version: {ExceptionFormatter.GetWindowsBuildVersionFromRegistry()}" + $"\nIntPtr Length: {IntPtr.Size}" + $"\nx64: {Environment.Is64BitOperatingSystem}"; return info; From d1f4f88bc2ce233ed7bc33d5f0cf40784fb5de2a Mon Sep 17 00:00:00 2001 From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com> Date: Thu, 20 Apr 2023 11:37:25 +0800 Subject: [PATCH 02/23] Add function to get revision --- .../Exception/ExceptionFormatter.cs | 23 ++++++++++++++++--- Flow.Launcher/Helper/ErrorReporting.cs | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs b/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs index b853f885d..63f670c66 100644 --- a/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs +++ b/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs @@ -62,7 +62,7 @@ namespace Flow.Launcher.Infrastructure.Exception sb.AppendLine($"* Command Line: {Environment.CommandLine}"); sb.AppendLine($"* Timestamp: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}"); sb.AppendLine($"* Flow Launcher version: {Constant.Version}"); - sb.AppendLine($"* OS Version: {GetWindowsBuildVersionFromRegistry()}"); + sb.AppendLine($"* OS Version: {GetWindowsFullVersionFromRegistry()}"); sb.AppendLine($"* IntPtr Length: {IntPtr.Size}"); sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}"); sb.AppendLine($"* Python Path: {Constant.PythonPath}"); @@ -172,13 +172,14 @@ namespace Flow.Launcher.Infrastructure.Exception } } - public static string GetWindowsBuildVersionFromRegistry() + + public static string GetWindowsFullVersionFromRegistry() { try { using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\")) { - var buildRevision = registryKey.GetValue("UBR").ToString(); + var buildRevision = GetWindowsRevisionFromRegistry(); var currentBuild = registryKey.GetValue("CurrentBuild").ToString(); return currentBuild + "." + buildRevision; } @@ -188,5 +189,21 @@ namespace Flow.Launcher.Infrastructure.Exception return Environment.OSVersion.VersionString; } } + + public static string GetWindowsRevisionFromRegistry() + { + try + { + using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\")) + { + var buildRevision = registryKey.GetValue("UBR").ToString(); + return buildRevision; + } + } + catch + { + return "0"; + } + } } } diff --git a/Flow.Launcher/Helper/ErrorReporting.cs b/Flow.Launcher/Helper/ErrorReporting.cs index db5a11f74..b5da2efad 100644 --- a/Flow.Launcher/Helper/ErrorReporting.cs +++ b/Flow.Launcher/Helper/ErrorReporting.cs @@ -33,7 +33,7 @@ namespace Flow.Launcher.Helper public static string RuntimeInfo() { var info = $"\nFlow Launcher version: {Constant.Version}" + - $"\nOS Version: {ExceptionFormatter.GetWindowsBuildVersionFromRegistry()}" + + $"\nOS Version: {ExceptionFormatter.GetWindowsFullVersionFromRegistry()}" + $"\nIntPtr Length: {IntPtr.Size}" + $"\nx64: {Environment.Is64BitOperatingSystem}"; return info; From b74ea0071de712b22aab82328455bc49793ff784 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Thu, 20 Apr 2023 20:25:39 +0800 Subject: [PATCH 03/23] Use OSVersion.Version.Build to reduce registry access --- .../Exception/ExceptionFormatter.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs b/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs index 63f670c66..025109e58 100644 --- a/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs +++ b/Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs @@ -177,12 +177,9 @@ namespace Flow.Launcher.Infrastructure.Exception { try { - using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\")) - { - var buildRevision = GetWindowsRevisionFromRegistry(); - var currentBuild = registryKey.GetValue("CurrentBuild").ToString(); - return currentBuild + "." + buildRevision; - } + var buildRevision = GetWindowsRevisionFromRegistry(); + var currentBuild = Environment.OSVersion.Version.Build; + return currentBuild.ToString() + "." + buildRevision; } catch { From b3212a0b729ccdf7221f6f6279ac33b23c4a18f0 Mon Sep 17 00:00:00 2001 From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 21 Apr 2023 06:56:54 +0800 Subject: [PATCH 04/23] Fix Windows 11 notification error (#2073) * Fix Windows 11 22H2 (22621) notification error * Fix main thread issue of LegacyShow() * Mark RestarApp() as deprecated --- .github/actions/spelling/expect.txt | 6 ++++ .github/actions/spelling/patterns.txt | 3 ++ Flow.Launcher/Notification.cs | 44 +++++++++++++++++++++++---- Flow.Launcher/PublicAPIInstance.cs | 6 ++-- 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index 0df5228ba..2046057f5 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -21,6 +21,7 @@ Google Customise UWP uwp +Uwp Bokmal Bokm uninstallation @@ -88,3 +89,8 @@ Noresult wpftk mkv flac +IPublic +keyevent +KListener +requery +vkcode diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt index 2f4ff418d..903714aef 100644 --- a/.github/actions/spelling/patterns.txt +++ b/.github/actions/spelling/patterns.txt @@ -115,3 +115,6 @@ #http/https (?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|] + +# UWP +[Uu][Ww][Pp] diff --git a/Flow.Launcher/Notification.cs b/Flow.Launcher/Notification.cs index 57c1e88f2..64db5c213 100644 --- a/Flow.Launcher/Notification.cs +++ b/Flow.Launcher/Notification.cs @@ -1,7 +1,9 @@ using Flow.Launcher.Infrastructure; +using Flow.Launcher.Infrastructure.Logger; using Microsoft.Toolkit.Uwp.Notifications; using System; using System.IO; +using System.Windows; using Windows.Data.Xml.Dom; using Windows.UI.Notifications; @@ -17,8 +19,16 @@ namespace Flow.Launcher ToastNotificationManagerCompat.Uninstall(); } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "")] public static void Show(string title, string subTitle, string iconPath = null) + { + Application.Current.Dispatcher.Invoke(() => + { + ShowInternal(title, subTitle, iconPath); + }); + } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "")] + private static void ShowInternal(string title, string subTitle, string iconPath = null) { // Handle notification for win7/8/early win10 if (legacy) @@ -32,11 +42,33 @@ namespace Flow.Launcher ? Path.Combine(Constant.ProgramDirectory, "Images\\app.png") : iconPath; - new ToastContentBuilder() - .AddText(title, hintMaxLines: 1) - .AddText(subTitle) - .AddAppLogoOverride(new Uri(Icon)) - .Show(); + try + { + new ToastContentBuilder() + .AddText(title, hintMaxLines: 1) + .AddText(subTitle) + .AddAppLogoOverride(new Uri(Icon)) + .Show(); + } + catch (InvalidOperationException e) + { + // Temporary fix for the Windows 11 notification issue + // Possibly from 22621.1413 or 22621.1485, judging by post time of #2024 + Log.Exception("Flow.Launcher.Notification|Notification InvalidOperationException Error", e); + if (Environment.OSVersion.Version.Build >= 22621) + { + return; + } + else + { + throw; + } + } + catch (Exception e) + { + Log.Exception("Flow.Launcher.Notification|Notification Error", e); + throw; + } } private static void LegacyShow(string title, string subTitle, string iconPath) diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs index b2487693e..96c2ced23 100644 --- a/Flow.Launcher/PublicAPIInstance.cs +++ b/Flow.Launcher/PublicAPIInstance.cs @@ -68,6 +68,7 @@ namespace Flow.Launcher UpdateManager.RestartApp(Constant.ApplicationFileName); } + [Obsolete("Typo")] public void RestarApp() => RestartApp(); public void ShowMainWindow() => _mainVM.Show(); @@ -92,10 +93,7 @@ namespace Flow.Launcher public void ShowMsg(string title, string subTitle, string iconPath, bool useMainWindowAsOwner = true) { - Application.Current.Dispatcher.Invoke(() => - { - Notification.Show(title, subTitle, iconPath); - }); + Notification.Show(title, subTitle, iconPath); } public void OpenSettingDialog() From 42be53c0a984572eb0423da0f269586740b87adf Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 21 Apr 2023 09:07:42 +1000 Subject: [PATCH 05/23] version bump --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8d30f8d17..8d7a8c318 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '1.14.0.{build}' +version: '1.14.1.{build}' init: - ps: | From 0b4d68505a89a68896a239cf8de9a655a0c186dc Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Sat, 22 Apr 2023 23:46:22 +0800 Subject: [PATCH 06/23] Change issue URL to issue list Guide users to the issue list to see if there's any pinned issue and search first, instead of posting an issue immediately --- Flow.Launcher.Infrastructure/Constant.cs | 2 +- Flow.Launcher/ReportWindow.xaml.cs | 4 ++-- Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs index e23d2137e..393efc32e 100644 --- a/Flow.Launcher.Infrastructure/Constant.cs +++ b/Flow.Launcher.Infrastructure/Constant.cs @@ -19,7 +19,7 @@ namespace Flow.Launcher.Infrastructure public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString(); public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins); - public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues/new/choose"; + public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues"; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; public static readonly string Dev = "Dev"; public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips"; diff --git a/Flow.Launcher/ReportWindow.xaml.cs b/Flow.Launcher/ReportWindow.xaml.cs index 4899edc14..217f294c5 100644 --- a/Flow.Launcher/ReportWindow.xaml.cs +++ b/Flow.Launcher/ReportWindow.xaml.cs @@ -34,7 +34,7 @@ namespace Flow.Launcher return Constant.Issue; } var treeIndex = website.IndexOf("tree", StringComparison.Ordinal); - return treeIndex == -1 ? $"{website}/issues/new" : $"{website[..treeIndex]}/issues/new"; + return treeIndex == -1 ? $"{website}/issues" : $"{website[..treeIndex]}/issues"; } private void SetException(Exception exception) @@ -86,4 +86,4 @@ namespace Flow.Launcher return paragraph; } } -} \ No newline at end of file +} diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs index 37f0a126e..73627592a 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs @@ -53,7 +53,7 @@ namespace Flow.Launcher.Plugin.PluginsManager { // standard UrlSourceCode format in PluginsManifest's plugins.json file: https://github.com/jjw24/Flow.Launcher.Plugin.Putty/tree/master var link = pluginManifestInfo.UrlSourceCode.StartsWith("https://github.com") - ? Regex.Replace(pluginManifestInfo.UrlSourceCode, @"\/tree\/\w+$", "") + "/issues/new/choose" + ? Regex.Replace(pluginManifestInfo.UrlSourceCode, @"\/tree\/\w+$", "") + "/issues" : pluginManifestInfo.UrlSourceCode; Context.API.OpenUrl(link); From 21479431173344cf83bd7939410e999a9f986b32 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Sat, 22 Apr 2023 01:08:10 +0800 Subject: [PATCH 07/23] Fix API docstring format --- Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs index d9cf68469..19b69b015 100644 --- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs +++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs @@ -20,8 +20,8 @@ namespace Flow.Launcher.Plugin /// /// query text /// - /// force requery By default, Flow Launcher will not fire query if your query is same with existing one. - /// Set this to true to force Flow Launcher requerying + /// Force requery. By default, Flow Launcher will not fire query if your query is same with existing one. + /// Set this to to force Flow Launcher requerying /// void ChangeQuery(string query, bool requery = false); From 3ae656f456be00a5349738869aa8a1f64568a8c8 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 24 Apr 2023 00:45:38 +0800 Subject: [PATCH 08/23] Requery after killing a process --- .../Main.cs | 38 ++++++++++--------- .../ProcessHelper.cs | 2 +- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.ProcessKiller/Main.cs b/Plugins/Flow.Launcher.Plugin.ProcessKiller/Main.cs index 19f96aea1..3eff7e398 100644 --- a/Plugins/Flow.Launcher.Plugin.ProcessKiller/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.ProcessKiller/Main.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Diagnostics; -using System.Dynamic; -using System.Runtime.InteropServices; using Flow.Launcher.Infrastructure; -using Flow.Launcher.Infrastructure.Logger; +using System.Threading.Tasks; namespace Flow.Launcher.Plugin.ProcessKiller { @@ -23,13 +18,7 @@ namespace Flow.Launcher.Plugin.ProcessKiller public List Query(Query query) { - var termToSearch = query.Search; - - var processlist = processHelper.GetMatchingProcesses(termToSearch); - - return !processlist.Any() - ? null - : CreateResultsFromProcesses(processlist, termToSearch); + return CreateResultsFromQuery(query); } public string GetTranslatedPluginTitle() @@ -50,7 +39,7 @@ namespace Flow.Launcher.Plugin.ProcessKiller // get all non-system processes whose file path matches that of the given result (processPath) var similarProcesses = processHelper.GetSimilarProcesses(processPath); - if (similarProcesses.Count() > 0) + if (similarProcesses.Any()) { menuOptions.Add(new Result { @@ -72,8 +61,16 @@ namespace Flow.Launcher.Plugin.ProcessKiller return menuOptions; } - private List CreateResultsFromProcesses(List processlist, string termToSearch) + private List CreateResultsFromQuery(Query query) { + string termToSearch = query.Search; + var processlist = processHelper.GetMatchingProcesses(termToSearch); + + if (!processlist.Any()) + { + return null; + } + var results = new List(); foreach (var pr in processlist) @@ -92,6 +89,7 @@ namespace Flow.Launcher.Plugin.ProcessKiller Action = (c) => { processHelper.TryKill(p); + _ = DelayAndReQueryAsync(query.RawQuery); // Re-query after killing process to refresh process list return true; } }); @@ -116,7 +114,7 @@ namespace Flow.Launcher.Plugin.ProcessKiller { processHelper.TryKill(p.Process); } - + _ = DelayAndReQueryAsync(query.RawQuery); // Re-query after killing process to refresh process list return true; } }); @@ -124,5 +122,11 @@ namespace Flow.Launcher.Plugin.ProcessKiller return sortedResults; } + + private static async Task DelayAndReQueryAsync(string query) + { + await Task.Delay(500); + _context.API.ChangeQuery(query, true); + } } } diff --git a/Plugins/Flow.Launcher.Plugin.ProcessKiller/ProcessHelper.cs b/Plugins/Flow.Launcher.Plugin.ProcessKiller/ProcessHelper.cs index 16a8687e6..0932955d6 100644 --- a/Plugins/Flow.Launcher.Plugin.ProcessKiller/ProcessHelper.cs +++ b/Plugins/Flow.Launcher.Plugin.ProcessKiller/ProcessHelper.cs @@ -79,7 +79,7 @@ namespace Flow.Launcher.Plugin.ProcessKiller } catch (Exception e) { - Log.Exception($"|ProcessKiller.CreateResultsFromProcesses|Failed to kill process {p.ProcessName}", e); + Log.Exception($"{nameof(ProcessHelper)}", $"Failed to kill process {p.ProcessName}", e); } } From eaae3b9ee3953c0952780518630b5e8af1a337ab Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 24 Apr 2023 22:06:46 +0800 Subject: [PATCH 09/23] Save settings and image cache when closing main window --- Flow.Launcher/MainWindow.xaml.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 96b114dac..43bd9fd35 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -69,13 +69,11 @@ namespace Flow.Launcher _viewModel.ResultCopy(QueryTextBox.SelectedText); } } - + private async void OnClosing(object sender, CancelEventArgs e) { - _settings.WindowTop = Top; - _settings.WindowLeft = Left; _notifyIcon.Visible = false; - _viewModel.Save(); + App.API.SaveAppAllSettings(); e.Cancel = true; await PluginManager.DisposePluginsAsync(); Notification.Uninstall(); From 07c1a0b5a36ddae2aa7c613b81ab0c9735b98691 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 24 Apr 2023 22:58:32 +0800 Subject: [PATCH 10/23] Init ImageCache from disk --- Flow.Launcher.Infrastructure/Image/ImageCache.cs | 2 +- Flow.Launcher.Infrastructure/Image/ImageLoader.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher.Infrastructure/Image/ImageCache.cs b/Flow.Launcher.Infrastructure/Image/ImageCache.cs index e7b1f46f7..7a2b57637 100644 --- a/Flow.Launcher.Infrastructure/Image/ImageCache.cs +++ b/Flow.Launcher.Infrastructure/Image/ImageCache.cs @@ -28,7 +28,7 @@ namespace Flow.Launcher.Infrastructure.Image private const int permissibleFactor = 2; private SemaphoreSlim semaphore = new(1, 1); - public void Initialization(Dictionary<(string, bool), int> usage) + public void Initialize(Dictionary<(string, bool), int> usage) { foreach (var key in usage.Keys) { diff --git a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs index 0a51d56f9..fee2c60bd 100644 --- a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs +++ b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs @@ -40,6 +40,8 @@ namespace Flow.Launcher.Infrastructure.Image var usage = LoadStorageToConcurrentDictionary(); + ImageCache.Initialize(usage.ToDictionary(x => x.Key, x => x.Value)); + foreach (var icon in new[] { Constant.DefaultIcon, Constant.MissingImgIcon From d9b70e69f327689682cfe7760264d0b05b6b3f11 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Tue, 25 Apr 2023 22:38:36 +0800 Subject: [PATCH 11/23] Refactor save settings logic SettingWindowViewModel.Save() only saves Flow settings --- Flow.Launcher.Core/Plugin/PluginManager.cs | 3 +++ Flow.Launcher/PublicAPIInstance.cs | 5 ++++- Flow.Launcher/SettingWindow.xaml.cs | 1 + Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs index 3b4a6e445..f8c9a3f17 100644 --- a/Flow.Launcher.Core/Plugin/PluginManager.cs +++ b/Flow.Launcher.Core/Plugin/PluginManager.cs @@ -48,6 +48,9 @@ namespace Flow.Launcher.Core.Plugin } } + /// + /// Save json and ISavable + /// public static void Save() { foreach (var plugin in AllPlugins) diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs index 80addcbee..636699ad0 100644 --- a/Flow.Launcher/PublicAPIInstance.cs +++ b/Flow.Launcher/PublicAPIInstance.cs @@ -77,7 +77,7 @@ namespace Flow.Launcher public void SaveAppAllSettings() { - SavePluginSettings(); + PluginManager.Save(); _mainVM.Save(); _settingsVM.Save(); ImageLoader.Save(); @@ -158,6 +158,9 @@ namespace Flow.Launcher private readonly ConcurrentDictionary _pluginJsonStorages = new(); + /// + /// Save plugin settings. + /// public void SavePluginSettings() { foreach (var value in _pluginJsonStorages.Values) diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index f39974142..b80208a0c 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -226,6 +226,7 @@ namespace Flow.Launcher settings.SettingWindowTop = Top; settings.SettingWindowLeft = Left; viewModel.Save(); + API.SavePluginSettings(); } private void OnCloseExecuted(object sender, ExecutedRoutedEventArgs e) diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 9bdf2db4d..47a5cd672 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -133,6 +133,9 @@ namespace Flow.Launcher.ViewModel } } + /// + /// Save Flow settings. Plugins settings are not included. + /// public void Save() { foreach (var vm in PluginViewModels) @@ -143,7 +146,6 @@ namespace Flow.Launcher.ViewModel Settings.PluginSettings.Plugins[id].Priority = vm.Priority; } - PluginManager.Save(); _storage.Save(); } From 8637c03bda281585a77132485eb10ae15bc3681f Mon Sep 17 00:00:00 2001 From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:27:26 +0800 Subject: [PATCH 12/23] Fallback to legacy for windows 22621 --- Flow.Launcher/Notification.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Flow.Launcher/Notification.cs b/Flow.Launcher/Notification.cs index 64db5c213..d858e5313 100644 --- a/Flow.Launcher/Notification.cs +++ b/Flow.Launcher/Notification.cs @@ -57,6 +57,7 @@ namespace Flow.Launcher Log.Exception("Flow.Launcher.Notification|Notification InvalidOperationException Error", e); if (Environment.OSVersion.Version.Build >= 22621) { + LegacyShow(title, subTitle, iconPath); return; } else From c251a276a70d6dbe53e6e9bc8a1a18be6ae2f963 Mon Sep 17 00:00:00 2001 From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:55:32 +0800 Subject: [PATCH 13/23] Test legacy show on win 11 --- Flow.Launcher/Notification.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Flow.Launcher/Notification.cs b/Flow.Launcher/Notification.cs index d858e5313..151d65ce4 100644 --- a/Flow.Launcher/Notification.cs +++ b/Flow.Launcher/Notification.cs @@ -36,6 +36,14 @@ namespace Flow.Launcher LegacyShow(title, subTitle, iconPath); return; } + + // Test LegacyShow() usability on win 11 22621 + // REMOVE BEFORE MERGING + if (Environment.OSVersion.Version.Build >= 22621) + { + LegacyShow(title, subTitle, iconPath); + return; + } // Using Windows Notification System var Icon = !File.Exists(iconPath) From 85a077f430953f3fe9d4fa3057bf3835b9af7652 Mon Sep 17 00:00:00 2001 From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 28 Apr 2023 13:52:16 +0800 Subject: [PATCH 14/23] Delete test code --- Flow.Launcher/Notification.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Flow.Launcher/Notification.cs b/Flow.Launcher/Notification.cs index 151d65ce4..d858e5313 100644 --- a/Flow.Launcher/Notification.cs +++ b/Flow.Launcher/Notification.cs @@ -36,14 +36,6 @@ namespace Flow.Launcher LegacyShow(title, subTitle, iconPath); return; } - - // Test LegacyShow() usability on win 11 22621 - // REMOVE BEFORE MERGING - if (Environment.OSVersion.Version.Build >= 22621) - { - LegacyShow(title, subTitle, iconPath); - return; - } // Using Windows Notification System var Icon = !File.Exists(iconPath) From dee74b842f7991f987e945f03e75c69c5e0124dd Mon Sep 17 00:00:00 2001 From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 28 Apr 2023 14:53:54 +0800 Subject: [PATCH 15/23] Catch exceptions and fallback --- Flow.Launcher/Notification.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Flow.Launcher/Notification.cs b/Flow.Launcher/Notification.cs index d858e5313..ccbd005ef 100644 --- a/Flow.Launcher/Notification.cs +++ b/Flow.Launcher/Notification.cs @@ -55,20 +55,12 @@ namespace Flow.Launcher // Temporary fix for the Windows 11 notification issue // Possibly from 22621.1413 or 22621.1485, judging by post time of #2024 Log.Exception("Flow.Launcher.Notification|Notification InvalidOperationException Error", e); - if (Environment.OSVersion.Version.Build >= 22621) - { - LegacyShow(title, subTitle, iconPath); - return; - } - else - { - throw; - } + LegacyShow(title, subTitle, iconPath); } catch (Exception e) { Log.Exception("Flow.Launcher.Notification|Notification Error", e); - throw; + LegacyShow(title, subTitle, iconPath); } } From 8ba881f05bcd7778499836e672dcfb4cfccb7dfa Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Mon, 1 May 2023 08:38:00 +1000 Subject: [PATCH 16/23] Change default query window position to cursor --- Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 7f62d82c8..43a68a2a6 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -240,7 +240,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings public bool HideWhenDeactivated { get; set; } = true; [JsonConverter(typeof(JsonStringEnumConverter))] - public SearchWindowScreens SearchWindowScreen { get; set; } = SearchWindowScreens.RememberLastLaunchLocation; + public SearchWindowScreens SearchWindowScreen { get; set; } = SearchWindowScreens.Cursor; [JsonConverter(typeof(JsonStringEnumConverter))] public SearchWindowAligns SearchWindowAlign { get; set; } = SearchWindowAligns.Center; From c5c7bf783c6f09ed044fc8a4343fa59685675c88 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Sat, 22 Apr 2023 18:16:14 +0800 Subject: [PATCH 17/23] Hide programs in startmenu/startup folder --- .../Flow.Launcher.Plugin.Program/Programs/Win32.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs index 6da6006ae..afde1ba1e 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs @@ -466,7 +466,10 @@ namespace Flow.Launcher.Plugin.Program.Programs .SelectMany(p => EnumerateProgramsInDir(p, suffixes)) .Distinct(); + var startupPaths = GetStartupPaths(); + var programs = ExceptDisabledSource(allPrograms) + .Where(x => !startupPaths.Any(startup => FilesFolders.PathContains(startup, x))) .Select(x => GetProgramFromPath(x, protocols)); return programs; } @@ -717,6 +720,14 @@ namespace Flow.Launcher.Plugin.Program.Programs return new[] { userStartMenu, commonStartMenu }; } + private static IEnumerable GetStartupPaths() + { + var userStartup = Environment.GetFolderPath(Environment.SpecialFolder.Startup); + var commonStartup = Environment.GetFolderPath(Environment.SpecialFolder.CommonStartup); + + return new[] { userStartup, commonStartup }; + } + public static void WatchProgramUpdate(Settings settings) { var paths = new List(); From 30a390a6e3875b32a7c86a155ca1587e760fd513 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 23:02:11 +0000 Subject: [PATCH 18/23] Bump NUnit3TestAdapter from 4.3.1 to 4.4.2 Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 4.3.1 to 4.4.2. - [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases) - [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V4.3.1...V4.4.2) --- updated-dependencies: - dependency-name: NUnit3TestAdapter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Flow.Launcher.Test/Flow.Launcher.Test.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher.Test/Flow.Launcher.Test.csproj b/Flow.Launcher.Test/Flow.Launcher.Test.csproj index 039947a9f..f5d9dea28 100644 --- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj +++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj @@ -1,4 +1,4 @@ - + net7.0-windows10.0.19041.0 @@ -50,7 +50,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From b04085f0ed1cbf78b0096bb50cf8b4faa94cf8dd Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 2 May 2023 11:25:04 +1000 Subject: [PATCH 19/23] New Crowdin updates (#2067) * New translations en.xaml (Chinese Simplified) [ci skip] * New translations en.xaml (Slovak) [ci skip] * New translations en.xaml (Portuguese) [ci skip] * New translations en.xaml (Chinese Traditional) [ci skip] * New translations en.xaml (Spanish, Latin America) [ci skip] * New translations en.xaml (Italian) [ci skip] * New translations en.xaml (Korean) [ci skip] * New translations en.xaml (Russian) [ci skip] * New translations en.xaml (Spanish (Modern)) [ci skip] --- Flow.Launcher/Languages/es-419.xaml | 2 +- Flow.Launcher/Languages/es.xaml | 2 +- Flow.Launcher/Languages/it.xaml | 2 +- Flow.Launcher/Languages/ko.xaml | 2 +- Flow.Launcher/Languages/pt-pt.xaml | 2 +- Flow.Launcher/Languages/ru.xaml | 2 +- Flow.Launcher/Languages/sk.xaml | 2 +- Flow.Launcher/Languages/zh-cn.xaml | 2 +- Flow.Launcher/Languages/zh-tw.xaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Flow.Launcher/Languages/es-419.xaml b/Flow.Launcher/Languages/es-419.xaml index a15c9088b..f7b7319f7 100644 --- a/Flow.Launcher/Languages/es-419.xaml +++ b/Flow.Launcher/Languages/es-419.xaml @@ -346,7 +346,7 @@ Atrás / Menú Contextual Navegación de Elemento Abrir Menú Contextual - Open Containing Folder + Abrir Carpeta Contenedora Run as Admin / Open Folder in Default File Manager Historial de Consultas Volver al Resultado en el Menú Contextual diff --git a/Flow.Launcher/Languages/es.xaml b/Flow.Launcher/Languages/es.xaml index b54c36a18..abb0cc217 100644 --- a/Flow.Launcher/Languages/es.xaml +++ b/Flow.Launcher/Languages/es.xaml @@ -110,7 +110,7 @@ Tienda de complementos - Nuevo lanzamiento + Nuevo(s) lanzamiento(s) Actualizado(s) recientemente Complementos Instalado(s) diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index bd5fc2de8..33870fb8d 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -346,7 +346,7 @@ Indietro / Menu contestuale Navigazione tra le voci Apri il menu di scelta rapida - Open Containing Folder + Apri cartella superiore Run as Admin / Open Folder in Default File Manager Cronologia Query Torna al risultato nel menu contestuale diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index 6eb7df95f..32b9db20e 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -346,7 +346,7 @@ 뒤로/ 콘텍스트 메뉴 아이템 이동 콘텍스트 메뉴 열기 - Open Containing Folder + 포함된 폴더 열기 Run as Admin / Open Folder in Default File Manager 검색 기록 콘텍스트 메뉴에서 뒤로 가기 diff --git a/Flow.Launcher/Languages/pt-pt.xaml b/Flow.Launcher/Languages/pt-pt.xaml index cb408da3f..c45b5ebc7 100644 --- a/Flow.Launcher/Languages/pt-pt.xaml +++ b/Flow.Launcher/Languages/pt-pt.xaml @@ -345,7 +345,7 @@ Queira por favor mover a pasta do seu perfil de {0} para {1} Recuar/Menu de contexto Navegação nos itens Abrir menu de contexto - Open Containing Folder + Abrir pasta do resultado Executar como administrador/Abrir pasta no gestor de ficheiros Histórico de consultas Voltar aos resultados no menu de contexto diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index e6f23a7b3..cb8bf5b22 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -346,7 +346,7 @@ Назад / контекстное меню Навигация по элементам Открыть контекстное меню - Open Containing Folder + Открыть папку с содержимым Запустить от имени администратора / Открыть папку в файловом менеджере по умолчанию История запросов Вернуться к результату в контекстном меню diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index 43085b4d7..8321ea6c5 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -346,7 +346,7 @@ Späť/kontextová ponuka Navigácia medzi položkami Otvoriť kontextovú ponuku - Open Containing Folder + Otvoriť umiestnenie priečinka Spustiť ako správca/Otvoriť priečinok v predvolenom správcovi súborov História dopytov Návrat na výsledky z kontextovej ponuky diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index 5a13da018..346077471 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -346,7 +346,7 @@ 返回/上下文菜单 选项导航 打开上下文菜单 - Open Containing Folder + 打开所在目录 以管理员身份运行/在默认文件管理器中打开文件夹 查询历史 返回查询界面 diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index 56fa67fc2..96c64879a 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -346,7 +346,7 @@ 返回 / 快捷選單 Item Navigation 打開選單 - Open Containing Folder + 開啟檔案位置 Run as Admin / Open Folder in Default File Manager 查詢歷史 Back to Result in Context Menu From ec42aa10eb1fab1af18ca3f02feb1e6037eaa966 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 3 May 2023 06:17:39 +1000 Subject: [PATCH 20/23] version bump Flow.Launcher.Plugin --- Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj index f3fc31ed8..28344cf46 100644 --- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj +++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj @@ -14,10 +14,10 @@ - 4.0.0 - 4.0.0 - 4.0.0 - 4.0.0 + 4.0.1 + 4.0.1 + 4.0.1 + 4.0.1 Flow.Launcher.Plugin Flow-Launcher MIT From 7e2a2db4c6f8a055987f5e667ce5edbe9210d9f9 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 3 May 2023 06:28:38 +1000 Subject: [PATCH 21/23] version bump plugins --- Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.Calculator/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.Program/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.Shell/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.Sys/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.Url/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json index 99f2b78b4..38334aa50 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json @@ -4,7 +4,7 @@ "Name": "Browser Bookmarks", "Description": "Search your browser bookmarks", "Author": "qianlifeng, Ioannis G.", - "Version": "3.1.0", + "Version": "3.1.1", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll", diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json b/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json index 5f27a088d..1f022d6bb 100644 --- a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json @@ -4,7 +4,7 @@ "Name": "Calculator", "Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)", "Author": "cxfksword", - "Version": "3.0.1", + "Version": "3.0.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll", diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json index c53ebb888..cd6a0986b 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json @@ -10,7 +10,7 @@ "Name": "Explorer", "Description": "Find and manage files and folders via Windows Search or Everything", "Author": "Jeremy Wu", - "Version": "3.0.1", + "Version": "3.1.0", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll", diff --git a/Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json b/Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json index f4a21f8e8..e8219c9d1 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json @@ -4,7 +4,7 @@ "Name": "Plugin Indicator", "Description": "Provides plugin action keyword suggestions", "Author": "qianlifeng", - "Version": "3.0.0", + "Version": "3.0.1", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.PluginIndicator.dll", diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json index 179add756..ccc219c7e 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json @@ -6,7 +6,7 @@ "Name": "Plugins Manager", "Description": "Management of installing, uninstalling or updating Flow Launcher plugins", "Author": "Jeremy Wu", - "Version": "3.0.1", + "Version": "3.0.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll", diff --git a/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json b/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json index 1a73d24e1..442724055 100644 --- a/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json @@ -4,7 +4,7 @@ "Name":"Process Killer", "Description":"Kill running processes from Flow", "Author":"Flow-Launcher", - "Version":"3.0.0", + "Version":"3.0.1", "Language":"csharp", "Website":"https://github.com/Flow-Launcher/Flow.Launcher.Plugin.ProcessKiller", "IcoPath":"Images\\app.png", diff --git a/Plugins/Flow.Launcher.Plugin.Program/plugin.json b/Plugins/Flow.Launcher.Plugin.Program/plugin.json index 2acf255eb..f407dba85 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Program/plugin.json @@ -4,7 +4,7 @@ "Name": "Program", "Description": "Search programs in Flow.Launcher", "Author": "qianlifeng", - "Version": "3.0.0", + "Version": "3.1.0", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll", diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json index 6b9e2e5e7..64f257d80 100644 --- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json @@ -4,7 +4,7 @@ "Name": "Shell", "Description": "Provide executing commands from Flow Launcher", "Author": "qianlifeng", - "Version": "3.0.1", + "Version": "3.0.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll", diff --git a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json index 842229e8e..2d91bfedf 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json @@ -4,7 +4,7 @@ "Name": "System Commands", "Description": "Provide System related commands. e.g. shutdown,lock, setting etc.", "Author": "qianlifeng", - "Version": "3.0.1", + "Version": "3.0.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll", diff --git a/Plugins/Flow.Launcher.Plugin.Url/plugin.json b/Plugins/Flow.Launcher.Plugin.Url/plugin.json index 105e10650..aad6cb0b7 100644 --- a/Plugins/Flow.Launcher.Plugin.Url/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Url/plugin.json @@ -4,7 +4,7 @@ "Name": "URL", "Description": "Open the typed URL from Flow Launcher", "Author": "qianlifeng", - "Version": "3.0.1", + "Version": "3.0.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Url.dll", diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json b/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json index d409177bd..ac477c501 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json @@ -26,7 +26,7 @@ "Name": "Web Searches", "Description": "Provide the web search ability", "Author": "qianlifeng", - "Version": "3.0.1", + "Version": "3.0.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.WebSearch.dll", diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json b/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json index 13bbf4d1b..f1d3a9a34 100644 --- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json @@ -4,7 +4,7 @@ "Description": "Search settings inside Control Panel and Settings App", "Name": "Windows Settings", "Author": "TobiasSekan", - "Version": "4.0.1", + "Version": "4.0.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.WindowsSettings.dll", From 956bafc44822c0dc0946c6afb6e16e960dd9058a Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 3 May 2023 06:29:53 +1000 Subject: [PATCH 22/23] version bump --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8d7a8c318..a3cc8ecfb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '1.14.1.{build}' +version: '1.15.0.{build}' init: - ps: | From 75dfb626710359d0322b7a35eb35bd4ff4a8131b Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 3 May 2023 07:02:30 +1000 Subject: [PATCH 23/23] update GitHub issue url constant variable and method names --- Flow.Launcher.Infrastructure/Constant.cs | 2 +- Flow.Launcher/ReportWindow.xaml.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs index 393efc32e..7a95b52d5 100644 --- a/Flow.Launcher.Infrastructure/Constant.cs +++ b/Flow.Launcher.Infrastructure/Constant.cs @@ -19,7 +19,7 @@ namespace Flow.Launcher.Infrastructure public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString(); public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins); - public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues"; + public const string IssuesUrl = "https://github.com/Flow-Launcher/Flow.Launcher/issues"; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; public static readonly string Dev = "Dev"; public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips"; diff --git a/Flow.Launcher/ReportWindow.xaml.cs b/Flow.Launcher/ReportWindow.xaml.cs index 217f294c5..a2e7a8562 100644 --- a/Flow.Launcher/ReportWindow.xaml.cs +++ b/Flow.Launcher/ReportWindow.xaml.cs @@ -23,7 +23,7 @@ namespace Flow.Launcher SetException(exception); } - private static string GetIssueUrl(string website) + private static string GetIssuesUrl(string website) { if (!website.StartsWith("https://github.com")) { @@ -31,7 +31,7 @@ namespace Flow.Launcher } if(website.Contains("Flow-Launcher/Flow.Launcher")) { - return Constant.Issue; + return Constant.IssuesUrl; } var treeIndex = website.IndexOf("tree", StringComparison.Ordinal); return treeIndex == -1 ? $"{website}/issues" : $"{website[..treeIndex]}/issues"; @@ -45,8 +45,8 @@ namespace Flow.Launcher var websiteUrl = exception switch { - FlowPluginException pluginException =>GetIssueUrl(pluginException.Metadata.Website), - _ => Constant.Issue + FlowPluginException pluginException =>GetIssuesUrl(pluginException.Metadata.Website), + _ => Constant.IssuesUrl };