Skip to content

Commit e3af882

Browse files
authored
Merge branch 'dev' into plugin_settings_cache_path
2 parents b0b1a26 + 87f765b commit e3af882

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2101
-1370
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,16 @@ public static void AddActionKeyword(string id, string newActionKeyword)
398398
NonGlobalPlugins[newActionKeyword] = plugin;
399399
}
400400

401+
// Update action keywords and action keyword in plugin metadata
401402
plugin.Metadata.ActionKeywords.Add(newActionKeyword);
403+
if (plugin.Metadata.ActionKeywords.Count > 0)
404+
{
405+
plugin.Metadata.ActionKeyword = plugin.Metadata.ActionKeywords[0];
406+
}
407+
else
408+
{
409+
plugin.Metadata.ActionKeyword = string.Empty;
410+
}
402411
}
403412

404413
/// <summary>
@@ -419,16 +428,15 @@ public static void RemoveActionKeyword(string id, string oldActionkeyword)
419428
if (oldActionkeyword != Query.GlobalPluginWildcardSign)
420429
NonGlobalPlugins.Remove(oldActionkeyword);
421430

422-
431+
// Update action keywords and action keyword in plugin metadata
423432
plugin.Metadata.ActionKeywords.Remove(oldActionkeyword);
424-
}
425-
426-
public static void ReplaceActionKeyword(string id, string oldActionKeyword, string newActionKeyword)
427-
{
428-
if (oldActionKeyword != newActionKeyword)
433+
if (plugin.Metadata.ActionKeywords.Count > 0)
434+
{
435+
plugin.Metadata.ActionKeyword = plugin.Metadata.ActionKeywords[0];
436+
}
437+
else
429438
{
430-
AddActionKeyword(id, newActionKeyword);
431-
RemoveActionKeyword(id, oldActionKeyword);
439+
plugin.Metadata.ActionKeyword = string.Empty;
432440
}
433441
}
434442

0 commit comments

Comments
 (0)