Merge branch 'main' into feat-more-tests

Author: hykilpikonna

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

@@ -87,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

@@ -0,0 +1,90 @@
+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 tracker, SearchPackagesBoundary searcher) {
+        this.localPluginTracker = tracker;
+        this.searchInteractor = searcher;
+    }
+
+    /**
+     *
+     * Search if the plugin exists, return the Search Results
+     *
+     * @param input the input pending for installation
+     */
+    public SearchPackagesResult getSearchResult(InstallInput input) {
+        SearchPackagesInput searchPackagesInput = new SearchPackagesInput(input.type(), input.name(), false);
+        SearchPackagesResult searchPackageResult = searchInteractor.search(searchPackagesInput);
+
+        return searchPackageResult;
+    }
+
+    /**
+     * 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 checkPluginInstalledByVersion(PluginVersion pluginVersion) {
+        var name = pluginVersion.meta().name();
+
+        List<PluginYml> pluginInstalled = localPluginTracker.listInstalled();
+        for (PluginYml pluginYml : pluginInstalled) {
+            if (pluginYml != null && pluginYml.version() != null &&
+                    pluginYml.version().equals(pluginVersion.meta().version())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Add the installed plugin to the csv file
+     *
+     * @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));
+
+    }
+}

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

@@ -1,12 +1,16 @@
 package org.hydev.mcpm.client;
 
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.HttpEntity;
 import org.hydev.mcpm.client.interaction.ProgressBar;
 import org.hydev.mcpm.client.interaction.ProgressBarTheme;
 import org.hydev.mcpm.client.interaction.ProgressRow;
 
 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.Map;
@@ -29,9 +33,7 @@ public class Downloader
     /** Number of simultaneous downloads */
     private int threads = 5;
 
-    private ProgressBar bar = new ProgressBar(ProgressBarTheme.ASCII_THEME);
-
-    private ArrayList<ProgressRow> allRows = new ArrayList<>();
+    private final ProgressBar bar = new ProgressBar(ProgressBarTheme.ASCII_THEME);
 
     /**
      * Download one file from the internet to local storage through HTTP request
@@ -41,31 +43,40 @@ public class Downloader
      */
     public void downloadFile(String url, File to)
     {
-        try (FileOutputStream fileos = new FileOutputStream(to)) {
-            URL link = new URL(url);
-            HttpURLConnection http = (HttpURLConnection) link.openConnection();
-            long fileSize = (long) http.getContentLengthLong();
-
-
-            BufferedInputStream in = new BufferedInputStream(http.getInputStream());
-            BufferedOutputStream bout = new BufferedOutputStream(fileos, 1024);
-            byte[] buffer = new byte[1024];
-            int read;
-
-            var row = new ProgressRow(fileSize)
-                    .desc(format("Download %s", allRows.size()))
-                    .descLen(30);
-            bar.appendBar(row);
-            allRows.add(row);
-            while ((read = in.read(buffer, 0, 1024)) >= 0) {
-                bout.write(buffer, 0, read);
-                allRows.forEach(a -> a.increase(1024));
-            }
-            bout.close();
-            in.close();
+        try (var client = HttpClients.createDefault())
+        {
+            var get = new HttpGet(url);
+            var bytes = client.execute(get, (req) ->
+            {
+                HttpEntity entity = req.getEntity();
+                var total = entity.getContentLength();
+                var builder = new ByteArrayOutputStream((int) total);
+
+                // Create progress row
+                var row = new ProgressRow(total).desc(to.getName()).descLen(30);
+                bar.appendBar(row);
+
+                try (var stream = entity.getContent())
+                {
+                    var buffer = new byte[8096];
+
+                    var count = stream.read(buffer);
+                    while (count > 0)
+                    {
+                        builder.write(buffer, 0, count);
+                        row.increase(count);
+                        count = stream.read(buffer);
+                    }
+                }
+
+                return builder.toByteArray();
+            });
+
+            Files.write(to.toPath(), bytes);
         }
-        catch (IOException ex) {
-            ex.printStackTrace();
+        catch (IOException e)
+        {
+            throw new RuntimeException(e);
         }
     }
 
@@ -125,7 +136,7 @@ public Downloader threads(int threads)
     }
 
     /**
-     * Tests for the downloader
+     * Displays a demo for downloader.
      *
      * @param args Not used
      */

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

@@ -1,5 +1,8 @@
 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.*;
 import org.hydev.mcpm.client.commands.entries.*;
 import org.hydev.mcpm.client.database.ListAllInteractor;
@@ -9,6 +12,8 @@
 import org.hydev.mcpm.client.database.fetcher.LocalDatabaseFetcher;
 import org.hydev.mcpm.client.database.searchusecase.SearchInteractor;
 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.utils.ColorLogger;
 
 import java.net.URI;
@@ -28,16 +33,29 @@ 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() {
-        var host = URI.create("http://mcpm.hydev.org");
+    public static List<CommandParser> baseParsers(boolean isMinecraft) {
+        var host = URI.create("https://mcpm.hydev.org");
         var fetcher = new LocalDatabaseFetcher(host);
-        var exportPluginsController = new ExportPluginsController(new ExportInteractor(new LocalPluginTracker()));
-        var listController = new ListController(new ListAllInteractor());
-        var searchController = new SearchPackagesController(new SearchInteractor(fetcher));
+        var tracker = new LocalPluginTracker();
+        var searcher = new SearchInteractor(fetcher);
+        var exportPluginsController = new ExportPluginsController(new ExportInteractor(tracker));
+        var listController = new ListController(new ListAllInteractor(tracker));
+        var searchController = new SearchPackagesController(searcher);
         var mirrorController = new MirrorController(new MirrorSelector());
-        var infoController = new InfoController(new LocalPluginTracker());
+        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()),
+            databaseManager, pluginLoader));
+
 
         /*
          * Add general parsers to this list!
@@ -49,7 +67,8 @@ public static List<CommandParser> baseParsers() {
             new ListParser(listController),
             new SearchParser(searchController),
             new MirrorParser(mirrorController),
-            new InfoParser(infoController)
+            new InfoParser(infoController),
+            new InstallParser(installController)
         );
     }
 
@@ -76,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();
     }
 
     /**
@@ -85,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/arguments/parsers/CommandHandler.java

@@ -1,6 +1,7 @@
 package org.hydev.mcpm.client.arguments.parsers;
 
 import net.sourceforge.argparse4j.inf.Namespace;
+import org.hydev.mcpm.client.installer.InstallResult;
 
 import java.util.function.Consumer;