From 7c0db857e2e91ab5ac9dbba7f7be5c1b7ce461cf Mon Sep 17 00:00:00 2001 From: thsrite Date: Mon, 22 Apr 2024 16:32:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- plugins/siteunreadmsg/__init__.py | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 0ef38e7..eccccb8 100644 --- a/package.json +++ b/package.json @@ -28,11 +28,12 @@ "SiteUnreadMsg": { "name": "站点未读消息", "description": "发送站点未读消息。", - "version": "1.5", + "version": "1.6", "icon": "Synomail_A.png", "author": "thsrite", "level": 2, "history": { + "v1.6": "增加解析失败日志", "v1.5": "修复馒头未读消息1", "v1.4": "sync主仓库", "v1.3": "feat mtorrent", diff --git a/plugins/siteunreadmsg/__init__.py b/plugins/siteunreadmsg/__init__.py index c804001..042b0c7 100644 --- a/plugins/siteunreadmsg/__init__.py +++ b/plugins/siteunreadmsg/__init__.py @@ -37,7 +37,7 @@ class SiteUnreadMsg(_PluginBase): # 插件图标 plugin_icon = "Synomail_A.png" # 插件版本 - plugin_version = "1.5" + plugin_version = "1.6" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -526,7 +526,6 @@ class SiteUnreadMsg(_PluginBase): site_url = site_info.get('url') if not site_url: return None - unread_msg_notify = True try: site_user_info: ISiteUserInfo = self.build(site_info=site_info) if site_user_info: @@ -536,22 +535,23 @@ class SiteUnreadMsg(_PluginBase): logger.debug(f"站点 {site_name} 解析完成") # 获取不到数据时,仅返回错误信息,不做历史数据更新 - if site_user_info.err_msg: + if site_user_info.err_msg and site_user_info.message_unread <= 0: + logger.error(f"站点 {site_name} 解析失败:{site_user_info.err_msg} {site_user_info.message_unread}") return None # 发送通知,存在未读消息 - self.__notify_unread_msg(site_name, site_user_info, unread_msg_notify) + self.__notify_unread_msg(site_name, site_user_info) except Exception as e: logger.error(f"站点 {site_name} 获取流量数据失败:{str(e)}") - def __notify_unread_msg(self, site_name: str, site_user_info: ISiteUserInfo, unread_msg_notify: bool): + def __notify_unread_msg(self, site_name: str, site_user_info: ISiteUserInfo): if site_user_info.message_unread <= 0: - return - if not unread_msg_notify: + logger.debug(f"站点 {site_name} 没有新消息") return # 解析出内容,则发送内容 if len(site_user_info.message_unread_contents) > 0: + logger.debug(f"开始解析站点 {site_name} 未读消息 {site_user_info.message_unread_contents}") for head, date, content in site_user_info.message_unread_contents: msg_title = f"【站点 {site_user_info.site_name} 消息】" msg_text = f"时间:{date}\n标题:{head}\n内容:\n{content}"