made Uninstall not refresh if they cancel

matryer · Mar 10, 2021 · c5aab48 · c5aab48
1 parent f5cef13
commit c5aab48
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/app/frontend/src/InstalledPluginView.svelte b/app/frontend/src/InstalledPluginView.svelte
@@ -112,7 +112,11 @@
 	function onUninstallClick() {
 		const done = wait()
 		uninstallPlugin(installedPlugin)
-			.then(() => {
+			.then((result) => {
+				if (result === false) {
+					// canceled
+					return 
+				}
 				clearNav()
 				location.hash = ''
 				refreshInstalledPlugins(installedPlugins)

diff --git a/app/frontend/src/backend/index.js b/app/frontend/src/backend/index.js
@@ -14,6 +14,13 @@ const backend = {
       },
     }
     "CommandService": {
+      /**
+       * ClearCache
+       * @returns {Promise} 
+       */
+      "ClearCache": () => {
+        return window.backend.main.CommandService.ClearCache();
+      },
       /**
        * OpenFile
        * @param {string} arg1 - Go Type: string
@@ -155,7 +162,7 @@ const backend = {
       /**
        * UninstallPlugin
        * @param {any} arg1 - Go Type: main.UninstallPluginRequest
-       * @returns {Promise<Error>}  - Go Type: error
+       * @returns {Promise<boolean|Error>}  - Go Type: bool
        */
       "UninstallPlugin": (arg1) => {
         return window.backend.main.PluginsService.UninstallPlugin(arg1);

diff --git a/app/plugins_service.go b/app/plugins_service.go
@@ -185,7 +185,7 @@ type UninstallPluginRequest struct {
 }
 
 // UninstallPlugin removes a plugin.
-func (p *PluginsService) UninstallPlugin(installedPluginInfo UninstallPluginRequest) error {
+func (p *PluginsService) UninstallPlugin(installedPluginInfo UninstallPluginRequest) (bool, error) {
 	defer p.OnRefresh()
 	p.osLock.Lock()
 	defer p.osLock.Unlock()
@@ -201,18 +201,18 @@ func (p *PluginsService) UninstallPlugin(installedPluginInfo UninstallPluginRequ
 		case "Uninstall":
 			// continue
 		case "Cancel":
-			return nil
+			return false, nil
 		}
 	}
 	installer := &plugins.Installer{
 		PluginDir: pluginDirectory,
 	}
 	err := installer.Uninstall(installedPluginInfo.Path)
 	if err != nil {
-		return errors.Wrap(err, "uninstall")
+		return false, errors.Wrap(err, "uninstall")
 	}
 	tickOS() // wait a beat
-	return nil
+	return true, nil
 }
 
 // InstalledPluginMetadata is the metadata extracted from an installed