Merge branch 'dev' into PopupRedesign

Author: onesounds

Flow.Launcher.Core/Plugin/QueryBuilder.cs

@@ -10,35 +10,31 @@ public static class QueryBuilder
         public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalPlugins)
         {
             // replace multiple white spaces with one white space
-            var terms = text.Split(new[] { Query.TermSeperater }, StringSplitOptions.RemoveEmptyEntries);
+            var terms = text.Split(Query.TermSeparator, StringSplitOptions.RemoveEmptyEntries);
             if (terms.Length == 0)
             { // nothing was typed
                 return null;
             }
 
-            var rawQuery = string.Join(Query.TermSeperater, terms);
+            var rawQuery = string.Join(Query.TermSeparator, terms);
             string actionKeyword, search;
             string possibleActionKeyword = terms[0];
-            List<string> actionParameters;
+            string[] searchTerms;
+
             if (nonGlobalPlugins.TryGetValue(possibleActionKeyword, out var pluginPair) && !pluginPair.Metadata.Disabled)
             { // use non global plugin for query
                 actionKeyword = possibleActionKeyword;
-                actionParameters = terms.Skip(1).ToList();
-                search = actionParameters.Count > 0 ? rawQuery.Substring(actionKeyword.Length + 1) : string.Empty;
+                search = terms.Length > 1 ? rawQuery[(actionKeyword.Length + 1)..] : string.Empty;
+                searchTerms = terms[1..];
             }
             else
             { // non action keyword
                 actionKeyword = string.Empty;
                 search = rawQuery;
+                searchTerms = terms;
             }
 
-            var query = new Query
-            {
-                Terms = terms,
-                RawQuery = rawQuery,
-                ActionKeyword = actionKeyword,
-                Search = search
-            };
+            var query = new Query(rawQuery, search,terms, searchTerms, actionKeyword);
 
             return query;
         }

Flow.Launcher.Core/Resource/Theme.cs

@@ -145,11 +145,9 @@ private ResourceDictionary CurrentThemeResourceDictionary()
         public ResourceDictionary GetResourceDictionary()
         {
             var dict = CurrentThemeResourceDictionary();
-
-            Style queryBoxStyle = dict["QueryBoxStyle"] as Style;
-            Style querySuggestionBoxStyle = dict["QuerySuggestionBoxStyle"] as Style;
-
-            if (queryBoxStyle != null && querySuggestionBoxStyle != null)
+           
+            if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
+                dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
             {
                 var fontFamily = new FontFamily(Settings.QueryBoxFont);
                 var fontStyle = FontHelper.GetFontStyleFromInvariantStringOrNormal(Settings.QueryBoxFontStyle);
@@ -174,19 +172,22 @@ public ResourceDictionary GetResourceDictionary()
                 querySuggestionBoxStyle.Setters.Add(new Setter(TextBox.FontStretchProperty, fontStretch));
             }
 
-            Style resultItemStyle = dict["ItemTitleStyle"] as Style;
-            Style resultSubItemStyle = dict["ItemSubTitleStyle"] as Style;
-            Style resultItemSelectedStyle = dict["ItemTitleSelectedStyle"] as Style;
-            Style resultSubItemSelectedStyle = dict["ItemSubTitleSelectedStyle"] as Style;
-            if (resultItemStyle != null && resultSubItemStyle != null && resultSubItemSelectedStyle != null && resultItemSelectedStyle != null)
+            if (dict["ItemTitleStyle"] is Style resultItemStyle &&
+                dict["ItemSubTitleStyle"] is Style resultSubItemStyle &&
+                dict["ItemSubTitleSelectedStyle"] is Style resultSubItemSelectedStyle &&
+                dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle &&
+                dict["ItemHotkeyStyle"] is Style resultHotkeyItemStyle &&
+                dict["ItemHotkeySelectedStyle"] is Style resultHotkeyItemSelectedStyle)
             {
                 Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(Settings.ResultFont));
                 Setter fontStyle = new Setter(TextBlock.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(Settings.ResultFontStyle));
                 Setter fontWeight = new Setter(TextBlock.FontWeightProperty, FontHelper.GetFontWeightFromInvariantStringOrNormal(Settings.ResultFontWeight));
                 Setter fontStretch = new Setter(TextBlock.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(Settings.ResultFontStretch));
 
                 Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
-                Array.ForEach(new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle }, o => Array.ForEach(setters, p => o.Setters.Add(p)));
+                Array.ForEach(
+                    new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o 
+                    => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
 
             var windowStyle = dict["WindowStyle"] as Style;
@@ -236,17 +237,19 @@ private string GetThemePath(string themeName)
 
         public void AddDropShadowEffectToCurrentTheme()
         {
-            var dict = CurrentThemeResourceDictionary();
+            var dict = GetResourceDictionary();
 
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
-            var effectSetter = new Setter();
-            effectSetter.Property = Border.EffectProperty;
-            effectSetter.Value = new DropShadowEffect
+            var effectSetter = new Setter
             {
-                Opacity = 0.9,
-                ShadowDepth = 2,
-                BlurRadius = 15
+                Property = Border.EffectProperty,
+                Value = new DropShadowEffect
+                {
+                    Opacity = 0.4,
+                    ShadowDepth = 2,
+                    BlurRadius = 15
+                }
             };
 
             var marginSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.MarginProperty) as Setter;
@@ -261,7 +264,7 @@ public void AddDropShadowEffectToCurrentTheme()
             }
             else
             {
-                var baseMargin = (Thickness) marginSetter.Value;
+                var baseMargin = (Thickness)marginSetter.Value;
                 var newMargin = new Thickness(
                     baseMargin.Left + ShadowExtraMargin,
                     baseMargin.Top + ShadowExtraMargin,
@@ -282,8 +285,8 @@ public void RemoveDropShadowEffectFromCurrentTheme()
 
             var effectSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.EffectProperty) as Setter;
             var marginSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.MarginProperty) as Setter;
-            
-            if(effectSetter != null)
+
+            if (effectSetter != null)
             {
                 windowBorderStyle.Setters.Remove(effectSetter);
             }
@@ -371,11 +374,11 @@ private bool IsBlurTheme()
         private void SetWindowAccent(Window w, AccentState state)
         {
             var windowHelper = new WindowInteropHelper(w);
-            
+
             // this determines the width of the main query window
             w.Width = mainWindowWidth;
             windowHelper.EnsureHandle();
-            
+
             var accent = new AccentPolicy { AccentState = state };
             var accentStructSize = Marshal.SizeOf(accent);
 

Flow.Launcher.Core/Updater.cs

@@ -16,6 +16,7 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using System.Text.Json.Serialization;
+using System.Threading;
 
 namespace Flow.Launcher.Core
 {
@@ -28,21 +29,21 @@ public Updater(string gitHubRepository)
             GitHubRepository = gitHubRepository;
         }
 
-        public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
+        private SemaphoreSlim UpdateLock { get; } = new SemaphoreSlim(1);
+
+        public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
         {
+            await UpdateLock.WaitAsync();
             try
             {
-                UpdateInfo newUpdateInfo;
-
                 if (!silentUpdate)
                     api.ShowMsg(api.GetTranslation("pleaseWait"),
-                                api.GetTranslation("update_flowlauncher_update_check"));
+                        api.GetTranslation("update_flowlauncher_update_check"));
 
                 using var updateManager = await GitHubUpdateManager(GitHubRepository).ConfigureAwait(false);
 
-
                 // UpdateApp CheckForUpdate will return value only if the app is squirrel installed
-                newUpdateInfo = await updateManager.CheckForUpdate().NonNull().ConfigureAwait(false);
+                var newUpdateInfo = await updateManager.CheckForUpdate().NonNull().ConfigureAwait(false);
 
                 var newReleaseVersion = Version.Parse(newUpdateInfo.FutureReleaseEntry.Version.ToString());
                 var currentVersion = Version.Parse(Constant.Version);
@@ -58,7 +59,7 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
 
                 if (!silentUpdate)
                     api.ShowMsg(api.GetTranslation("update_flowlauncher_update_found"),
-                                api.GetTranslation("update_flowlauncher_updating"));
+                        api.GetTranslation("update_flowlauncher_updating"));
 
                 await updateManager.DownloadReleases(newUpdateInfo.ReleasesToApply).ConfigureAwait(false);
 
@@ -70,8 +71,8 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                     FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination);
                     if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination))
                         MessageBox.Show(string.Format(api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
-                                                      DataLocation.PortableDataPath,
-                                                      targetDestination));
+                            DataLocation.PortableDataPath,
+                            targetDestination));
                 }
                 else
                 {
@@ -87,12 +88,15 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                     UpdateManager.RestartApp(Constant.ApplicationFileName);
                 }
             }
-            catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException || e.InnerException is TimeoutException)
+            catch (Exception e) when (e is HttpRequestException or WebException or SocketException || e.InnerException is TimeoutException)
             {
                 Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
                 api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),
-                            api.GetTranslation("update_flowlauncher_check_connection"));
-                return;
+                    api.GetTranslation("update_flowlauncher_check_connection"));
+            }
+            finally
+            {
+                UpdateLock.Release();
             }
         }
 
@@ -115,13 +119,16 @@ private async Task<UpdateManager> GitHubUpdateManager(string repository)
             var uri = new Uri(repository);
             var api = $"https://api.github.com/repos{uri.AbsolutePath}/releases";
 
-            var jsonStream = await Http.GetStreamAsync(api).ConfigureAwait(false);
+            await using var jsonStream = await Http.GetStreamAsync(api).ConfigureAwait(false);
 
             var releases = await System.Text.Json.JsonSerializer.DeserializeAsync<List<GithubRelease>>(jsonStream).ConfigureAwait(false);
             var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
             var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
-
-            var client = new WebClient { Proxy = Http.WebProxy };
+            
+            var client = new WebClient
+            {
+                Proxy = Http.WebProxy
+            };
             var downloader = new FileDownloader(client);
 
             var manager = new UpdateManager(latestUrl, urlDownloader: downloader);

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -32,6 +32,7 @@ public string Language
         public string ResultFontStyle { get; set; }
         public string ResultFontWeight { get; set; }
         public string ResultFontStretch { get; set; }
+        public bool UseGlyphIcons { get; set; } = true;
 
 
         /// <summary>

Flow.Launcher.Plugin/Query.cs

@@ -1,4 +1,5 @@
-using System;
+using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -11,65 +12,74 @@ public Query() { }
         /// <summary>
         /// to allow unit tests for plug ins
         /// </summary>
-        public Query(string rawQuery, string search, string[] terms, string actionKeyword = "")
+        public Query(string rawQuery, string search, string[] terms, string[] searchTerms, string actionKeyword = "")
         {
             Search = search;
             RawQuery = rawQuery;
             Terms = terms;
+            SearchTerms = searchTerms;
             ActionKeyword = actionKeyword;
         }
 
         /// <summary>
         /// Raw query, this includes action keyword if it has
         /// We didn't recommend use this property directly. You should always use Search property.
         /// </summary>
-        public string RawQuery { get; internal set; }
+        public string RawQuery { get; internal init; }
 
         /// <summary>
         /// Search part of a query.
         /// This will not include action keyword if exclusive plugin gets it, otherwise it should be same as RawQuery.
         /// Since we allow user to switch a exclusive plugin to generic plugin, 
         /// so this property will always give you the "real" query part of the query
         /// </summary>
-        public string Search { get; internal set; }
+        public string Search { get; internal init; }
 
         /// <summary>
-        /// The raw query splited into a string array.
+        /// The search string split into a string array.
         /// </summary>
-        public string[] Terms { get; set; }
+        public string[] SearchTerms { get; init; }
+
+        /// <summary>
+        /// The raw query split into a string array
+        /// </summary>
+        [Obsolete("It may or may not include action keyword, which can be confusing. Use SearchTerms instead")]
+        public string[] Terms { get; init; }
 
         /// <summary>
         /// Query can be splited into multiple terms by whitespace
         /// </summary>
-        public const string TermSeperater = " ";
+        public const string TermSeparator = " ";
+
+        [Obsolete("Typo")]
+        public const string TermSeperater = TermSeparator;
         /// <summary>
         /// User can set multiple action keywords seperated by ';'
         /// </summary>
-        public const string ActionKeywordSeperater = ";";
+        public const string ActionKeywordSeparator = ";";
+
+        [Obsolete("Typo")]
+        public const string ActionKeywordSeperater = ActionKeywordSeparator;
+
 
         /// <summary>
         /// '*' is used for System Plugin
         /// </summary>
         public const string GlobalPluginWildcardSign = "*";
 
-        public string ActionKeyword { get; set; }
+        public string ActionKeyword { get; init; }
 
         /// <summary>
         /// Return first search split by space if it has
         /// </summary>
         public string FirstSearch => SplitSearch(0);
 
+        private string _secondToEndSearch;
+
         /// <summary>
         /// strings from second search (including) to last search
         /// </summary>
-        public string SecondToEndSearch
-        {
-            get
-            {
-                var index = string.IsNullOrEmpty(ActionKeyword) ? 1 : 2;
-                return string.Join(TermSeperater, Terms.Skip(index).ToArray());
-            }
-        }
+        public string SecondToEndSearch => SearchTerms.Length > 1 ? (_secondToEndSearch ??= string.Join(' ', SearchTerms[1..])) : "";
 
         /// <summary>
         /// Return second search split by space if it has
@@ -83,16 +93,9 @@ public string SecondToEndSearch
 
         private string SplitSearch(int index)
         {
-            try
-            {
-                return string.IsNullOrEmpty(ActionKeyword) ? Terms[index] : Terms[index + 1];
-            }
-            catch (IndexOutOfRangeException)
-            {
-                return string.Empty;
-            }
+            return index < SearchTerms.Length ? SearchTerms[index] : string.Empty;
         }
 
         public override string ToString() => RawQuery;
     }
-}
+}

Flow.Launcher/ActionKeywords.xaml.cs

@@ -30,7 +30,7 @@ public ActionKeywords(string pluginId, Settings settings, PluginViewModel plugin
 
         private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e)
         {
-            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeperater, plugin.Metadata.ActionKeywords.ToArray());
+            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, plugin.Metadata.ActionKeywords.ToArray());
             tbAction.Focus();
         }
 

Flow.Launcher/App.xaml.cs

@@ -129,12 +129,12 @@ private void AutoUpdates()
                     var timer = new Timer(1000 * 60 * 60 * 5);
                     timer.Elapsed += async (s, e) =>
                     {
-                        await _updater.UpdateApp(API);
+                        await _updater.UpdateAppAsync(API);
                     };
                     timer.Start();
 
                     // check updates on startup
-                    await _updater.UpdateApp(API);
+                    await _updater.UpdateAppAsync(API);
                 }
             });
         }