refactor: search functionality and update tooltips

Daydreamer-riri · Mar 29, 2024 · 9dc951d · 9dc951d
1 parent ff32ce2
commit 9dc951d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Community.PowerToys.Run.Plugin.WebSearchShortcut/Main.cs b/Community.PowerToys.Run.Plugin.WebSearchShortcut/Main.cs
@@ -192,7 +192,7 @@ public List<Result> Query(Query query, bool delayedExecution)
       {
         ResetSuggestionsCache();
       }
-      else if (item != null && !string.IsNullOrEmpty(item.SuggestionProvider) && item.IsDefault != true)
+      else if (item != null && !string.IsNullOrEmpty(item.SuggestionProvider))
       {
         results = ProcessItem(item, tokens, query, results);
       }
@@ -267,6 +267,7 @@ private Result GetResultForSelect(Item item, string args, Query query)
         IcoPath = item.IconPath ?? IconPath["Search"],
         Title = item.Name,
         SubTitle = $"Search using {item.Name}",
+        Score = 100,
         Action = _ =>
         {
           var newQuery = string.IsNullOrWhiteSpace(query.ActionKeyword)
@@ -292,7 +293,7 @@ private static Result GetResultForSearch(Item item, string search, Query query,
         ProgramArguments = arguments,
         Action = _ => OpenInBrowser(arguments),
         Score = isDefault ? 1001 : 1000,
-        ToolTipData = new ToolTipData("Open", $"{arguments}"),
+        ToolTipData = new ToolTipData("Open (Enter)", $"{arguments}"),
         ContextData = item,
       };
     }

diff --git a/Community.PowerToys.Run.Plugin.WebSearchShortcut/Storage.cs b/Community.PowerToys.Run.Plugin.WebSearchShortcut/Storage.cs
@@ -85,7 +85,7 @@ public WebSearchShortcutStorage(WebSearchShortcutSettings settings)
 
     /// <inheritdoc/>
     public IReadOnlyCollection<Item> GetRecords(string query) => Data.Values
-    .Where(x => x.IsDefault != true)
+    // .Where(x => x.IsDefault != true)
     .Where(x =>
         (x.Keyword?.Contains(query, StringComparison.InvariantCultureIgnoreCase) ?? false)
         || (x.Name?.Contains(query, StringComparison.InvariantCultureIgnoreCase) ?? false)
@@ -96,7 +96,7 @@ public IReadOnlyCollection<Item> GetRecords(string query) => Data.Values
     {
       key = key.Trim();
       return Data.Values
-      .Where(x => x.IsDefault != true)
+      // .Where(x => x.IsDefault != true)
       .FirstOrDefault(x =>
         (x.Name?.Equals(key, StringComparison.InvariantCultureIgnoreCase) ?? false)
         || (x.Keyword?.Equals(key, StringComparison.InvariantCultureIgnoreCase) ?? false)