Recursive result

Author: aanushkasharma

src/main/java/org/hydev/mcpm/client/uninstall/UninstallResult.java

@@ -1,14 +1,23 @@
 package org.hydev.mcpm.client.uninstall;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Result for uninstalling
  *
+ * @param state State of uninstall
+ * @param dependencies States for uninstall dependencies
  * @author Anushka (https://github.com/aanushkasharma)
  * @since 2022-11-27
  */
-public record UninstallResult(State state)
-{
+public record UninstallResult(State state, Map<String, State> dependencies) {
+    public UninstallResult(State state) {
+        this(state, new HashMap<>());
+    }
+
     public enum State {
+        NOT_FOUND,
         FAILED_TO_DELETE,
         SUCCESS
     }

src/main/java/org/hydev/mcpm/client/uninstall/Uninstaller.java

@@ -7,8 +7,7 @@
 
 import java.io.File;
 
-import static org.hydev.mcpm.client.uninstall.UninstallResult.State.FAILED_TO_DELETE;
-import static org.hydev.mcpm.client.uninstall.UninstallResult.State.SUCCESS;
+import static org.hydev.mcpm.client.uninstall.UninstallResult.State.*;
 
 
 /**
@@ -28,7 +27,7 @@ public Uninstaller(PluginTracker tracker, UnloadBoundary unloader, LocalJarBound
     }
 
     @Override
-    public UninstallResult uninstall(UninstallInput input) throws PluginNotFoundException {
+    public UninstallResult uninstall(UninstallInput input) {
         // 1. Unload plugin
         // This will throw PluginNotFoundException if the plugin isn't loaded. If it is loaded,
         // this will return the jar of the currently loaded plugin, which is the most precise.
@@ -46,7 +45,12 @@ public UninstallResult uninstall(UninstallInput input) throws PluginNotFoundExce
         if (jar == null) {
             // This will throw PluginNotFoundException when a plugin of the name in the file system
             // could not be found.
-            jar = jarFinder.findJar(input.name());
+            try {
+                jar = jarFinder.findJar(input.name());
+            }
+            catch (PluginNotFoundException e) {
+                return new UninstallResult(NOT_FOUND);
+            }
         }
 
         // 3. Delete plugin jar
@@ -56,18 +60,24 @@ public UninstallResult uninstall(UninstallInput input) throws PluginNotFoundExce
 
         // 4. Remove manually installed flag from the tracker
         tracker.removeEntry(input.name());
+        var result = new UninstallResult(SUCCESS);
 
         // 5. Remove orphan dependencies
         if (input.recursive()) {
             var orphans = tracker.listOrphanPlugins(false);
             for (var orphan : orphans) {
-                try {
-                    uninstall(new UninstallInput(orphan, true));
+                var rec = uninstall(new UninstallInput(orphan, true));
+
+                // Recursive result
+                result.dependencies().put(orphan, rec.state());
+                for (var pair : rec.dependencies().entrySet()) {
+                    if (!result.dependencies().containsKey(pair.getKey())) {
+                        result.dependencies().put(pair.getKey(), pair.getValue());
+                    }
                 }
-                catch (PluginNotFoundException ignored) { }
             }
         }
 
-        return new UninstallResult(SUCCESS);
+        return result;
     }
 }