diff --git a/README.md b/README.md index 62df72e..24a0f82 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ MoviePilot三方插件市场:https://github.com/thsrite/MoviePilot-Plugins/ ### 插件新增 - 站点数据统计 1.4 (无未读消息版本)(废弃) -- 站点未读消息 1.8 (依赖于[站点数据统计]插件) +- 站点未读消息 1.9 (依赖于[站点数据统计]插件) - [云盘Strm生成 3.7](docs%2FCloudStrm.md) - [Strm文件模式转换 1.0](docs%2FStrmConvert.md) - 清理订阅缓存 1.0 diff --git a/package.json b/package.json index d123228..f3f0985 100644 --- a/package.json +++ b/package.json @@ -31,11 +31,12 @@ "name": "站点未读消息", "description": "发送站点未读消息。", "labels": "站点", - "version": "1.8", + "version": "1.9", "icon": "Synomail_A.png", "author": "thsrite", "level": 2, "history": { + "v1.9": "同步主仓库", "v1.8": "自定义保留消息天数", "v1.7": "删除重复代码、依赖于[站点数据统计]插件", "v1.6": "增加解析失败日志", diff --git a/plugins/siteunreadmsg/__init__.py b/plugins/siteunreadmsg/__init__.py index fe1807d..603fc12 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.8" + plugin_version = "1.9" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -470,6 +470,8 @@ class SiteUnreadMsg(_PluginBase): if not site_cookie: return None site_name = site_info.get("name") + apikey = site_info.get("apikey") + token = site_info.get("token") url = site_info.get("url") proxy = site_info.get("proxy") ua = site_info.get("ua") @@ -522,9 +524,12 @@ class SiteUnreadMsg(_PluginBase): html_text = res.text if not html_text: return None - else: - logger.error("站点 %s 被反爬限制:%s, 状态码:%s" % (site_name, url, res.status_code)) - return None + elif res is not None: + logger.error("站点 %s 被反爬限制:%s, 状态码:%s" % (site_name, url, res.status_code)) + return None + else: + logger.error("站点 %s 无法访问:%s" % (site_name, url)) + return None # 兼容假首页情况,假首页通常没有