From 45381d44495448aa47c7d1c685210292278b096d Mon Sep 17 00:00:00 2001 From: thsrite Date: Tue, 15 Aug 2023 19:36:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20customHosts=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E9=87=8D=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/plugins/__init__.py | 18 ++---------------- app/plugins/customhosts/__init__.py | 15 +++++++++++++++ app/plugins/mediasyncdel/__init__.py | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/plugins/__init__.py b/app/plugins/__init__.py index 392ca73e..0457f468 100644 --- a/app/plugins/__init__.py +++ b/app/plugins/__init__.py @@ -4,13 +4,12 @@ from typing import Any, List, Dict, Tuple from app.chain import ChainBase from app.core.config import settings -from app.core.event import EventManager, eventmanager, Event +from app.core.event import EventManager from app.db.models import Base from app.db.plugindata_oper import PluginDataOper from app.db.systemconfig_oper import SystemConfigOper from app.helper.message import MessageHelper from app.schemas import Notification, NotificationType, MessageChannel -from app.schemas.types import EventType class PluginChian(ChainBase): @@ -182,17 +181,4 @@ class _PluginBase(metaclass=ABCMeta): self.chain.post_message(Notification( channel=channel, mtype=mtype, title=title, text=text, image=image, link=link, userid=userid - )) - - @eventmanager.register(EventType.PluginReload) - def reload(self, event: Event): - """ - 重新加载插件 - """ - plugin_id = event.event_data.get("plugin_id") - if not plugin_id: - return - conf = self.get_config(plugin_id) - if not conf: - return - self.init_plugin(conf) + )) \ No newline at end of file diff --git a/app/plugins/customhosts/__init__.py b/app/plugins/customhosts/__init__.py index c5c44421..4a69b6d0 100644 --- a/app/plugins/customhosts/__init__.py +++ b/app/plugins/customhosts/__init__.py @@ -1,8 +1,11 @@ from typing import List, Tuple, Dict, Any from python_hosts import Hosts, HostsEntry + +from app.core.event import eventmanager from app.log import logger from app.plugins import _PluginBase +from app.schemas.types import EventType from app.utils.ip import IpUtils from app.utils.system import SystemUtils @@ -221,3 +224,15 @@ class CustomHosts(_PluginBase): 退出插件 """ pass + + @eventmanager.register(EventType.PluginReload) + def reload(self, event): + """ + 响应插件重载事件 + """ + plugin_id = event.event_data.get("plugin_id") + if not plugin_id: + return + if plugin_id != self.__class__.__name__: + return + return self.init_plugin(self.get_config()) diff --git a/app/plugins/mediasyncdel/__init__.py b/app/plugins/mediasyncdel/__init__.py index 56b43c6f..77e56ec2 100644 --- a/app/plugins/mediasyncdel/__init__.py +++ b/app/plugins/mediasyncdel/__init__.py @@ -492,7 +492,7 @@ class MediaSyncDel(_PluginBase): try: # 判断种子是否被删除完 self.handle_torrent(history_id=transferhis.id, - src=history.src, + src=transferhis.src, torrent_hash=history.download_hash) except Exception as e: logger.error("删除种子失败，尝试删除源文件：%s" % str(e)) @@ -640,7 +640,7 @@ class MediaSyncDel(_PluginBase): try: # 判断种子是否被删除完 self.handle_torrent(history_id=transferhis.id, - src=history.src, + src=transferhis.src, torrent_hash=history.download_hash) except Exception as e: logger.error("删除种子失败，尝试删除源文件：%s" % str(e)) From 99eac825e76eefbdc4217d5fd257153ab29853c3 Mon Sep 17 00:00:00 2001 From: thsrite Date: Wed, 16 Aug 2023 09:47:29 +0800 Subject: [PATCH 2/3] fix #129 --- app/plugins/autobackup/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/plugins/autobackup/__init__.py b/app/plugins/autobackup/__init__.py index ee6fc20a..4d1062bb 100644 --- a/app/plugins/autobackup/__init__.py +++ b/app/plugins/autobackup/__init__.py @@ -152,7 +152,8 @@ class AutoBackup(_PluginBase): backup_path = bk_path / backup_file backup_path.mkdir(parents=True) # 把现有的相关文件进行copy备份 - shutil.copy(f'{config_path}/category.yaml', backup_path) + if settings.LIBRARY_CATEGORY: + shutil.copy(f'{config_path}/category.yaml', backup_path) shutil.copy(f'{config_path}/user.db', backup_path) zip_file = str(backup_path) + '.zip' From b6c95e1f93e1eacfbb61ded0a047f10bdc241a33 Mon Sep 17 00:00:00 2001 From: yubanmeiqin9048 <64676973+yubanmeiqin9048@users.noreply.github.com> Date: Wed, 16 Aug 2023 09:58:13 +0800 Subject: [PATCH 3/3] fix --- app/modules/filetransfer/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/modules/filetransfer/__init__.py b/app/modules/filetransfer/__init__.py index 58cdb633..4e761db5 100644 --- a/app/modules/filetransfer/__init__.py +++ b/app/modules/filetransfer/__init__.py @@ -122,11 +122,11 @@ class FileTransferModule(_ModuleBase): r"|chinese|(cn|ch[si]|sg|zho?|eng)[-_&](cn|ch[si]|sg|zho?|eng)" \ r"|简[体中]?)[.\])])" \ r"|([\u4e00-\u9fa5]{0,3}[中双][\u4e00-\u9fa5]{0,2}[字文语][\u4e00-\u9fa5]{0,3})" \ - r"|简体|简中" \ + r"|简体|简中|JPSC" \ r"|(?