Add list plugins command

Signed-off-by: MintoD <[email protected]>
thebigcrafter · Dec 13, 2021 · ecd44db · ecd44db
1 parent 89cc189
commit ecd44db
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 143 deletions.
diff --git a/resources/lang/eng.ini b/resources/lang/eng.ini
@@ -12,6 +12,7 @@ list.repo.button = "List repositories"
 update.button = "Update"
 install.plugin.button = "Install"
 remove.plugin.button = "Remove"
+list.plugin.button = "List plugins"
 
 ; Command /apm add-repo
 add.repo.command.description = "Add a repository"

diff --git a/resources/lang/vie.ini b/resources/lang/vie.ini
@@ -12,6 +12,7 @@ list.repo.button = "Danh sách kho lưu trữ"
 update.button = "Cập nhật kho lưu trữ"
 install.plugin.button = "Cài đặt plugin"
 remove.plugin.button = "Xóa plugin"
+list.plugin.button = "Danh sách plugin"
 
 ; Command /apm add-repo
 add.repo.command.description = "Thêm một kho lưu trữ"

diff --git a/src/thebigcrafter/APM/APM.php b/src/thebigcrafter/APM/APM.php
@@ -5,86 +5,82 @@
 namespace thebigcrafter\APM;
 
 use pocketmine\lang\Language;
-use thebigcrafter\APM\commands\APMCommand;
 use pocketmine\plugin\PluginBase;
 use pocketmine\utils\Config;
 use pocketmine\utils\SingletonTrait;
+use thebigcrafter\APM\commands\APMCommand;
 use thebigcrafter\APM\jobs\Cache;
 
 class APM extends PluginBase
 {
     use SingletonTrait;
 
-    /**
-     * Language FILE name
-     *
-     * @var array<string>
-     */
-    private array $languages = ["eng", "vie"];
-
-    /**
-     * Default repository
-     * @var string
-     */
-    private string $defaultRepo = "https://thebigcrafter.github.io/";
-
     /**
      * Prefix
      *
      * @var string
      */
     public static string $PREFIX = "§a[§bAPM§a]§r ";
-
-    /**
-     * Repositories list
-     */
-    public Config $repos;
-
-    /**
-     * Plugin config
-     *
-     * @var Config
-     */
-    public Config $config;
-
     /**
      * Plugins cache
      *
-     * @var string[]
+     * @var array
      */
     public static array $reposPluginsCache = [];
-
     /**
      * Repositories information cache
-     * 
-     * @var string[]
+     *
+     * @var array
      */
     public static array $reposInfoCache = [];
-
     /**
      * Loaded plugins list
      *
      * @var array
      */
     public static array $loadedPlugins = [];
-
     /**
      * Language
      *
      * @var Language
      */
     private static Language $language;
-
     /**
-     * Get instance
+     * Repositories list
+     *
+     * @var Config
+     */
+    public Config $repos;
+    /**
+     * Plugin configurations
      *
+     * @var Config
+     */
+    public Config $config;
+    /**
+     * Language FILE name
+     *
+     * @var array<string>
+     */
+    private array $languages = ["eng", "vie"];
+    /**
+     * Default repository
+     *
+     * @var string
+     */
+    private string $defaultRepo = "https://thebigcrafter.github.io/";
+
+    /**
      * @return self
      */
     public static function getInstance(): self
     {
         return self::$instance;
     }
 
+    /**
+     * @return Language
+     */
     public static function getLanguage(): Language
     {
         return self::$language;
@@ -94,49 +90,16 @@ public function onEnable(): void
     {
         self::setInstance($this);
 
-        $this->initConfig();
-        $this->initLanguageFiles($this->config->get("language"), $this->languages);
-        $this->cacheRepo();
-        Cache::cacheLoadedPlugins();
-
-        $this->getServer()->getCommandMap()->register("apm", new APMCommand($this, "apm", "Advanced Plugin Manager"));
-
-    }
-
-    /**
-     * Initialize config
-     *
-     * @return void
-     */
-    public function initConfig(): void
-    {
         $this->saveDefaultConfig();
         $this->config = $this->getConfig();
         $this->repos = new Config($this->getDataFolder() . "repos.yml", Config::YAML, array("repositories" => [$this->defaultRepo]));
-    }
-
-    /**
-     * Cache repositories information
-     *
-     * @return void
-     */
-    public function cacheRepo(): void
-    {
-        $this->reloadConfig();
 
-        Cache::cacheReposInfo($this->repos->get("repositories"));
+        $this->initLanguageFiles($this->config->get("language"), $this->languages);
+        $this->cacheRepo();
+        Cache::cacheLoadedPlugins();
 
-        $this->cachePlugin();
-    }
+        $this->getServer()->getCommandMap()->register("apm", new APMCommand($this, "apm", "Advanced Plugin Manager"));
 
-    /**
-     * Cache plugins from repositories
-     *
-     * @return void
-     */
-    public function cachePlugin(): void
-    {
-        Cache::cacheReposPlugins($this->repos->get("repositories"));
     }
 
     /**
@@ -161,4 +124,17 @@ public function initLanguageFiles(string $lang, array $languageFiles): void
 
         self::$language = new Language($lang, $this->getDataFolder() . "lang/");
     }
+
+    /**
+     * Cache repositories data
+     *
+     * @return void
+     */
+    public function cacheRepo(): void
+    {
+        $this->reloadConfig();
+
+        Cache::cacheReposInfo($this->repos->get("repositories"));
+        Cache::cacheReposPlugins($this->repos->get("repositories"));
+    }
 }
diff --git a/src/thebigcrafter/APM/commands/subcommands/AddRepoCommand.php b/src/thebigcrafter/APM/commands/subcommands/AddRepoCommand.php
@@ -4,28 +4,21 @@
 
 namespace thebigcrafter\APM\commands\subcommands;
 
-use CortexPE\Commando\BaseSubCommand;
 use CortexPE\Commando\args\RawStringArgument;
+use CortexPE\Commando\BaseSubCommand;
 use CortexPE\Commando\exception\ArgumentOrderException;
-use thebigcrafter\APM\APM;
-use thebigcrafter\APM\forms\RepoForm;
-use thebigcrafter\APM\jobs\Adder;
+use JsonException;
 use pocketmine\command\CommandSender;
 use pocketmine\player\Player;
+use thebigcrafter\APM\APM;
 use thebigcrafter\APM\error\ErrorHandler;
+use thebigcrafter\APM\forms\RepoForm;
+use thebigcrafter\APM\jobs\Adder;
 
 class AddRepoCommand extends BaseSubCommand
 {
     /**
-     * @throws ArgumentOrderException
-     */
-    protected function prepare(): void
-    {
-        $this->registerArgument(0, new RawStringArgument("url", false));
-    }
-
-    /**
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
     {
@@ -35,11 +28,19 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
             if (!isset($args["url"])) {
                 ErrorHandler::sendErrorToConsole(ErrorHandler::$INVALID_URL);
             }
-            if (Adder::addRepo((string) $args["url"])) {
+            if (Adder::addRepo((string)$args["url"])) {
                 $sender->sendMessage(APM::$PREFIX . APM::getLanguage()->translateString("add.repo.success"));
             } else {
                 ErrorHandler::sendErrorToConsole(ErrorHandler::$INVALID_URL);
             }
         }
     }
+
+    /**
+     * @throws ArgumentOrderException
+     */
+    protected function prepare(): void
+    {
+        $this->registerArgument(0, new RawStringArgument("url", false));
+    }
 }
diff --git a/src/thebigcrafter/APM/forms/MenuForm.php b/src/thebigcrafter/APM/forms/MenuForm.php
@@ -6,9 +6,8 @@
 
 use dktapps\pmforms\MenuForm as PmformsMenuForm;
 use dktapps\pmforms\MenuOption;
-use thebigcrafter\APM\APM;
-use pocketmine\form\Form;
 use pocketmine\player\Player;
+use thebigcrafter\APM\APM;
 
 class MenuForm
 {
@@ -20,7 +19,7 @@ public static function getMenuForm(): PmformsMenuForm
     {
         $buttons = [];
 
-        foreach ([APM::getLanguage()->translateString("add.repo.button"), APM::getLanguage()->translateString("remove.repo.button"), APM::getLanguage()->translateString("list.repo.button"), APM::getLanguage()->translateString("update.button"), APM::getLanguage()->translateString("install.plugin.button"), APM::getLanguage()->translateString("remove.plugin.button")] as $name) {
+        foreach ([APM::getLanguage()->translateString("add.repo.button"), APM::getLanguage()->translateString("remove.repo.button"), APM::getLanguage()->translateString("list.repo.button"), APM::getLanguage()->translateString("update.button"), APM::getLanguage()->translateString("install.plugin.button"), APM::getLanguage()->translateString("remove.plugin.button"), APM::getLanguage()->translateString("list.plugin.button")] as $name) {
             $buttons[] = new MenuOption($name);
         }
 
@@ -47,6 +46,11 @@ public static function getMenuForm(): PmformsMenuForm
                 case 5:
                     $player->sendForm(RepoForm::getRemovePluginForm());
                     break;
+                case 6:
+                    foreach (APM::$reposPluginsCache as $plugin) {
+                        $player->sendMessage($plugin["name"]);
+                    }
+                    break;
             }
         });
     }

diff --git a/src/thebigcrafter/APM/forms/RepoForm.php b/src/thebigcrafter/APM/forms/RepoForm.php
@@ -70,10 +70,10 @@ public static function getRemoveRepoForm(): CustomForm
     public static function getRepoListForm(Player $player): void
     {
         $repositoriesList = "";
-        foreach (APM::$reposPluginsCache as $cache) {
+        foreach (APM::$reposInfoCache as $cache) {
             foreach (APM::getInstance()->repos->get("repositories") as $repo) {
                 if ($cache["repo"] == $repo) {
-                    $repositoriesList = $repositoriesList . "Name: " . $cache["label"] . "\n" . "Codename: " . $cache["codename"] . "\n" . "Repository URL: " . $repo . "\n\n";
+                    $repositoriesList = $repositoriesList . "Name: " . $cache["label"] . "\n" . "Description: " . $cache["description"] . "\n" . "Repository URL: " . $repo . "\n\n";
                 }
             }
         }

diff --git a/src/thebigcrafter/APM/jobs/Adder.php b/src/thebigcrafter/APM/jobs/Adder.php
@@ -2,6 +2,7 @@
 
 namespace thebigcrafter\APM\jobs;
 
+use JsonException;
 use thebigcrafter\APM\APM;
 use thebigcrafter\APM\utils\Utils;
 
@@ -14,7 +15,7 @@ class Adder
      *
      * @return bool
      *
-     * @throws \JsonException
+     * @throws JsonException
      */
     public static function addRepo(string $url): bool
     {

diff --git a/src/thebigcrafter/APM/jobs/Cache.php b/src/thebigcrafter/APM/jobs/Cache.php
@@ -24,6 +24,7 @@ public static function cacheReposInfo(array $urls): void
             $info = json_decode(Internet::getURL($url . "Release.json")->getBody(), true);
 
             APM::$reposInfoCache[] = [
+                "repo" => $url,
                 "label" => $info["label"],
                 "suite" => $info["suite"],
                 "description" => $info["description"],