Skip to content

Commit e320ca1

Browse files
committed
Add support for deleting plugin settings when uninstalling plugins
1 parent 6cf7674 commit e320ca1

File tree

5 files changed

+34
-11
lines changed

5 files changed

+34
-11
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Flow.Launcher.Plugin.SharedCommands;
1515
using System.Text.Json;
1616
using Flow.Launcher.Core.Resource;
17+
using Flow.Launcher.Infrastructure.Storage;
1718

1819
namespace Flow.Launcher.Core.Plugin
1920
{
@@ -439,7 +440,7 @@ public static bool PluginModified(string uuid)
439440
public static void UpdatePlugin(PluginMetadata existingVersion, UserPlugin newVersion, string zipFilePath)
440441
{
441442
InstallPlugin(newVersion, zipFilePath, checkModified:false);
442-
UninstallPlugin(existingVersion, removeSettings:false, checkModified:false);
443+
UninstallPlugin(existingVersion, removeSettings:false, removePluginSettings:false, checkModified: false);
443444
_modifiedPlugins.Add(existingVersion.ID);
444445
}
445446

@@ -454,9 +455,9 @@ public static void InstallPlugin(UserPlugin plugin, string zipFilePath)
454455
/// <summary>
455456
/// Uninstall a plugin.
456457
/// </summary>
457-
public static void UninstallPlugin(PluginMetadata plugin, bool removeSettings = true)
458+
public static void UninstallPlugin(PluginMetadata plugin, bool removeSettings = true, bool removePluginSettings = false)
458459
{
459-
UninstallPlugin(plugin, removeSettings, true);
460+
UninstallPlugin(plugin, removeSettings, removePluginSettings, true);
460461
}
461462

462463
#endregion
@@ -529,7 +530,7 @@ internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool c
529530
}
530531
}
531532

532-
internal static void UninstallPlugin(PluginMetadata plugin, bool removeSettings, bool checkModified)
533+
internal static void UninstallPlugin(PluginMetadata plugin, bool removeSettings, bool removePluginSettings, bool checkModified)
533534
{
534535
if (checkModified && PluginModified(plugin.ID))
535536
{
@@ -542,6 +543,18 @@ internal static void UninstallPlugin(PluginMetadata plugin, bool removeSettings,
542543
AllPlugins.RemoveAll(p => p.Metadata.ID == plugin.ID);
543544
}
544545

546+
if (removePluginSettings)
547+
{
548+
var assemblyLoader = new PluginAssemblyLoader(plugin.ExecuteFilePath);
549+
var assembly = assemblyLoader.LoadAssemblyAndDependencies();
550+
var assemblyName = assembly.GetName().Name;
551+
var directoryPath = Path.Combine(DataLocation.DataDirectory(), JsonStorage<object>.DirectoryName, Constant.Plugins, assemblyName);
552+
if (Directory.Exists(directoryPath))
553+
{
554+
Directory.Delete(directoryPath, true);
555+
}
556+
}
557+
545558
// Marked for deletion. Will be deleted on next start up
546559
using var _ = File.CreateText(Path.Combine(plugin.PluginDirectory, "NeedDelete.txt"));
547560

Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<system:String x:Key="plugin_pluginsmanager_installing_plugin">Installing Plugin</system:String>
1616
<system:String x:Key="plugin_pluginsmanager_install_from_web">Download and install {0}</system:String>
1717
<system:String x:Key="plugin_pluginsmanager_uninstall_title">Plugin Uninstall</system:String>
18+
<system:String x:Key="plugin_pluginsmanager_keep_plugin_settings_title">Keep plugin settings</system:String>
19+
<system:String x:Key="plugin_pluginsmanager_keep_plugin_settings_subtitle">Do you want to keep the settings of the plugin for the next usage?</system:String>
1820
<system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin {0} successfully installed. Restarting Flow, please wait...</system:String>
1921
<system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Unable to find the plugin.json metadata file from the extracted zip file.</system:String>
2022
<system:String x:Key="plugin_pluginsmanager_install_error_duplicate">Error: A plugin which has the same or greater version with {0} already exists.</system:String>
@@ -37,13 +39,13 @@
3739
<system:String x:Key="plugin_pluginsmanager_update_success_restart">Plugin {0} successfully updated. Restarting Flow, please wait...</system:String>
3840
<system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning_title">Installing from an unknown source</system:String>
3941
<system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning">You are installing this plugin from an unknown source and it may contain potential risks!{0}{0}Please ensure you understand where this plugin is from and that it is safe.{0}{0}Would you like to continue still?{0}{0}(You can switch off this warning via settings)</system:String>
40-
42+
4143
<system:String x:Key="plugin_pluginsmanager_install_success_no_restart">Plugin {0} successfully installed. Please restart Flow.</system:String>
4244
<system:String x:Key="plugin_pluginsmanager_uninstall_success_no_restart">Plugin {0} successfully uninstalled. Please restart Flow.</system:String>
4345
<system:String x:Key="plugin_pluginsmanager_update_success_no_restart">Plugin {0} successfully updated. Please restart Flow.</system:String>
4446
<system:String x:Key="plugin_pluginsmanager_update_all_success_no_restart">{0} plugins successfully updated. Please restart Flow.</system:String>
4547
<system:String x:Key="plugin_pluginsmanager_plugin_modified_error">Plugin {0} has already been modified. Please restart Flow before making any further changes.</system:String>
46-
48+
4749
<!-- Plugin Infos -->
4850
<system:String x:Key="plugin_pluginsmanager_plugin_name">Plugins Manager</system:String>
4951
<system:String x:Key="plugin_pluginsmanager_plugin_description">Management of installing, uninstalling or updating Flow Launcher plugins</system:String>

Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/zh-cn.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<system:String x:Key="plugin_pluginsmanager_installing_plugin">正在安装插件</system:String>
1414
<system:String x:Key="plugin_pluginsmanager_install_from_web">下载与安装 {0}</system:String>
1515
<system:String x:Key="plugin_pluginsmanager_uninstall_title">插件卸载</system:String>
16+
<system:String x:Key="plugin_pluginsmanager_keep_plugin_settings_title">保留插件设置</system:String>
17+
<system:String x:Key="plugin_pluginsmanager_keep_plugin_settings_subtitle">你希望保留插件设置以便于下次使用吗?</system:String>
1618
<system:String x:Key="plugin_pluginsmanager_install_success_restart">插件安装成功。正在重新启动 Flow Launcher,请稍候...</system:String>
1719
<system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">安装失败:无法从新插件中找到plugin.json元数据文件</system:String>
1820
<system:String x:Key="plugin_pluginsmanager_install_error_duplicate">错误:具有相同或更高版本的 {0} 的插件已经存在。</system:String>
@@ -35,13 +37,13 @@
3537
<system:String x:Key="plugin_pluginsmanager_update_success_restart">插件{0}更新成功。正在重新启动 Flow Launcher,请稍候...</system:String>
3638
<system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning_title">从未知源安装</system:String>
3739
<system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning">您正在从未知源安装此插件,它可能包含潜在风险!{0}{0}请确保您了解来源以及安全性。{0}{0}您想要继续吗?{0}{0}(您可以通过设置关闭此警告)</system:String>
38-
40+
3941
<system:String x:Key="plugin_pluginsmanager_install_success_no_restart">成功安装插件{0}。请重新启动 Flow Launcher。</system:String>
4042
<system:String x:Key="plugin_pluginsmanager_uninstall_success_no_restart">成功卸载插件{0}。请重新启动 Flow Launcher。</system:String>
4143
<system:String x:Key="plugin_pluginsmanager_update_success_no_restart">成功更新插件{0}。请重新启动 Flow Launcher。</system:String>
4244
<system:String x:Key="plugin_pluginsmanager_update_all_success_no_restart">插件 {0} 更新成功。请重新启动 Flow Launcher。</system:String>
4345
<system:String x:Key="plugin_pluginsmanager_plugin_modified_error">插件 {0} 已被修改。请在进行任何进一步更改之前重新启动Flow。</system:String>
44-
46+
4547
<!-- Plugin Infos -->
4648
<system:String x:Key="plugin_pluginsmanager_plugin_name">插件管理</system:String>
4749
<system:String x:Key="plugin_pluginsmanager_plugin_description">安装,卸载或更新 Flow Launcher 插件</system:String>

Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/zh-tw.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<system:String x:Key="plugin_pluginsmanager_installing_plugin">Installing Plugin</system:String>
1414
<system:String x:Key="plugin_pluginsmanager_install_from_web">下載並安裝 {0}</system:String>
1515
<system:String x:Key="plugin_pluginsmanager_uninstall_title">解除安裝擴充功能</system:String>
16+
<system:String x:Key="plugin_pluginsmanager_keep_plugin_settings_title">保留插件設置</system:String>
17+
<system:String x:Key="plugin_pluginsmanager_keep_plugin_settings_subtitle">你希望保留插件設置以便於下次使用嗎?</system:String>
1618
<system:String x:Key="plugin_pluginsmanager_install_success_restart">外掛安裝成功。正在重啟 Flow,請稍後...</system:String>
1719
<system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Unable to find the plugin.json metadata file from the extracted zip file.</system:String>
1820
<system:String x:Key="plugin_pluginsmanager_install_error_duplicate">Error: A plugin which has the same or greater version with {0} already exists.</system:String>
@@ -35,13 +37,13 @@
3537
<system:String x:Key="plugin_pluginsmanager_update_success_restart">Plugin {0} successfully updated. Restarting Flow, please wait...</system:String>
3638
<system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning_title">Installing from an unknown source</system:String>
3739
<system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning">You are installing this plugin from an unknown source and it may contain potential risks!{0}{0}Please ensure you understand where this plugin is from and that it is safe.{0}{0}Would you like to continue still?{0}{0}(You can switch off this warning via settings)</system:String>
38-
40+
3941
<system:String x:Key="plugin_pluginsmanager_install_success_no_restart">Plugin {0} successfully installed. Please restart Flow.</system:String>
4042
<system:String x:Key="plugin_pluginsmanager_uninstall_success_no_restart">Plugin {0} successfully uninstalled. Please restart Flow.</system:String>
4143
<system:String x:Key="plugin_pluginsmanager_update_success_no_restart">Plugin {0} successfully updated. Please restart Flow.</system:String>
4244
<system:String x:Key="plugin_pluginsmanager_update_all_success_no_restart">{0} plugins successfully updated. Please restart Flow.</system:String>
4345
<system:String x:Key="plugin_pluginsmanager_plugin_modified_error">Plugin {0} has already been modified. Please restart Flow before making any further changes.</system:String>
44-
46+
4547
<!-- Plugin Infos -->
4648
<system:String x:Key="plugin_pluginsmanager_plugin_name">擴充功能管理</system:String>
4749
<system:String x:Key="plugin_pluginsmanager_plugin_description">Management of installing, uninstalling or updating Flow Launcher plugins</system:String>

Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,11 @@ private void Uninstall(PluginMetadata plugin)
682682
{
683683
try
684684
{
685-
PluginManager.UninstallPlugin(plugin, removeSettings: true);
685+
var removePluginSettings = Context.API.ShowMsgBox(
686+
Context.API.GetTranslation("plugin_pluginsmanager_keep_plugin_settings_subtitle"),
687+
Context.API.GetTranslation("plugin_pluginsmanager_keep_plugin_settings_title"),
688+
button: MessageBoxButton.YesNo) == MessageBoxResult.No;
689+
PluginManager.UninstallPlugin(plugin, removeSettings: true, removePluginSettings: removePluginSettings);
686690
}
687691
catch (ArgumentException e)
688692
{

0 commit comments

Comments
 (0)