Merge pull request #92 from CSC207-2022F-UofT/patch-install

Patch install

Author: jerryzhu509

src/main/java/org/hydev/mcpm/client/DatabaseManager.java

@@ -33,10 +33,11 @@ public class Downloader
      * @param url Remote file URL
      * @param to Local file path
      */
-    public void downloadFile(String url, File to)
+    public void downloadFile(String url, String to)
     {
         try (var client = HttpClients.createDefault())
         {
+            File fos = new File(to);
             var get = new HttpGet(url);
             var bytes = client.execute(get, (req) ->
             {
@@ -45,7 +46,7 @@ public void downloadFile(String url, File to)
                 var builder = new ByteArrayOutputStream((int) total);
 
                 // Create progress row
-                var row = new ProgressRow(total).desc(to.getName()).descLen(30);
+                var row = new ProgressRow(total).desc(fos.getName()).descLen(30);
                 bar.appendBar(row);
 
                 try (var stream = entity.getContent())
@@ -63,8 +64,12 @@ public void downloadFile(String url, File to)
 
                 return builder.toByteArray();
             });
-
-            Files.write(to.toPath(), bytes);
+            try {
+                Files.write(fos.toPath(), bytes);
+            }
+            catch (RuntimeException e) {
+                throw new RuntimeException(e);
+            }
         }
         catch (IOException e)
         {
@@ -79,7 +84,7 @@ public void downloadFile(String url, File to)
      *
      * @param urls Mapping of remote urls to local file paths
      */
-    public void downloadFiles(Map<String, File> urls)
+    public void downloadFiles(Map<String, String> urls)
     {
         try (ExecutorService executor = Executors.newFixedThreadPool(threads))
         {
@@ -91,7 +96,7 @@ public void downloadFiles(Map<String, File> urls)
                 {
                     executor.submit(() ->
                     {
-                        File to = urls.get(url);
+                        String to = urls.get(url);
                         downloadFile(url, to);
                     });
                 }
@@ -128,26 +133,34 @@ public static void main(String[] args)
     {
         // Remember to chang link to test
         String link = "https://sd.blackball.lv/library/Introduction_to_Algorithms_Third_Edition_(2009).pdf";
-        File out = new File("./Introduction_to_Algorithms_Third_Edition.pdf");
+        String out = "./Introduction_to_Algorithms_Third_Edition.pdf";
         String link1 = "https://www.iusb.edu/students/academic-success-programs/academic-centers-for-excellence/docs/Basic%20Math%20Review%20Card.pdf";
-        File out1 = new File("./Math.pdf");
+        String out1 = "./Math.pdf";
         String link2 = "https://ouopentextbooks.org/mathematics/files/2015/07/1503.pdf";
-        File out2 = new File("./1503");
+        String out2 = "./1503";
         String link3 = "https://faculty.math.illinois.edu/~aydin/math220/lecturenotes/m220_Sec1_4.pdf";
-        File out3 = new File("./m220_Sec1_4");
+        String out3 = "./m220_Sec1_4";
         String link4 = "https://ocw.mit.edu/ans7870/9/9.00SC/MIT9_00SCF11_text.pdf";
-        File out4 = new File("./MIT9_00SCF11_text");
+        String out4 = "./MIT9_00SCF11_text";
 
         final var downloader = new Downloader();
 
-        Map<String, File> urls = new HashMap<>();
+        Map<String, String> urls = new HashMap<>();
         urls.put(link, out);
         urls.put(link1, out1);
         urls.put(link2, out2);
         urls.put(link3, out3);
         urls.put(link4, out4);
         downloader.downloadFiles(urls);
-        out.delete();
-        out1.delete();
+        File outFile = new File(out);
+        outFile.delete();
+        File outFile1 = new File(out1);
+        outFile1.delete();
+        File outFile2 = new File(out2);
+        outFile2.delete();
+        File outFile3 = new File(out3);
+        outFile3.delete();
+        File outFile4 = new File(out4);
+        outFile4.delete();
     }
 }

src/main/java/org/hydev/mcpm/client/Downloader.java

@@ -1,6 +1,5 @@
 package org.hydev.mcpm.client.arguments;
 
-import org.hydev.mcpm.client.DatabaseManager;
 import org.hydev.mcpm.client.Downloader;
 import org.hydev.mcpm.client.arguments.parsers.CommandParser;
 import org.hydev.mcpm.client.arguments.parsers.ExportPluginsParser;
@@ -31,6 +30,7 @@
 import org.hydev.mcpm.client.commands.controllers.UpdateController;
 import org.hydev.mcpm.client.display.presenters.SearchPresenter;
 import org.hydev.mcpm.client.local.LocalPluginTracker;
+import org.hydev.mcpm.client.display.presenters.InstallPresenter;
 import org.hydev.mcpm.client.updater.CheckForUpdatesInteractor;
 import org.hydev.mcpm.client.list.ListAllInteractor;
 import org.hydev.mcpm.client.matcher.MatchPluginsInteractor;
@@ -77,8 +77,9 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var searcher = new SearchInteractor(fetcher, listener);
         var installer = new InstallInteractor(
             new SpigotPluginDownloader(new Downloader(), mirror.selectedMirrorSupplier()),
-            new DatabaseManager(superTracker, searcher),
-            loader
+            loader,
+            searcher,
+                superTracker
         );
         var matcher = new MatchPluginsInteractor(fetcher, listener);
         var updateChecker = new CheckForUpdatesInteractor(matcher);
@@ -96,6 +97,8 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var updateController = new UpdateController(updater);
         var refreshController = new RefreshController(fetcher, listener, mirror);
 
+        // Presenters
+        var installPresenter = new InstallPresenter();
         var searchPresenter = new SearchPresenter(pager);
 
         /*
@@ -109,7 +112,7 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
             new SearchParser(searchController, searchPresenter),
             new MirrorParser(mirrorController),
             new InfoParser(infoController),
-            new InstallParser(installController),
+            new InstallParser(installController, installPresenter),
             new RefreshParser(refreshController),
             new PageParser(pager),
             new UninstallParser(uninstallController),

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

@@ -4,17 +4,21 @@
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import org.hydev.mcpm.client.commands.controllers.InstallController;
-import org.hydev.mcpm.client.display.presenters.InstallPresenter;
 import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
+import org.hydev.mcpm.client.display.presenters.InstallPresenter;
+import org.hydev.mcpm.client.installer.InstallInteractor;
+import org.hydev.mcpm.client.installer.input.InstallInput;
+import org.hydev.mcpm.client.installer.output.InstallResult;
 import org.hydev.mcpm.client.search.SearchPackagesType;
 
+import java.util.List;
 import java.util.function.Consumer;
 
 /**
  * Handles parsing install arguments (to be dispatched to Controller).
  */
 
-public record InstallParser(InstallController controller) implements CommandParser
+public record InstallParser(InstallController controller, InstallResultPresenter presenter) implements CommandParser
 {
     @Override
     public String name() {
@@ -37,12 +41,10 @@ public void configure(Subparser parser) {
     @Override
     public void run(Namespace details, Consumer<String> log) {
         var name = details.getString("name");
-        InstallResultPresenter installResultPresent = new InstallPresenter(log);
-
-        controller.install(name,
-            SearchPackagesType.BY_NAME,
-            !details.getBoolean("noLoad"),
-            installResultPresent
-        );
+        List<InstallResult> result = controller.install(name,
+                                                        SearchPackagesType.BY_NAME,
+                                                        !details.getBoolean("noLoad"));
+        presenter.displayResult(result, log);
     }
 }
+

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

@@ -3,7 +3,6 @@
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
-
 import org.hydev.mcpm.client.commands.controllers.UpdateController;
 import org.hydev.mcpm.client.display.presenters.LogUpdatePresenter;
 import org.hydev.mcpm.client.display.presenters.InstallPresenter;
@@ -54,14 +53,11 @@ public void run(Namespace details, Consumer<String> log) {
         // and I don't want UpdatePresenter to depend on Consumer<String>,
         // I'll instantiate this every call.
         var presenter = new LogUpdatePresenter(log);
-        InstallResultPresenter installPresenter = new InstallPresenter(log);
-
         controller.update(
             details.getList("names"),
             details.getBoolean("load"),
             details.getBoolean("no-cache"),
-            presenter,
-            installPresenter
+            presenter
         );
     }
 }

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

@@ -1,9 +1,11 @@
 package org.hydev.mcpm.client.commands.controllers;
 
+import org.hydev.mcpm.client.installer.output.InstallResult;
 import org.hydev.mcpm.client.search.SearchPackagesType;
 import org.hydev.mcpm.client.installer.InstallBoundary;
 import org.hydev.mcpm.client.installer.input.InstallInput;
-import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
+
+import java.util.List;
 
 /**
  * Controller class for the installation use case.
@@ -16,10 +18,10 @@ public record InstallController(InstallBoundary boundary)
      * @param name Plugin name from repository
      * @param type The type of searching package
      * @param load Whether to load after installing
-     * @param resultPresenter display the state of the plugin
+     * @return Results
      */
-    public void install(String name, SearchPackagesType type, boolean load, InstallResultPresenter resultPresenter) {
+    public List<InstallResult> install(String name, SearchPackagesType type, boolean load) {
         var input = new InstallInput(name, type, load, true);
-        var output = boundary.installPlugin(input, resultPresenter);
+        return boundary.installPlugin(input);
     }
 }

src/main/java/org/hydev/mcpm/client/commands/controllers/InstallController.java

@@ -1,7 +1,6 @@
 package org.hydev.mcpm.client.commands.controllers;
 
 import org.hydev.mcpm.client.commands.presenters.UpdatePresenter;
-import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.updater.UpdateBoundary;
 import org.hydev.mcpm.client.updater.UpdateInput;
 
@@ -19,11 +18,9 @@ public record UpdateController(UpdateBoundary boundary) {
      * @param names A list of names to update.
      * @param load Whether to reload installed plugins (ignored on CLI environment).
      * @param noCache Whether to force fetch the database before updating.
-     * @param presenter A presenter object to format the update boundary result.
      */
-    public void update(List<String> names, boolean load, boolean noCache, UpdatePresenter presenter,
-                       InstallResultPresenter installResultPresenter) {
-        var input = new UpdateInput(names, load, noCache, installResultPresenter);
+    public void update(List<String> names, boolean load, boolean noCache, UpdatePresenter presenter) {
+        var input = new UpdateInput(names, load, noCache);
         var result = boundary.update(input);
 
         // This is being done in the Controller for this time being.

src/main/java/org/hydev/mcpm/client/commands/controllers/UpdateController.java

@@ -1,6 +1,9 @@
 package org.hydev.mcpm.client.commands.presenters;
 
-import org.hydev.mcpm.client.installer.InstallResult;
+import org.hydev.mcpm.client.installer.output.InstallResult;
+
+import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * Interface for presenting the state of plugins
@@ -10,8 +13,7 @@ public interface InstallResultPresenter {
     /**
      * Display the string to the console
      *
-     * @param installResult state of the installation
-     * @param name Description of plugin state
+     * @param results Resulting state of the installation
      */
-    void displayResult(InstallResult installResult, String name);
+    void displayResult(List<InstallResult> results, Consumer<String> log);
 }