Fix uninstall logic

Author: aanushkasharma

src/main/java/org/hydev/mcpm/client/loader/UnloadBoundary.java

@@ -13,5 +13,5 @@ public interface UnloadBoundary
      * @param name Loaded plugin name
      * @throws PluginNotFoundException If a loaded plugin of the name isn't found
      */
-    void unloadPlugin(String name) throws PluginNotFoundException;
+    File unloadPlugin(String name) throws PluginNotFoundException;
 }

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

@@ -1,13 +1,5 @@
 package org.hydev.mcpm.client.uninstall;
 
-import org.hydev.mcpm.client.injector.LocalJarBoundary;
-import org.hydev.mcpm.client.injector.PluginNotFoundException;
-
-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.NOT_FOUND;
-
 /**
  * Interface for removing a file
  */
@@ -18,6 +10,5 @@ public interface FileRemove {
      * @param pluginName
      * @return int 0 - true, 1 - NOT_FOUND, 2 - FAILED_TO_DELETE
      */
-    int removeFile(String pluginName);
-
+    FileRemoveResult removeFile(String pluginName);
 }

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

@@ -0,0 +1,11 @@
+package org.hydev.mcpm.client.uninstall;
+
+/**
+ * Result for removing a file
+ */
+public enum FileRemoveResult
+{
+    SUCCESS,
+    NOT_FOUND,
+    FAILED_TO_DELETE
+}

src/main/java/org/hydev/mcpm/client/uninstall/RemoveFile.java renamed to src/main/java/org/hydev/mcpm/client/uninstall/PluginRemover.java

@@ -1,36 +1,36 @@
 package org.hydev.mcpm.client.uninstall;
 
-import org.hydev.mcpm.client.injector.LocalJarBoundary;
-import org.hydev.mcpm.client.injector.PluginNotFoundException;
-import org.hydev.mcpm.client.uninstall.FileRemove;
+import org.hydev.mcpm.client.loader.LocalJarBoundary;
+import org.hydev.mcpm.client.loader.PluginNotFoundException;
 
 import java.io.File;
 
 /**
  * Removes file for FileRemove.java
  */
-public class RemoveFile implements FileRemove{
+public class PluginRemover implements FileRemove{
     private final LocalJarBoundary jarFinder;
 
-    public RemoveFile(LocalJarBoundary jarFinder) {
+    public PluginRemover(LocalJarBoundary jarFinder) {
         this.jarFinder = jarFinder;
     }
 
-    public int removeFile(String pluginName) {
+    @Override
+    public FileRemoveResult removeFile(String pluginName) {
         // 2. If it isn't loaded, find the plugin jar file in local file system
         // (This will throw PluginNotFoundException when a plugin of the name in the file system
         // could not be found).
         File jar = null;
         try {
             jar = jarFinder.findJar(pluginName);
         } catch (PluginNotFoundException e) {
-            return 1;
+            return FileRemoveResult.NOT_FOUND;
         }
 
         // 3. Delete plugin jar
         if (!jar.delete()) {
-            return 2;
+            return FileRemoveResult.FAILED_TO_DELETE;
         }
-        return 0;
+        return FileRemoveResult.SUCCESS;
     }
 }

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

@@ -5,10 +5,24 @@
  *
  * @param name Plugin name
  * @param recursive remove dependencies or not
+ * @param delete Whether to delete the file after unloading
  */
-public  record UninstallInput(
+public record UninstallInput(
     String name,
-    boolean recursive
-) { }
+    boolean recursive,
+    boolean delete
+)
+{
+    /**
+     * Default constructor with delete=true
+     *
+     * @param name Plugin name
+     * @param recursive remove dependencies or not
+     */
+    public UninstallInput(String name, boolean recursive)
+    {
+        this(name, recursive, true);
+    }
+}
 
 

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

@@ -1,16 +1,10 @@
 package org.hydev.mcpm.client.uninstall;
 
 import org.hydev.mcpm.client.database.tracker.PluginTracker;
-import org.hydev.mcpm.client.injector.LocalJarBoundary;
-import org.hydev.mcpm.client.injector.PluginNotFoundException;
-import org.hydev.mcpm.client.injector.UnloadBoundary;
-import org.hydev.mcpm.client.uninstall.FileRemove;
 import org.hydev.mcpm.client.loader.LocalJarBoundary;
 import org.hydev.mcpm.client.loader.PluginNotFoundException;
 import org.hydev.mcpm.client.loader.UnloadBoundary;
 
-import java.io.File;
-
 import static org.hydev.mcpm.client.uninstall.UninstallResult.State.*;
 
 
@@ -45,21 +39,32 @@ public UninstallResult uninstall(UninstallInput input)  {
         // found error here.
         if (unloader != null) {
             try {
-                unloader.unloadPlugin(input.name());
+                // In the minecraft server environment, we can find the exact jar of the loaded
+                // plugin because java's url class loader keeps track of jar file paths.
+                var jar = unloader.unloadPlugin(input.name());
+
+                // Delete file
+                if (input.delete() && !jar.delete()) {
+                    return new UninstallResult(FAILED_TO_DELETE);
+                }
             }
             catch (PluginNotFoundException ignored) { }
         }
-
-        // Steps 2. + 3.
-        RemoveFile fileRemover = new RemoveFile(jarFinder);
-
-        if (fileRemover.removeFile(input.name())==1) {
-            return new UninstallResult(NOT_FOUND);
-        } else if (fileRemover.removeFile(input.name())==2) {
-            return new UninstallResult(FAILED_TO_DELETE);
+        else if (input.delete())
+        {
+            // When unloader is not null, it means that we are in CLI environment, so we need to
+            // find the plugin of the name
+            PluginRemover fileRemover = new PluginRemover(jarFinder);
+
+            // Delete file
+            var deleteResult = fileRemover.removeFile(input.name());
+            if (deleteResult == FileRemoveResult.NOT_FOUND) {
+                return new UninstallResult(NOT_FOUND);
+            } else if (deleteResult == FileRemoveResult.FAILED_TO_DELETE) {
+                return new UninstallResult(FAILED_TO_DELETE);
+            }
         }
 
-
         // 4. Remove manually installed flag from the tracker
         tracker.removeEntry(input.name());
         var result = new UninstallResult(SUCCESS);