Merge from main

Author: jerryzhu509

bin/main/plugin.yml

@@ -1,12 +1,25 @@
 main: org.hydev.mcpm.SpigotEntry
 name: MCPM
-version: @version@
+version: '@version@'
 description: Minecraft Package Manager for Bukkit/Spiget Servers
 api-version: 1.18
-authors: [Hykilpikonna, 1whatleytay, MstrPikachu, kchprog, jerryzhu509, thudoan1706, aanushkasharma]
+authors: [Hykilpikonna, 1whatleytay, MstrPikachu, kchprog, jerryzhu509, thudoan1706,
+  aanushkasharma]
 website: https://github.com/CSC207-2022F-UofT/mcpm
 commands:
   mcpm:
     description: Minecraft package manager
-    usage: "View help: /mcpm -h"
+    usage: 'View help: /mcpm -h'
     permission: mcpm.use
+libraries:
+- net.sourceforge.argparse4j:argparse4j:0.9.0
+- org.apache.httpcomponents.client5:httpclient5-fluent:5.2-beta1
+- com.fasterxml.jackson.core:jackson-core:2.14.0
+- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.0
+- com.google.guava:guava:31.1-jre
+- org.jetbrains:annotations:23.0.0
+- org.fusesource.jansi:jansi:2.4.0
+- org.apache.commons:commons-lang3:3.12.0
+- com.opencsv:opencsv:5.7.1
+- com.github.luben:zstd-jni:1.5.2-5
+- io.airlift:aircompressor:0.21

bin/test/db.zst

@@ -44,6 +44,10 @@ public SearchPackagesResult getSearchResult(InstallInput input) {
      * @param pluginName The version of the installed plugin
      * */
     public boolean checkPluginInstalledByName(String pluginName) {
+        if (!localPluginTracker.findIfInLockByName(pluginName)) {
+            return false;
+        }
+
         List<PluginYml> pluginInstalled = localPluginTracker.listInstalled();
         for (PluginYml pluginYml : pluginInstalled) {
             if (pluginYml != null && pluginYml.name() != null && pluginYml.name().equals(pluginName)) {
@@ -65,7 +69,8 @@ public boolean checkPluginInstalledByVersion(PluginVersion pluginVersion) {
         for (PluginYml pluginYml : pluginInstalled) {
             if (pluginYml != null && pluginYml.version() != null &&
                     pluginYml.version().equals(version)) {
-                return true;
+                // Yes, if it is not in the plugin tracker lock file, we ignore.
+                return localPluginTracker.findIfInLockByName(pluginYml.name());
             }
         }
         return false;
@@ -76,10 +81,8 @@ public boolean checkPluginInstalledByVersion(PluginVersion pluginVersion) {
      *
      * @param pluginVersion The version of the installed plugin
      * */
-    public void addManualInstalled(PluginVersion pluginVersion, boolean isManuallyInstalled) {
-        String pluginName = pluginVersion.meta().name();
-        localPluginTracker.addEntry(pluginName, isManuallyInstalled || localPluginTracker.listManuallyInstalled()
-                .contains(pluginName));
-
+    public void addManualInstalled(long id, PluginVersion pluginVersion, boolean isManuallyInstalled) {
+        localPluginTracker.addEntry(pluginVersion.meta().name(),
+                isManuallyInstalled, pluginVersion.id(), id);
     }
 }

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

@@ -30,9 +30,9 @@
 import org.hydev.mcpm.client.commands.controllers.UnloadController;
 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.updater.CheckForUpdatesInteractor;
 import org.hydev.mcpm.client.list.ListAllInteractor;
-import org.hydev.mcpm.client.local.LocalPluginTracker;
 import org.hydev.mcpm.client.matcher.MatchPluginsInteractor;
 import org.hydev.mcpm.client.export.ExportInteractor;
 import org.hydev.mcpm.client.local.LocalDatabaseFetcher;
@@ -68,30 +68,31 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var pager = new PageController(20);
         var mirror = new MirrorSelector();
         var fetcher = new LocalDatabaseFetcher(mirror.selectedMirrorSupplier());
-        var tracker = new LocalPluginTracker();
+        // TODO: Change all implementation to SuperLocalPluginTracker
+        var superTracker = new LocalPluginTracker();
         var jarFinder = new LocalJarFinder();
 
         var loader = isMinecraft ? new PluginLoader(jarFinder) : null;
         var listener = new ProgressBarFetcherListener();
         var searcher = new SearchInteractor(fetcher, listener);
         var installer = new InstallInteractor(
             new SpigotPluginDownloader(new Downloader(), mirror.selectedMirrorSupplier()),
-            new DatabaseManager(tracker, searcher),
+            new DatabaseManager(superTracker, searcher),
             loader
         );
         var matcher = new MatchPluginsInteractor(fetcher, listener);
         var updateChecker = new CheckForUpdatesInteractor(matcher);
-        var updater = new UpdateInteractor(updateChecker, installer, tracker);
+        var updater = new UpdateInteractor(updateChecker, installer, superTracker);
 
         // Controllers
-        var exportPluginsController = new ExportPluginsController(new ExportInteractor(tracker));
-        var listController = new ListController(new ListAllInteractor(tracker));
+        var exportPluginsController = new ExportPluginsController(new ExportInteractor(superTracker));
+        var listController = new ListController(new ListAllInteractor(superTracker), updateChecker);
         var searchController = new SearchPackagesController(searcher);
         var mirrorController = new MirrorController(mirror);
-        var infoController = new InfoController(tracker);
+        var infoController = new InfoController(superTracker);
 
         var installController = new InstallController(installer);
-        var uninstallController = new UninstallController(new Uninstaller(tracker, loader, jarFinder));
+        var uninstallController = new UninstallController(new Uninstaller(superTracker, loader, jarFinder));
         var updateController = new UpdateController(updater);
         var refreshController = new RefreshController(fetcher, listener, mirror);
 

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

@@ -9,29 +9,24 @@
 /**
  * Command parser for List command
  */
-public record ListParser(ListController controller) implements CommandParser
-{
+public record ListParser(ListController controller) implements CommandParser {
     @Override
-    public String name()
-    {
+    public String name() {
         return "list";
     }
 
     @Override
-    public String description()
-    {
+    public String description() {
         return "List installed plugins";
     }
 
     @Override
-    public void configure(Subparser parser)
-    {
-        parser.addArgument("type").choices("all", "manual", "outdated").setDefault("all").nargs("?");
+    public void configure(Subparser parser) {
+        parser.addArgument("type").choices("all", "manual", "automatic", "outdated").setDefault("all").nargs("?");
     }
 
     @Override
-    public void run(Namespace details, Consumer<String> log)
-    {
+    public void run(Namespace details, Consumer<String> log) {
         controller.listAll(details.getString("type"), log);
     }
 }

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

@@ -1,6 +1,8 @@
 package org.hydev.mcpm.client.commands.controllers;
 
 import org.hydev.mcpm.client.list.ListAllBoundary;
+import org.hydev.mcpm.client.updater.CheckForUpdatesBoundary;
+import org.hydev.mcpm.client.list.ListType;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -11,33 +13,54 @@
  * Controller class for the ListAll use case.
  *
  * @author Kevin Chen
-*/
-public class ListController
-{
+ */
+public class ListController {
     private final ListAllBoundary listAllBoundary;
+    private final CheckForUpdatesBoundary checkForUpdatesBoundary;
 
     /**
      * Constructor for ListAllController.
      *
      * @param listAllBoundary The boundary class for ListAllController.
      */
-    public ListController(ListAllBoundary listAllBoundary) {
+    public ListController(ListAllBoundary listAllBoundary, CheckForUpdatesBoundary checkForUpdatesBoundary) {
         this.listAllBoundary = listAllBoundary;
+        this.checkForUpdatesBoundary = checkForUpdatesBoundary;
     }
 
     /**
      * Executes the ListAll use case.
      *
      * @param parameter The parameter for the ListAll use case.
-     * @param log Logger
+     * @param log       Logger
      */
     public void listAll(String parameter, Consumer<String> log) {
-        var list = listAllBoundary.listAll(parameter);
+
+        ListType listType;
+        switch (parameter) {
+            case "all":
+                listType = ListType.ALL;
+                break;
+            case "manual":
+                listType = ListType.MANUAL;
+                break;
+            case "automatic":
+                listType = ListType.AUTOMATIC;
+                break;
+            case "outdated":
+                listType = ListType.OUTDATED;
+                break;
+            default:
+                log.accept("Invalid parameter. Please use 'all', 'manual', 'automatic', or 'outdated'.");
+                return;
+        }
+
+        var list = listAllBoundary.listAll(listType, checkForUpdatesBoundary);
 
         // Tabulate result
-        var table = tabulate(list.stream().map(p ->
-                List.of("&a" + p.name(), "&e" + p.getFirstAuthor(), p.version())).toList(),
-            List.of(":Name", "Author", "Version:"));
+        var table = tabulate(
+                list.stream().map(p -> List.of("&a" + p.name(), "&e" + p.getFirstAuthor(), p.version())).toList(),
+                List.of(":Name", "Author", "Version:"));
 
         log.accept(table);
     }

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

@@ -1,35 +1,33 @@
 package org.hydev.mcpm.client.database.tracker;
 
-import org.hydev.mcpm.client.search.SearchPackagesBoundary;
-import org.hydev.mcpm.client.models.PluginModel;
+import org.hydev.mcpm.client.models.PluginTrackerModel;
 import org.hydev.mcpm.client.models.PluginYml;
 
-import java.io.File;
 import java.util.List;
 
 /**
- * Plugin tracker interface
+ * Extended plugin tracker interface (with methods for specific
+ * versionId/pluginId).
  */
-public interface PluginTracker {
-    void addEntry(String name, boolean status);
+public interface PluginTracker
+{
+    void addEntry(String name, boolean status, long versionId, long pluginId);
 
     void removeEntry(String name);
 
+    List<PluginTrackerModel> listEntries();
+
     List<PluginYml> listInstalled();
 
     void setManuallyInstalled(String name);
 
     void removeManuallyInstalled(String name);
 
-    List<String> listManuallyInstalled();
-
-    List<String> listOrphanPlugins(boolean considerSoftDependencies);
+    Boolean findIfInLockById(String id);
 
-    String getVersion(String name);
+    Boolean findIfInLockByName(String name);
 
-    List<PluginYml> listOutdatedPluginYml(SearchPackagesBoundary searchPackagesBoundary);
-
-    Boolean compareVersion(String name, SearchPackagesBoundary searchPackagesBoundary);
+    List<String> listManuallyInstalled();
 
-    Boolean compareVersionNew(File local, PluginModel remote);
+    List<PluginYml> listOrphanPlugins(boolean considerSoftDependencies);
 }

src/main/java/org/hydev/mcpm/client/database/tracker/PluginTracker.java

@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client.export;
 
-import org.hydev.mcpm.client.local.LocalPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 
 import java.io.PrintStream;
 
@@ -9,9 +9,9 @@
  */
 public class ExportInteractor implements ExportPluginsBoundary {
 
-    private final LocalPluginTracker tracker;
+    private final PluginTracker tracker;
 
-    public ExportInteractor(LocalPluginTracker tracker) {
+    public ExportInteractor(PluginTracker tracker) {
         this.tracker = tracker;
     }
 

src/main/java/org/hydev/mcpm/client/database/tracker/SuperPluginTracker.java

@@ -27,6 +27,7 @@ public File findJar(String name) throws PluginNotFoundException
         if (!dir.isDirectory()) throw new PluginNotFoundException(name);
         return Arrays.stream(Optional.ofNullable(dir.listFiles()).orElseThrow(() -> new PluginNotFoundException(name)))
             .filter(f -> f.getName().endsWith(".jar"))
+            .parallel()
             .filter(f -> {
                 try (var jf = new PluginJarFile(f))
                 {