thsrite/archived-MoviePilot-Plugins
1
0
Fork 0
mirror of https://github.com/thsrite/MoviePilot-Plugins.git synced 2026-06-04 07:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 修复配置修改后不重建缓存bug

Browse Source
This commit is contained in:
thsrite
2024-05-21 17:18:33 +08:00
parent f484804c59
commit 8652e0b7fc
3 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -1,4 +1,4 @@
# MoviePilot-Plugin-Market
# MoviePilot-Plugin-Market
MoviePilot三方插件市场：https://github.com/thsrite/MoviePilot-Plugins/
@@ -27,7 +27,7 @@ MoviePilot三方插件市场：https://github.com/thsrite/MoviePilot-Plugins/
- [短剧刮削 3.2](docs%2FShortPlayMonitor.md)
- 云盘实时监控 2.1
- 源文件恢复 1.2
- [微信消息转发 2.2](docs%2FWeChatForward.md)
- [微信消息转发 2.4](docs%2FWeChatForward.md)
- 订阅下载统计 1.5
- [自定义命令 1.7](docs%2FCustomCommand.md)
- docker自定义任务 1.3

3
package.json
View File

@@ -265,11 +265,12 @@
"name": "微信消息转发",
"description": "根据正则转发通知到其他WeChat应用。",
"labels": "消息通知",
"version": "2.3",
"version": "2.4",
"icon": "Wechat_A.png",
"author": "thsrite",
"level": 1,
"history": {
"v2.4": "修复配置修改后不重建缓存bug",
"v2.3": "增加重建缓存，丰富转发历史",
"v2.2": "增加消息发送历史",
"v2.1": "微信配置持久化存库",

108
plugins/wechatforward/__init__.py
View File

@@ -22,7 +22,7 @@ class WeChatForward(_PluginBase):
# 插件图标
plugin_icon = "Wechat_A.png"
# 插件版本
plugin_version = "2.3"
plugin_version = "2.4"
# 插件作者
plugin_author = "thsrite"
# 作者主页
@@ -154,52 +154,63 @@ class WeChatForward(_PluginBase):
"""
获取并存储wechat token
"""
# 从数据库获取token
wechat_confs = self.get_data('wechat_confs')
if not self._rebuild and wechat_confs:
self._wechat_token_pattern_confs = wechat_confs
logger.info(f"WeChat配置 从数据库获取成功：{len(self._wechat_token_pattern_confs.keys())}条配置")
# 如果重建则重新解析存库
if self._rebuild:
self.__parse_token()
else:
# 解析配置
for wechat in json.loads(self._wechat_confs):
remark = wechat.get("remark")
appid = wechat.get("appid")
corpid = wechat.get("corpid")
appsecret = wechat.get("appsecret")
pattern = wechat.get("pattern")
extra_confs = wechat.get("extra_confs")
if not appid or not corpid or not appsecret:
logger.error(f"{remark} 应用配置不正确, 跳过处理")
continue
# 从数据库获取token
wechat_confs = self.get_data('wechat_confs')
# 获取token
access_token, expires_in, access_token_time = self.__get_access_token(corpid=corpid,
appsecret=appsecret)
if not access_token:
# 没有token，获取token
logger.error(f"WeChat配置 {remark} 获取token失败，请检查配置")
continue
if wechat_confs:
self._wechat_token_pattern_confs = wechat_confs
logger.info(f"WeChat配置 从数据库获取成功：{len(self._wechat_token_pattern_confs.keys())}条配置")
else:
self.__parse_token()
self._wechat_token_pattern_confs[appid] = {
"remark": remark,
"corpid": corpid,
"appsecret": appsecret,
"access_token": access_token,
"expires_in": expires_in,
"access_token_time": access_token_time,
"pattern": pattern,
"extra_confs": extra_confs,
}
logger.info(f"WeChat配置 {remark} token请求成功")
def __parse_token(self):
"""
解析token存库
"""
# 解析配置
for wechat in json.loads(self._wechat_confs):
remark = wechat.get("remark")
appid = wechat.get("appid")
corpid = wechat.get("corpid")
appsecret = wechat.get("appsecret")
pattern = wechat.get("pattern")
extra_confs = wechat.get("extra_confs")
if not appid or not corpid or not appsecret:
logger.error(f"{remark} 应用配置不正确, 跳过处理")
continue
# 获取token
access_token, expires_in, access_token_time = self.__get_access_token(corpid=corpid,
appsecret=appsecret)
if not access_token:
# 没有token，获取token
logger.error(f"WeChat配置 {remark} 获取token失败，请检查配置")
continue
self._wechat_token_pattern_confs[appid] = {
"remark": remark,
"corpid": corpid,
"appsecret": appsecret,
"access_token": access_token,
"expires_in": expires_in,
"access_token_time": access_token_time,
"pattern": pattern,
"extra_confs": extra_confs,
}
logger.info(f"WeChat配置 {remark} token请求成功")
if self._rebuild:
self._rebuild = False
self.__update_config()
# token存库
if len(self._wechat_token_pattern_confs.keys()) > 0:
self.__save_wechat_confs()
if self._rebuild:
self._rebuild = False
self.__update_config()
# token存库
if len(self._wechat_token_pattern_confs.keys()) > 0:
self.__save_wechat_confs()
def __update_config(self):
self.update_config({
"enabled": self._enabled,
@@ -209,7 +220,7 @@ class WeChatForward(_PluginBase):
"specify_confs": self._specify_confs,
"history_days": self._history_days
})
def __save_wechat_confs(self):
"""
保存wechat配置
@@ -866,7 +877,8 @@ class WeChatForward(_PluginBase):
"enable_id_trans": 0,
"enable_duplicate_check": 0
}
return self.__post_request(access_token=access_token, req_json=req_json, appid=appid, title=title, text=text, userid=userid)
return self.__post_request(access_token=access_token, req_json=req_json, appid=appid, title=title, text=text,
userid=userid)
def __send_image_message(self, title: str, text: str, image_url: str, userid: str = None,
access_token: str = None, appid: int = None) -> Optional[bool]:
@@ -897,7 +909,8 @@ class WeChatForward(_PluginBase):
]
}
}
return self.__post_request(access_token=access_token, req_json=req_json, appid=appid, title=title, text=text, userid=userid)
return self.__post_request(access_token=access_token, req_json=req_json, appid=appid, title=title, text=text,
userid=userid)
def __post_request(self, access_token: str, req_json: dict, appid: int, title: str, retry: int = 0,
text: str = None, userid: str = None) -> bool:
@@ -918,7 +931,8 @@ class WeChatForward(_PluginBase):
history = self.get_data('history') or []
history.append({
"appid": appid,
"remark": f"({self._wechat_token_pattern_confs.get(appid).get('remark')})" if self._wechat_token_pattern_confs.get(appid).get('remark') else "",
"remark": f"({self._wechat_token_pattern_confs.get(appid).get('remark')})" if self._wechat_token_pattern_confs.get(
appid).get('remark') else "",
"title": title,
"text": text,
"userid": userid,