Merge branch 'main' into uninstall_redone

Author: hykilpikonna

.gitignore

@@ -31,3 +31,5 @@ build
 data
 .mcpm
 *.pyc
+
+plugins

README.md

@@ -94,8 +94,8 @@ There's 3 different ways you can search for new plugins:
 You can execute these commands in any environment using the `search` subcommand:
 ```shell
 mcpm search JedCore # Search for a plugin with the name "JedCore"
-mcpm search --by-keyword "protect land" # Search for a plugin that has protect in its description.
-mcpm search --by-command claim # Search for a plugin that provides a /claim command.
+mcpm search --keyword "protect land" # Search for a plugin that has protect in its description.
+mcpm search --command claim # Search for a plugin that provides a /claim command.
 ```
 
 # Install Plugins
@@ -112,8 +112,6 @@ For example, you can install a plugin that provides a `claim` command using the
 
 ```shell
 mcpm install JedCore # Installs the latest version of the JedCore plugin.
-mcpm install --by-keyword "protect land" # This is also provided for consistency with search.
-mcpm install --by-command claim # This will install the latest version of a command that provides claim!
 ```
 
 We recommend you use the search command before installing anything,

build.gradle

@@ -47,6 +47,7 @@ checkstyle {
 dependencies {
     // The Spigot API with no shadowing. Requires the OSS repo.
     compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
+    testImplementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
 
     // Argument parser
     // https://mvnrepository.com/artifact/net.sourceforge.argparse4j/argparse4j
@@ -86,6 +87,10 @@ dependencies {
     // https://mvnrepository.com/artifact/com.github.luben/zstd-jni
     implementation 'com.github.luben:zstd-jni:1.5.2-5'
 
+    // ZSTD but pure java for platforms that doesn't support native
+    // https://mvnrepository.com/artifact/io.airlift/aircompressor
+    implementation 'io.airlift:aircompressor:0.21'
+
     // Unit tests
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'

crawl.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -e
+
+# Get script dir
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+pushd "$SCRIPT_DIR"
+
+PY="/home/azalea/.conda/envs/310/bin/python3"
+
+# Crawl packages
+$PY -m tools.run org.hydev.mcpm.server.crawlers.SpigetCrawler
+
+# Create database
+$PY -m tools.run org.hydev.mcpm.server.crawlers.spiget.CreateDatabase
+
+# Zstd compression
+rm -rf .mcpm/db.zst
+zstd -f -19 -T36 .mcpm/db
+
+popd

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

@@ -10,12 +10,17 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import static java.lang.String.format;
+
 /**
  * File downloader
  *
@@ -135,7 +140,7 @@ public Downloader threads(int threads)
     /**
      * Displays a demo for downloader.
      *
-     * @param args Arguments are ignored.
+     * @param args Not used
      */
     public static void main(String[] args) throws IOException
     {
@@ -159,5 +164,7 @@ public static void main(String[] args) throws IOException
         urls.put(link3, out3);
         urls.put(link4, out4);
         downloader.downloadFiles(urls);
+        out.delete();
+        out1.delete();
     }
 }

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

@@ -4,17 +4,21 @@
 import org.hydev.mcpm.client.Downloader;
 import org.hydev.mcpm.client.arguments.parsers.*;
 import org.hydev.mcpm.client.commands.entries.*;
+import org.hydev.mcpm.client.database.CheckForUpdatesInteractor;
 import org.hydev.mcpm.client.database.ListAllInteractor;
 import org.hydev.mcpm.client.database.LocalPluginTracker;
+import org.hydev.mcpm.client.database.MatchPluginsInteractor;
 import org.hydev.mcpm.client.database.export.ExportInteractor;
 import org.hydev.mcpm.client.database.fetcher.LocalDatabaseFetcher;
+import org.hydev.mcpm.client.database.fetcher.ProgressBarFetcherListener;
 import org.hydev.mcpm.client.database.mirrors.MirrorSelector;
 import org.hydev.mcpm.client.database.searchusecase.SearchInteractor;
 import org.hydev.mcpm.client.injector.LocalJarFinder;
 import org.hydev.mcpm.client.injector.PluginLoader;
 import org.hydev.mcpm.client.installer.InstallInteractor;
 import org.hydev.mcpm.client.installer.SpigotPluginDownloader;
 import org.hydev.mcpm.client.uninstall.Uninstaller;
+import org.hydev.mcpm.client.updater.UpdateInteractor;
 import org.hydev.mcpm.utils.ColorLogger;
 
 import java.net.URI;
@@ -41,13 +45,19 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var host = URI.create("https://mcpm.hydev.org");
         var fetcher = new LocalDatabaseFetcher(host);
         var tracker = new LocalPluginTracker();
-        var searcher = new SearchInteractor(fetcher);
         var jarFinder = new LocalJarFinder();
 
-        PluginLoader pluginLoader = null;
-        if (isMinecraft) {
-            pluginLoader = new PluginLoader(jarFinder);
-        }
+        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(), host.toString()),
+            new DatabaseManager(tracker, searcher),
+            loader
+        );
+        var matcher = new MatchPluginsInteractor(fetcher, listener);
+        var updateChecker = new CheckForUpdatesInteractor(matcher);
+        var updater = new UpdateInteractor(updateChecker, installer, tracker);
 
         var exportPluginsController = new ExportPluginsController(new ExportInteractor(tracker));
         var listController = new ListController(new ListAllInteractor(tracker));
@@ -56,10 +66,9 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var infoController = new InfoController(tracker);
 
         var databaseManager = new DatabaseManager(tracker, searcher);
-        var installController = new InstallController(new InstallInteractor(
-            new SpigotPluginDownloader(new Downloader(), host.toString()),
-            databaseManager, pluginLoader));
-        var uninstallController = new UninstallController(new Uninstaller(tracker, pluginLoader, jarFinder));
+        var installController = new InstallController(installer);
+        var uninstallController = new UninstallController(new Uninstaller(tracker, loader, jarFinder));
+        var updateController = new UpdateController(updater);
 
         /*
          * Add general parsers to this list!
@@ -73,7 +82,8 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
             new MirrorParser(mirrorController),
             new InfoParser(infoController),
             new InstallParser(installController),
-            new UninstallParser(uninstallController)
+            new UninstallParser(uninstallController),
+            new UpdateParser(updateController)
         );
     }
 

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

@@ -35,6 +35,7 @@ public void run(Namespace details, Consumer<String> log)
         {
             case "ping" -> controller.ping(details.getBoolean("refresh"), log);
             case "select" -> controller.select(details.getString("host"), log);
+            default -> throw new RuntimeException();
         }
     }
 

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

@@ -4,20 +4,18 @@
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import org.hydev.mcpm.client.commands.entries.SearchPackagesController;
+
+import java.util.List;
 import java.util.function.Consumer;
 
 /**
  * SearchParser has two arguments: "type" and "text."
  * When the user runs the search command, the program prompts the user to specify the type of
  * search and the search text.
+ *
+ * @author Jerry Zhu (https://github.com/jerryzhu509)
  */
-public class SearchParser implements CommandParser {
-    private final SearchPackagesController controller;
-
-    public SearchParser(SearchPackagesController controller) {
-        this.controller = controller;
-    }
-
+public record SearchParser(SearchPackagesController controller) implements CommandParser {
     @Override
     public String name() {
         return "search";
@@ -30,20 +28,31 @@ public String description() {
 
     @Override
     public void configure(Subparser parser) {
-        parser.addArgument("by").choices("name", "keyword", "command")
-                .setDefault("name").dest("type")
-                .help("Specifies the Type of Search");
+        // Default search by name, if -k is specified then search by keyword
+        var type = parser.addMutuallyExclusiveGroup();
+        type.addArgument("-k", "--keyword").action(Arguments.storeTrue()).dest("byKeyword")
+            .help("Search by keyword in descriptions");
+        type.addArgument("-c", "--command").action(Arguments.storeTrue()).dest("byCommand")
+            .help("Search by command");
+
+        // Content of the search
         parser.addArgument("text").dest("text").nargs("+")
-                .help("Specifies the search text.");
+            .help("Specifies the search text.");
         parser.addArgument("-n", "--no-cache").action(Arguments.storeTrue()).dest("noCache")
-                .help("Specifies whether to use local cache or not.");
+            .help("Specifies whether to use local cache or not.");
     }
 
     @Override
     public void run(Namespace details, Consumer<String> log) {
-        var t = details.getList("text");
-        controller.searchPackages(details.getString("type"),
-                String.join(" ", details.getList("text")),
-                !details.getBoolean("noCache"), log);
+        // Convert type
+        var type = "name";
+        if (details.getBoolean("byKeyword"))
+            type = "keyword";
+        if (details.getBoolean("byCommand"))
+            type = "command";
+
+        // Call searchPackages
+        List<String> t = details.getList("text");
+        controller.searchPackages(type, String.join(" ", t), !details.getBoolean("noCache"), log);
     }
 }

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

@@ -0,0 +1,62 @@
+package org.hydev.mcpm.client.arguments.parsers;
+
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+import org.hydev.mcpm.client.commands.entries.UpdateController;
+import org.hydev.mcpm.client.commands.presenters.LogUpdatePresenter;
+
+import java.util.function.Consumer;
+
+/**
+ * Handles parsing related to the update command.
+ *
+ * @param controller A controller to dispatch an update command when invoked.
+ */
+public record UpdateParser(UpdateController controller) implements CommandParser {
+    @Override
+    public String name() {
+        return "update";
+    }
+
+    @Override
+    public String description() {
+        return "Updates plugins to the latest version.";
+    }
+
+    @Override
+    public void configure(Subparser parser) {
+        // if (Constants.IS_MINECRAFT) {
+        parser.addArgument("--load")
+            .type(boolean.class)
+            .action(Arguments.storeTrue())
+            .dest("load")
+            .help("If true, updated plugins will be reloaded after the update.");
+        // }
+
+        parser.addArgument("--no-cache")
+            .type(boolean.class)
+            .action(Arguments.storeTrue())
+            .dest("no-cache")
+            .help("If true, the cache will be skipped and database will be fetched again.");
+
+        parser.addArgument("names")
+            .nargs("*")
+            .help("List of plugin names to update.");
+    }
+
+    @Override
+    public void run(Namespace details, Consumer<String> log) {
+        // Since log can change from invocation to invocation,
+        // and I don't want UpdatePresenter to depend on Consumer<String>,
+        // I'll instantiate this every call.
+        var presenter = new LogUpdatePresenter(log);
+
+        controller.update(
+            details.getList("names"),
+            details.getBoolean("load"),
+            details.getBoolean("no-cache"),
+            presenter
+        );
+    }
+}

src/main/java/org/hydev/mcpm/client/commands/entries/SearchPackagesController.java

@@ -30,7 +30,7 @@ public SearchPackagesController(SearchPackagesBoundary searcher) {
      * Load plugins and output status to log.
      *
      * @param type String that specifies the type of search.
-     * @param text String that secifies the search text.
+     * @param text String that specifies the search text.
      * @param noCache Specifies whether to use local cache or not.
      * @param log Callback for status for log events.
      */