重写帮助,删除 详细帮助 命令

This commit is contained in:
HibiKier
2022-12-10 19:59:16 +08:00
parent 5fb4eccd0f
commit f496ce4861
10 changed files with 215 additions and 319 deletions
@@ -1,3 +1,4 @@
import random
from types import ModuleType
from typing import Any
@@ -7,7 +8,7 @@ from utils.manager import (
plugins2settings_manager,
plugins2cd_manager,
plugins2block_manager,
plugins2count_manager,
plugins2count_manager, plugins_manager,
)
from configs.config import Config
from utils.manager.models import (
@@ -16,7 +17,7 @@ from utils.manager.models import (
PluginCd,
PluginData,
PluginBlock,
PluginCount,
PluginCount, Plugin,
)
from utils.utils import get_matchers
@@ -99,6 +100,13 @@ def init_plugin_info():
plugin_count = plugin_count_limit
if plugin_cfg := Config.get(plugin_model):
plugin_configs = plugin_cfg
plugin_status = plugins_manager.get(plugin_model)
if not plugin_status:
plugin_status = Plugin(
plugin_name=plugin_model
)
plugin_status.author = plugin_author
plugin_status.version = plugin_version
plugin_data = PluginData(
model=plugin_model,
name=plugin_name.strip(),
@@ -107,14 +115,13 @@ def init_plugin_info():
des=plugin_des,
task=plugin_task,
menu_type=menu_type,
version=plugin_version,
author=plugin_author,
plugin_setting=plugin_setting,
plugin_cd=plugin_cd,
plugin_block=plugin_block,
plugin_count=plugin_count,
plugin_resources=plugin_resources,
plugin_configs=plugin_configs,
plugin_status=plugin_status
)
plugin_data_manager.add_plugin_info(plugin_data)
except Exception as e:
@@ -23,15 +23,15 @@ def init_plugins_config():
if plugin_data := plugin_data_manager.get(matcher.plugin_name):
# 插件配置版本更新或为Version为None或不在存储配置内,当使用metadata时,必定更新
if plugin_data.plugin_configs and (
isinstance(plugin_data.version, str)
isinstance(plugin_data.plugin_status.version, str)
or (
plugin_data.version is None
plugin_data.plugin_status.version is None
or (
_data.get(matcher.plugin_name)
and _data[matcher.plugin_name].keys()
!= plugin_data.plugin_configs.keys()
)
or plugin_data.version
or plugin_data.plugin_status.version
> plugins_manager.get(matcher.plugin_name).version
or matcher.plugin_name not in _data.keys()
)
@@ -33,9 +33,9 @@ def init_plugins_data():
else:
if plugin_data := plugin_data_manager.get(matcher.plugin_name):
try:
plugin_version = plugin_data.version
plugin_version = plugin_data.plugin_status.version
plugin_name = plugin_data.name
plugin_author = plugin_data.author
plugin_author = plugin_data.plugin_status.author
if matcher.plugin_name in plugins_manager.keys():
plugins_manager[matcher.plugin_name].error = False
if matcher.plugin_name not in plugins_manager.keys():