zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-23 00:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

change plugin_dir variable to class level field

Browse Source
This commit is contained in:
crazywhalecc
2023-02-21 00:00:00 +08:00
committed by Jerry
parent 12b5e6f4e3
commit e12b41b280
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ZM/Command/Plugin/PluginInstallCommand.php
View File

@@ -30,7 +30,7 @@ class PluginInstallCommand extends PluginCommand
{ {
$addr = $this->input->getArgument('address'); $addr = $this->input->getArgument('address');
$name = ob_uuidgen(); $name = ob_uuidgen();
$plugin_dir = FileSystem::isRelativePath(config('global.plugin.load_dir', 'plugins')) ? (WORKING_DIR . '/' . config('global.plugin.load_dir', 'plugins')) : config('global.plugin.load_dir', 'plugins'); $this->plugin_dir = FileSystem::isRelativePath(config('global.plugin.load_dir', 'plugins')) ? (WORKING_DIR . '/' . config('global.plugin.load_dir', 'plugins')) : config('global.plugin.load_dir', 'plugins');
// 先通过 GitHub API 获取看看存不存在 zmplugin.json // 先通过 GitHub API 获取看看存不存在 zmplugin.json
// 解析 git https 路径中的仓库所有者和仓库名 // 解析 git https 路径中的仓库所有者和仓库名
$git_url = parse_url($addr); $git_url = parse_url($addr);
@@ -65,36 +65,36 @@ class PluginInstallCommand extends PluginCommand
} }
$this->info('正在从 ' . $addr . ' 克隆插件仓库'); $this->info('正在从 ' . $addr . ' 克隆插件仓库');
try { try {
FileSystem::createDir($plugin_dir); FileSystem::createDir($this->plugin_dir);
} catch (FileSystemException $exception) { } catch (FileSystemException $exception) {
$this->error("无法创建插件目录 {$plugin_dir}：{$exception->getMessage()}"); $this->error("无法创建插件目录 {$this->plugin_dir}：{$exception->getMessage()}");
return static::FAILURE; return static::FAILURE;
} }
passthru('cd ' . escapeshellarg($plugin_dir) . ' && git clone --depth=1 ' . escapeshellarg($addr) . ' ' . $name, $code); passthru('cd ' . escapeshellarg($this->plugin_dir) . ' && git clone --depth=1 ' . escapeshellarg($addr) . ' ' . $name, $code);
if ($code !== 0) { if ($code !== 0) {
$this->error('无法从指定 Git 地址拉取项目，请检查地址名是否正确'); $this->error('无法从指定 Git 地址拉取项目，请检查地址名是否正确');
return static::FAILURE; return static::FAILURE;
} }
if (!file_exists($plugin_dir . '/' . $name . '/zmplugin.json')) { if (!file_exists($this->plugin_dir . '/' . $name . '/zmplugin.json')) {
$this->error('项目不存在 zmplugin.json 插件元信息，无法安装，请手动删除目录 ' . $name); $this->error('项目不存在 zmplugin.json 插件元信息，无法安装，请手动删除目录 ' . $name);
// TODO: 使用 rmdir 和 unlink 删除 git 目录 // TODO: 使用 rmdir 和 unlink 删除 git 目录
return static::FAILURE; return static::FAILURE;
} }
$this->output->writeln('正在检查元信息完整性'); $this->output->writeln('正在检查元信息完整性');
$getname = json_decode(file_get_contents($plugin_dir . '/' . $name . '/zmplugin.json'), true)['name'] ?? null; $getname = json_decode(file_get_contents($this->plugin_dir . '/' . $name . '/zmplugin.json'), true)['name'] ?? null;
if ($getname === null) { if ($getname === null) {
$this->error('无法获取元信息 zmplugin.json'); $this->error('无法获取元信息 zmplugin.json');
return static::FAILURE; return static::FAILURE;
} }
$code = rename($plugin_dir . '/' . $name, $plugin_dir . '/' . $getname); $code = rename($this->plugin_dir . '/' . $name, $this->plugin_dir . '/' . $getname);
if ($code === false) { if ($code === false) {
$this->error('无法重命名文件夹 ' . $name); $this->error('无法重命名文件夹 ' . $name);
return static::FAILURE; return static::FAILURE;
} }
if (file_exists($plugin_dir . '/' . $getname . '/composer.json')) { if (file_exists($this->plugin_dir . '/' . $getname . '/composer.json')) {
$this->info('插件存在 composer.json，正在安装 composer 相关依赖（需要系统环境变量中包含 composer 路径）'); $this->info('插件存在 composer.json，正在安装 composer 相关依赖（需要系统环境变量中包含 composer 路径）');
$cwd = getcwd(); $cwd = getcwd();
chdir($plugin_dir . '/' . $getname); chdir($this->plugin_dir . '/' . $getname);
// 使用内建 Composer // 使用内建 Composer
if (file_exists(WORKING_DIR . '/runtime/composer.phar')) { if (file_exists(WORKING_DIR . '/runtime/composer.phar')) {
$this->info('使用内建 Composer'); $this->info('使用内建 Composer');

6
src/ZM/Command/Plugin/PluginMakeCommand.php
View File

@@ -39,7 +39,7 @@ class PluginMakeCommand extends PluginCommand
} elseif (FileSystem::isRelativePath($load_dir)) { } elseif (FileSystem::isRelativePath($load_dir)) {
$load_dir = SOURCE_ROOT_DIR . '/' . $load_dir; $load_dir = SOURCE_ROOT_DIR . '/' . $load_dir;
} }
$plugin_dir = zm_dir($load_dir); $this->plugin_dir = zm_dir($load_dir);
// 询问插件名称 // 询问插件名称
if ($this->input->getArgument('name') === null) { if ($this->input->getArgument('name') === null) {
@@ -61,11 +61,11 @@ class PluginMakeCommand extends PluginCommand
} }
} }
$generator = new PluginGenerator($this->input->getArgument('name'), $plugin_dir); $generator = new PluginGenerator($this->input->getArgument('name'), $this->plugin_dir);
$generator->generate($this->input->getOptions()); $generator->generate($this->input->getOptions());
$this->info('已生成插件：' . $this->input->getArgument('name')); $this->info('已生成插件：' . $this->input->getArgument('name'));
$this->info('目录位置：' . zm_dir($plugin_dir . '/' . $this->input->getArgument('name'))); $this->info('目录位置：' . zm_dir($this->plugin_dir . '/' . $this->input->getArgument('name')));
return self::SUCCESS; return self::SUCCESS;
} }
} }

2
src/ZM/Plugin/PluginManager.php
View File

@@ -9,6 +9,7 @@ use ZM\Annotation\AnnotationMap;
use ZM\Annotation\AnnotationParser; use ZM\Annotation\AnnotationParser;
use ZM\Annotation\Framework\BindEvent; use ZM\Annotation\Framework\BindEvent;
use ZM\Command\Command; use ZM\Command\Command;
use ZM\Exception\FileSystemException;
use ZM\Exception\PluginException; use ZM\Exception\PluginException;
use ZM\Store\FileSystem; use ZM\Store\FileSystem;
use ZM\Store\PharHelper; use ZM\Store\PharHelper;
@@ -288,6 +289,7 @@ class PluginManager
* 打包插件到 Phar * 打包插件到 Phar
* *
* @throws PluginException * @throws PluginException
* @throws FileSystemException
*/ */
public static function packPlugin(string $plugin_name, string $build_dir, ?Command $command_context = null): string public static function packPlugin(string $plugin_name, string $build_dir, ?Command $command_context = null): string
{ {