Update everything to use SuperLocalPluginTracker

Author: kchprog

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

@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client;
 
-import org.hydev.mcpm.client.database.tracker.PluginTracker;
+import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
 import org.hydev.mcpm.client.search.SearchPackagesBoundary;
 import org.hydev.mcpm.client.search.SearchPackagesInput;
 import org.hydev.mcpm.client.search.SearchPackagesResult;
@@ -15,10 +15,10 @@
  * (Goal: avoid the dependency and cluster of parameters to connect to database).
  */
 public class DatabaseManager {
-    private final PluginTracker localPluginTracker;
+    private final SuperPluginTracker localPluginTracker;
     private final SearchPackagesBoundary searchInteractor;
 
-    public DatabaseManager(PluginTracker tracker, SearchPackagesBoundary searcher) {
+    public DatabaseManager(SuperPluginTracker tracker, SearchPackagesBoundary searcher) {
         this.localPluginTracker = tracker;
         this.searchInteractor = searcher;
     }
@@ -76,10 +76,10 @@ 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/arguments/ArgsParser.java

@@ -5,6 +5,7 @@
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import org.hydev.mcpm.client.arguments.parsers.CommandHandler;
 import org.hydev.mcpm.client.arguments.parsers.CommandParser;
+import org.hydev.mcpm.utils.ColorLogger;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -118,9 +119,9 @@ public static void main(String[] args) {
         var parser = CommandsFactory.baseArgsParser();
 
         try {
-            parser.parse(args, System.out::println);
+            parser.parse(args, ColorLogger.toStdOut());
         } catch (ArgumentParserException e) {
-            parser.fail(e, System.out::println);
+            parser.fail(e, ColorLogger.toStdOut());
         }
     }
 }

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

@@ -29,9 +29,9 @@
 import org.hydev.mcpm.client.commands.controllers.UninstallController;
 import org.hydev.mcpm.client.commands.controllers.UnloadController;
 import org.hydev.mcpm.client.commands.controllers.UpdateController;
+import org.hydev.mcpm.client.local.SuperLocalPluginTracker;
 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;
@@ -67,30 +67,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 SuperLocalPluginTracker();
         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, pager);
         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/commands/controllers/InfoController.java

@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.WordUtils;
-import org.hydev.mcpm.client.database.tracker.PluginTracker;
+import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
 import org.hydev.mcpm.utils.ColorLogger;
 
 import javax.annotation.Nullable;
@@ -14,7 +14,7 @@
 /**
  * Controller for the info use case
  */
-public record InfoController(PluginTracker tracker)
+public record InfoController(SuperPluginTracker tracker)
 {
     private static final int LEN_LEFT = 12;
     private static final int LEN_RIGHT = 60;

src/main/java/org/hydev/mcpm/client/database/ListAllBoundary.java

@@ -1,7 +1,7 @@
 package org.hydev.mcpm.client.database;
 
-import org.hydev.mcpm.client.database.boundary.CheckForUpdatesBoundary;
 import org.hydev.mcpm.client.models.PluginYml;
+import org.hydev.mcpm.client.updater.CheckForUpdatesBoundary;
 
 import java.util.List;
 

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

@@ -1,20 +1,10 @@
 package org.hydev.mcpm.client.database;
 
 import org.apache.commons.lang3.NotImplementedException;
-import org.hydev.mcpm.client.database.boundary.CheckForUpdatesBoundary;
-import org.hydev.mcpm.client.database.inputs.CheckForUpdatesInput;
-import org.hydev.mcpm.client.database.inputs.CheckForUpdatesResult;
-import org.hydev.mcpm.client.database.model.PluginVersionState;
 import org.hydev.mcpm.client.models.PluginYml;
-import org.hydev.mcpm.client.models.PluginTrackerModel;
-import org.hydev.mcpm.client.database.model.PluginVersionId;
-import org.hydev.mcpm.client.database.model.PluginModelId;
-import org.hydev.mcpm.client.models.PluginModel;
+import org.hydev.mcpm.client.updater.CheckForUpdatesBoundary;
 
 import java.util.List;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.OptionalLong;
 
 /**
  * Implementation to the ListAll functionality

src/main/java/org/hydev/mcpm/client/database/SuperLocalPluginTracker.java

@@ -4,14 +4,14 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.hydev.mcpm.client.database.boundary.SearchPackagesBoundary;
-import org.hydev.mcpm.client.database.inputs.SearchPackagesInput;
-import org.hydev.mcpm.client.database.inputs.SearchPackagesType;
-import org.hydev.mcpm.client.database.results.SearchPackagesResult;
 import org.hydev.mcpm.client.models.PluginModel;
 import org.hydev.mcpm.client.models.PluginVersion;
 import org.hydev.mcpm.client.models.PluginYml;
 import org.hydev.mcpm.client.models.PluginYml.InvalidPluginMetaStructure;
+import org.hydev.mcpm.client.search.SearchPackagesBoundary;
+import org.hydev.mcpm.client.search.SearchPackagesInput;
+import org.hydev.mcpm.client.search.SearchPackagesResult;
+import org.hydev.mcpm.client.search.SearchPackagesType;
 import org.hydev.mcpm.utils.PluginJarFile;
 import org.hydev.mcpm.client.models.PluginTrackerModel;
 

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

@@ -1,9 +1,9 @@
 package org.hydev.mcpm.client.database;
 
-import org.hydev.mcpm.client.database.boundary.SearchPackagesBoundary;
 import org.hydev.mcpm.client.models.PluginModel;
 import org.hydev.mcpm.client.models.PluginYml;
 import org.hydev.mcpm.client.models.PluginTrackerModel;
+import org.hydev.mcpm.client.search.SearchPackagesBoundary;
 
 import java.io.File;
 import java.util.List;

src/main/java/org/hydev/mcpm/client/database/TestLocalPluginTracker.java

@@ -10,6 +10,7 @@
 /**
  * Plugin tracker interface
  */
+
 public interface PluginTracker {
     void addEntry(String name, boolean status);