From 45fdacd8f5d25a6512ea48e2f68d49a5c50e7bfb Mon Sep 17 00:00:00 2001 From: thsrite Date: Fri, 12 Jul 2024 11:36:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- package.json | 3 ++- plugins/filesoftlink/__init__.py | 26 ++++++++++++++------------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 8795c9f..e6bae62 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ MoviePilot三方插件市场:https://github.com/thsrite/MoviePilot-Plugins/ - [自定义命令 v1.7](docs%2FCustomCommand.md) - docker自定义任务 v1.3 - 插件彻底卸载 v1.0 -- 实时软连接 v1.9.5 +- 实时软连接 v1.9.6 - 订阅规则自动填充 v2.7 - Emby元数据刷新 v1.3 - Emby媒体标签 v1.2 diff --git a/package.json b/package.json index 29d7831..3717640 100644 --- a/package.json +++ b/package.json @@ -389,11 +389,12 @@ "name": "实时软连接", "description": "监控目录文件变化,媒体文件软连接,其他文件可选复制。", "labels": "文件管理", - "version": "1.9.5", + "version": "1.9.6", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/softlink.png", "author": "thsrite", "level": 1, "history": { + "v1.9.6": "优化log", "v1.9.5": "增强交互命令", "v1.9.4": "监控目录自定义监控模式", "v1.9.3": "增强交互命令模糊匹配", diff --git a/plugins/filesoftlink/__init__.py b/plugins/filesoftlink/__init__.py index 65ddd9a..7be2ea0 100644 --- a/plugins/filesoftlink/__init__.py +++ b/plugins/filesoftlink/__init__.py @@ -52,7 +52,7 @@ class FileSoftLink(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/softlink.png" # 插件版本 - plugin_version = "1.9.5" + plugin_version = "1.9.6" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -265,6 +265,7 @@ class FileSoftLink(_PluginBase): if not args: logger.error(f"缺少参数:{event_data}") return + all_args = args # 使用正则表达式匹配 category = None @@ -292,10 +293,9 @@ class FileSoftLink(_PluginBase): src_file = os.path.join(sroot, file_name) if Path(src_file).is_file(): self.__handle_file(event_path=str(src_file), mon_path=mon_path) - if event: - self.post_message(channel=event.event_data.get("channel"), - title=f"{args} 软连接完成!", - userid=event.event_data.get("user")) + self.post_message(channel=event.event_data.get("channel"), + title=f"{all_args} 软连接完成!", + userid=event.event_data.get("user")) return return else: @@ -319,9 +319,8 @@ class FileSoftLink(_PluginBase): src_file = os.path.join(sroot, file_name) if Path(str(src_file)).is_file(): self.__handle_file(event_path=str(src_file), mon_path=mon_path) - if event: - self.post_message(channel=event.event_data.get("channel"), - title=f"{args} 软连接完成!", userid=event.event_data.get("user")) + self.post_message(channel=event.event_data.get("channel"), + title=f"{all_args} 软连接完成!", userid=event.event_data.get("user")) return else: for mon_path in self._categoryconf.keys(): @@ -335,10 +334,13 @@ class FileSoftLink(_PluginBase): src_file = os.path.join(sroot, file_name) if Path(src_file).is_file(): self.__handle_file(event_path=str(src_file), mon_path=mon_path) - if event: - self.post_message(channel=event.event_data.get("channel"), - title=f"{args} 软连接完成!", - userid=event.event_data.get("user")) + self.post_message(channel=event.event_data.get("channel"), + title=f"{all_args} 软连接完成!", + userid=event.event_data.get("user")) + return + self.post_message(channel=event.event_data.get("channel"), + title=f"{all_args} 未检索到,请检查输入是否正确!", + userid=event.event_data.get("user")) def sync_all(self): """