Merge

Author: jerryzhu509

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/Constants.java

@@ -16,6 +16,11 @@
  */
 public class Constants
 {
+    // This is technically not a constant, but it should only be changed by SpigotEntry to true.
+    // It cannot be put inside SpigotEntry because accessing SpigotEntry would try to initialize the class, then it
+    // will try to import Spigot packages which doesn't exist outside of Spigot.
+    public static boolean IS_MINECRAFT = false;
+
     public static final ObjectMapper JACKSON = new ObjectMapper()
         .disable(FAIL_ON_UNKNOWN_PROPERTIES).enable(INDENT_OUTPUT);
 

src/main/java/org/hydev/mcpm/SpigotEntry.java

@@ -4,17 +4,14 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.hydev.mcpm.client.arguments.ArgsParser;
 import org.hydev.mcpm.client.arguments.CommandsFactory;
 import org.hydev.mcpm.client.arguments.parsers.CommandParser;
 import org.hydev.mcpm.utils.ColorLogger;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -25,6 +22,12 @@
  */
 public class SpigotEntry extends JavaPlugin implements CommandExecutor
 {
+    public SpigotEntry()
+    {
+        // Let the other parts of our program know that we're in minecraft
+        Constants.IS_MINECRAFT = true;
+    }
+
     private Logger log;
 
     private ArgsParser parser;

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

@@ -1,35 +1,37 @@
 package org.hydev.mcpm.client;
 
+import org.hydev.mcpm.client.database.LocalPluginTracker;
 import org.hydev.mcpm.client.database.PluginTracker;
 import org.hydev.mcpm.client.database.boundary.SearchPackagesBoundary;
+import org.hydev.mcpm.client.database.fetcher.LocalDatabaseFetcher;
 import org.hydev.mcpm.client.database.inputs.SearchPackagesInput;
 import org.hydev.mcpm.client.database.results.SearchPackagesResult;
+import org.hydev.mcpm.client.database.searchusecase.SearchInteractor;
 import org.hydev.mcpm.client.installer.InstallResult;
 import org.hydev.mcpm.client.installer.input.InstallInput;
 import org.hydev.mcpm.client.models.PluginVersion;
 import org.hydev.mcpm.client.models.PluginYml;
 
+import java.net.URI;
 import java.util.List;
 
 /**
  * Database API
  */
 public class DatabaseManager {
-
     private final PluginTracker localPluginTracker;
     private final SearchPackagesBoundary searchInteractor;
 
-    public DatabaseManager(PluginTracker localPluginTracker, SearchPackagesBoundary searchInteractor) {
-        this.localPluginTracker = localPluginTracker;
-        this.searchInteractor = searchInteractor;
+    public DatabaseManager(PluginTracker tracker, SearchPackagesBoundary searcher) {
+        this.localPluginTracker = tracker;
+        this.searchInteractor = searcher;
     }
 
     /**
      *
-     * Search if the plugin exists, throw exception if it does not exist and return the information of
-     * the pluigin needs to be installed.
+     * Search if the plugin exists, return the Search Results
      *
-     * @param input the plugin input pending for installation
+     * @param input the input pending for installation
      */
     public SearchPackagesResult getSearchResult(InstallInput input) {
         SearchPackagesInput searchPackagesInput = new SearchPackagesInput(input.type(), input.name(), false);
@@ -39,16 +41,35 @@ public SearchPackagesResult getSearchResult(InstallInput input) {
     }
 
     /**
-     * check if plugin already installed locally
+     * check if plugin with given version already installed locally
+     *
+     * @param pluginName The version of the installed plugin
+     * */
+    public boolean checkPluginInstalledByName(String pluginName) {
+        var name = pluginName;
+
+        List<PluginYml> pluginInstalled = localPluginTracker.listInstalled();
+        for (PluginYml pluginYml : pluginInstalled) {
+            if (pluginYml != null && pluginYml.name() != null && pluginYml.name().equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * check if plugin with given name already installed locally
      *
      * @param pluginVersion The version of the installed plugin
      * */
-    public boolean checkPluginInstalled(PluginVersion pluginVersion) {
+    public boolean checkPluginInstalledByVersion(PluginVersion pluginVersion) {
         var name = pluginVersion.meta().name();
 
         List<PluginYml> pluginInstalled = localPluginTracker.listInstalled();
         for (PluginYml pluginYml : pluginInstalled) {
-            if (pluginYml != null && pluginYml.name() != null && pluginYml.name().equals(name)) {
+            if (pluginYml != null && pluginYml.version() != null &&
+                    pluginYml.version().equals(pluginVersion.meta().version())) {
                 return true;
             }
         }

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

@@ -9,15 +9,13 @@
 
 import java.io.*;
 import java.net.HttpURLConnection;
+import java.net.URL;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.net.URL;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 import static java.lang.String.format;
 
@@ -140,18 +138,20 @@ 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 {
-        // 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 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");
-        Downloader downloader = new Downloader();
+    public static void main(String[] args)
+    {
+        String link = "https://mcpm.hydev.org/db";
+        File out = new File("./build/db.json");
+        String link1 = "https://mcpm.hydev.org/db.zst";
+        File out1 = new File("./build/db.zst");
+        Downloader downloader = new Downloader().showProgress(true).threads(2);
         Map<String, File> urls = new HashMap<>();
         urls.put(link, out);
         urls.put(link1, out1);
         downloader.downloadFiles(urls);
+        out.delete();
+        out1.delete();
     }
 }

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

@@ -1,5 +1,6 @@
 package org.hydev.mcpm.client.arguments;
 
+import org.hydev.mcpm.Constants;
 import org.hydev.mcpm.client.DatabaseManager;
 import org.hydev.mcpm.client.Downloader;
 import org.hydev.mcpm.client.arguments.parsers.*;
@@ -32,9 +33,10 @@ private CommandsFactory() { }
     /**
      * Creates a list of general parsers for the ArgsParser class.
      *
+     * @param isMinecraft If we're in the minecraft env
      * @return Returns a list of argument parsers that work in any environment (Server & CLI).
      */
-    public static List<CommandParser> baseParsers() {
+    public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var host = URI.create("https://mcpm.hydev.org");
         var fetcher = new LocalDatabaseFetcher(host);
         var tracker = new LocalPluginTracker();
@@ -44,9 +46,16 @@ public static List<CommandParser> baseParsers() {
         var searchController = new SearchPackagesController(searcher);
         var mirrorController = new MirrorController(new MirrorSelector());
         var infoController = new InfoController(tracker);
+        PluginLoader pluginLoader = null;
+        if (isMinecraft) {
+            pluginLoader = new PluginLoader();
+        }
+        DatabaseManager databaseManager = new DatabaseManager(tracker, searcher);
+        System.out.println(isMinecraft);
         var installController = new InstallController(new InstallInteractor(
             new SpigotPluginDownloader(new Downloader(), host.toString()),
-            new DatabaseManager(tracker, searcher)));
+            databaseManager, pluginLoader));
+
 
         /*
          * Add general parsers to this list!
@@ -86,7 +95,7 @@ public static List<CommandParser> serverParsers() {
             new UnloadParser(unloadController)
         );
 
-        return Stream.concat(baseParsers().stream(), serverOnly.stream()).toList();
+        return Stream.concat(baseParsers(true).stream(), serverOnly.stream()).toList();
     }
 
     /**
@@ -95,7 +104,7 @@ public static List<CommandParser> serverParsers() {
      * @return An ArgsParser object. Invoke ArgsParser#parse to see more.
      */
     public static ArgsParser baseArgsParser() {
-        return new ArgsParser(baseParsers(), ColorLogger.toStdOut());
+        return new ArgsParser(baseParsers(false), ColorLogger.toStdOut());
     }
 
     /**

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

@@ -21,9 +21,9 @@ public record InstallController(InstallBoundary boundary)
      * @param log Log string
      */
     public void install(String name, SearchPackagesType type, boolean load, Consumer<String> log) {
-        // TODO: log error
-        InstallInput input = new InstallInput(name, type, load, true);
-        boundary.installPlugin(input);
-        log.accept("string");
+        // TODO: User-friendly outputs
+        var input = new InstallInput(name, type, load, true);
+        var output = boundary.installPlugin(input);
+        log.accept(output.type().reason());
     }
 }

src/main/java/org/hydev/mcpm/client/database/fetcher/LocalDatabaseFetcher.java

@@ -8,6 +8,7 @@
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.hydev.mcpm.client.models.Database;
 import org.hydev.mcpm.utils.HashUtils;
+import org.hydev.mcpm.utils.ZstdUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.ByteArrayOutputStream;
@@ -17,7 +18,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.NoSuchAlgorithmException;
 
 import static org.hydev.mcpm.Constants.JACKSON;
 
@@ -29,7 +29,8 @@ public class LocalDatabaseFetcher implements DatabaseFetcher {
     private final Path cacheDirectory;
 
     private Database localDatabase;
-    private boolean enableCompression = true;
+
+    public static final boolean ENABLE_COMPRESSION = true;
 
     public static final String HASH_FILE_NAME = "db.hash";
     public static final String DATABASE_FILE_NAME = "db";
@@ -152,7 +153,7 @@ private String readDatabaseFromContent(HttpEntity entity, DatabaseFetcherListene
         listener.finish();
 
         // Decompress ZSTD
-        if (this.enableCompression)
+        if (ENABLE_COMPRESSION)
         {
             var bs = builder.toByteArray();
             bs = Zstd.decompress(bs, (int) Zstd.decompressedSize(bs));
@@ -166,7 +167,7 @@ private String readDatabaseFromContent(HttpEntity entity, DatabaseFetcherListene
     private Database fetchHostDatabase(DatabaseFetcherListener listener) {
         try (var client = HttpClients.createDefault()) {
             var body = client.execute(
-                requestTo(enableCompression ? DATABASE_ZST_FILE_NAME : DATABASE_FILE_NAME),
+                requestTo(ENABLE_COMPRESSION ? DATABASE_ZST_FILE_NAME : DATABASE_FILE_NAME),
                 request -> readDatabaseFromContent(request.getEntity(), listener)
             );
 
@@ -175,17 +176,13 @@ private Database fetchHostDatabase(DatabaseFetcherListener listener) {
             if (database != null) {
                 localDatabase = database;
 
-                try {
-                    var hash = new HashUtils().hash(body);
+                var hash = new HashUtils().hash(body);
 
-                    //noinspection ResultOfMethodCallIgnored
-                    cacheDirectory.toFile().mkdirs();
+                //noinspection ResultOfMethodCallIgnored
+                cacheDirectory.toFile().mkdirs();
 
-                    Files.writeString(Paths.get(cacheDirectory.toString(), DATABASE_FILE_NAME), body);
-                    Files.writeString(Paths.get(cacheDirectory.toString(), HASH_FILE_NAME), hash);
-                } catch (NoSuchAlgorithmException e) {
-                    e.printStackTrace();
-                }
+                Files.writeString(Paths.get(cacheDirectory.toString(), DATABASE_FILE_NAME), body);
+                Files.writeString(Paths.get(cacheDirectory.toString(), HASH_FILE_NAME), hash);
             }
 
             return database;
@@ -210,10 +207,4 @@ public Database fetchDatabase(boolean cache, DatabaseFetcherListener listener) {
 
         return fetchHostDatabase(listener);
     }
-
-    public LocalDatabaseFetcher enableCompression(boolean enableCompression)
-    {
-        this.enableCompression = enableCompression;
-        return this;
-    }
 }