[PR] Merge pull request #100 from CSC207-2022F-UofT/Uninstall-removingFiles

removing files in uninstall

Author: hykilpikonna

src/main/java/org/hydev/mcpm/client/arguments/ParserFactory.java

@@ -3,6 +3,7 @@
 import org.hydev.mcpm.client.arguments.parsers.*;
 import org.hydev.mcpm.client.display.presenters.InstallPresenter;
 import org.hydev.mcpm.client.display.presenters.SearchPresenter;
+import org.hydev.mcpm.client.display.presenters.UninstallPresenter;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -22,6 +23,7 @@ private ParserFactory() { }
     public static List<CommandParser> baseParsers(ControllerFactoryBoundary factory) {
         var searchPresenter = new SearchPresenter(factory.pageBoundary());
         var installPresenter = new InstallPresenter();
+        var uninstallPresenter = new UninstallPresenter();
 
         /*
          * Add general parsers to this list!
@@ -38,7 +40,7 @@ public static List<CommandParser> baseParsers(ControllerFactoryBoundary factory)
             new InstallParser(factory.installController(), installPresenter),
             new RefreshParser(factory.refreshController()),
             new PageParser(factory.pageBoundary()),
-            new UninstallParser(factory.uninstallController()),
+            new UninstallParser(factory.uninstallController(), uninstallPresenter),
             new UpdateParser(factory.updateController())
         );
     }

src/main/java/org/hydev/mcpm/client/arguments/parsers/UninstallParser.java

@@ -4,14 +4,16 @@
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import org.hydev.mcpm.client.commands.controllers.UninstallController;
-import org.hydev.mcpm.client.uninstall.UninstallResult;
+import org.hydev.mcpm.client.commands.presenters.UninstallResultPresenter;
 
 import java.util.function.Consumer;
 
 /**
  * Command parser for the uninstallation use case
  */
-public record UninstallParser(UninstallController controller) implements CommandParser {
+public record UninstallParser(UninstallController controller, UninstallResultPresenter presenter)
+    implements CommandParser
+{
     @Override
     public String name() {
         return "uninstall";
@@ -41,13 +43,6 @@ public void run(Namespace details, Consumer<String> log)
 
         // Uninstall
         var result = controller.uninstall(name, details.getBoolean("recursive"));
-
-        // Print result
-        if (result.state() == UninstallResult.State.FAILED_TO_DELETE) {
-            log.accept("&cFailed to delete plugin file");
-        }
-        if (result.state() == UninstallResult.State.SUCCESS) {
-            log.accept("&aPlugin " + name + " uninstalled successfully!");
-        }
+        presenter.displayResult(name, result, log);
     }
 }

src/main/java/org/hydev/mcpm/client/commands/presenters/ListResultPresenter.java

@@ -2,6 +2,9 @@
 
 import org.hydev.mcpm.client.list.ListResult;
 
+/**
+ * Presenter for the list command
+ */
 public interface ListResultPresenter {
     /**
      * Display the associated output to the console

src/main/java/org/hydev/mcpm/client/commands/presenters/UninstallResultPresenter.java

@@ -0,0 +1,18 @@
+package org.hydev.mcpm.client.commands.presenters;
+
+import org.hydev.mcpm.client.uninstall.UninstallResult;
+
+import java.util.function.Consumer;
+
+/**
+ * Interface for presenting uninstall result
+ */
+public interface UninstallResultPresenter {
+    /**
+     * Display uninstall result
+     *
+     * @param result Result
+     * @param log Logger
+     */
+    void displayResult(String name, UninstallResult result, Consumer<String> log);
+}

src/main/java/org/hydev/mcpm/client/display/presenters/ListPresenter.java

@@ -8,6 +8,9 @@
 
 import static org.hydev.mcpm.client.display.presenters.Table.tabulate;
 
+/**
+ * Presenter for the list result
+ */
 public class ListPresenter implements ListResultPresenter {
     private final Consumer<String> log;
 
@@ -34,8 +37,7 @@ public void displayResult(ListResult listResult) {
                 list.stream().map(p -> List.of("&a" + p.name(), "&e" + p.getFirstAuthor(), p.version())).toList(),
                 List.of(":Name", "Author", "Version:"));
 
-                this.log.accept(listResult.type().reason() + " (Parameter " + listResult.listType() + ")\n" + table);
-
+            this.log.accept(listResult.type().reason() + " (Parameter " + listResult.listType() + ")\n" + table);
         }
     }
 }

src/main/java/org/hydev/mcpm/client/display/presenters/UninstallPresenter.java

@@ -0,0 +1,34 @@
+package org.hydev.mcpm.client.display.presenters;
+
+import org.hydev.mcpm.client.commands.presenters.UninstallResultPresenter;
+import org.hydev.mcpm.client.uninstall.UninstallResult;
+
+import java.util.function.Consumer;
+
+/**
+ * Implementation of UninstallResultPresenter
+ */
+public class UninstallPresenter implements UninstallResultPresenter {
+    /**
+     * Display one result
+     *
+     * @param name Name of the plugin
+     * @param state State
+     * @param log Logger object
+     */
+    private void display(String name, UninstallResult.State state, Consumer<String> log) {
+        var prefix = "[" + name + "] ";
+        switch (state) {
+            case NOT_FOUND -> log.accept(prefix + "&cPlugin not found");
+            case FAILED_TO_DELETE -> log.accept(prefix + "&cFailed to delete plugin file");
+            case SUCCESS -> log.accept(prefix + "&aPlugin uninstalled successfully!");
+            default -> log.accept(state.name());
+        }
+    }
+
+    @Override
+    public void displayResult(String name, UninstallResult result, Consumer<String> log) {
+        display(name, result.state(), log);
+        result.dependencies().forEach((depName, depState) -> display(depName, depState, log));
+    }
+}

src/main/java/org/hydev/mcpm/client/list/ListAllInteractor.java

@@ -9,7 +9,8 @@
 /**
  * Implementation for the ListAll functionality
  */
-public record ListAllInteractor(PluginTracker pluginTracker, CheckForUpdatesBoundary checkForUpdatesBoundary) implements ListAllBoundary {
+public record ListAllInteractor(PluginTracker pluginTracker, CheckForUpdatesBoundary checkForUpdatesBoundary)
+    implements ListAllBoundary {
     /**
      * listAllInteractor interacts with the LocalPluginTracker to get the list of
      * plugins, according to a specified

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

@@ -11,7 +11,6 @@ public interface UnloadBoundary
      * Dynamically unload a local plugin through JVM reflections and classloader hacks
      *
      * @param name Loaded plugin name
-     * @return Jar file
      * @throws PluginNotFoundException If a loaded plugin of the name isn't found
      */
     File unloadPlugin(String name) throws PluginNotFoundException;

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

@@ -0,0 +1,15 @@
+package org.hydev.mcpm.client.uninstall;
+
+/**
+ * Interface for removing a file
+ */
+
+public interface FileRemove {
+    /**
+     * Remove file for given plugin (step 2 and 3 of Uninstaller use case)
+     *
+     * @param pluginName Name of the plugin to remove
+     * @return int 0 - true, 1 - NOT_FOUND, 2 - FAILED_TO_DELETE
+     */
+    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
+}