d0zingcat/MoviePilot-Plugins
1
0
Fork 0
mirror of https://github.com/d0zingcat/MoviePilot-Plugins.git synced 2026-05-13 15:09:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 过滤空行&GitHub raw下载错误

Browse Source
This commit is contained in:
honue
2024-03-13 18:35:22 +08:00
parent edd92867df
commit 23e551a0a2
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -370,7 +370,7 @@
"RemoteIdentifiers": {
"name": "共享识别词",
"description": "从Github、Etherpad等远程文件中获取共享识别词并应用。",
"version": "2.1",
"version": "2.2",
"icon": "words.png",
"author": "honue",
"level": 1

32
plugins/remoteidentifiers/__init__.py
View File

@@ -23,7 +23,7 @@ class RemoteIdentifiers(_PluginBase):
# 插件图标
plugin_icon = "words.png"
# 插件版本
plugin_version = "2.1"
plugin_version = "2.2"
# 插件作者
plugin_author = "honue"
# 作者主页
@@ -48,11 +48,11 @@ class RemoteIdentifiers(_PluginBase):
# 停止后台任务
self.stop_service()
if config:
self._enable = config.get("enable") or False
self._onlyonce = config.get("onlyonce") or False
self._enable = config.get("enable") if config.get("enable") is not None else False
self._onlyonce = config.get("onlyonce") if config.get("onlyonce") is not None else False
self._flitter = config.get("flitter") if config.get("flitter") is not None else False
self._cron = config.get("cron") or '30 4 * * *'
self._file_urls = config.get("file_urls") or ''
self._flitter = config.get("flitter") or False
# config操作
self.systemconfig = SystemConfigOper()
@@ -75,22 +75,22 @@ class RemoteIdentifiers(_PluginBase):
ret: List[str] = ['#========以下识别词由 RemoteIdentifiers 插件添加========#']
for file_url in file_urls:
# https://movie-pilot.org/etherpad/p/MoviePilot_TV_Words
if file_url.find("etherpad") and file_url.find("export") < 0:
if file_url.count("etherpad") != 0 and file_url.count("export") == 0:
real_url = file_url + "/export/txt"
else:
real_url = file_url
response = RequestUtils(proxies=settings.PROXY,
headers=settings.GITHUB_HEADERS if real_url.find("git") else None,
headers=settings.GITHUB_HEADERS if real_url.count("github") else None,
timeout=15).get_res(real_url)
if not response:
raise Exception(f"文件 {file_url} 下载失败！")
raise Exception(f"文件 {real_url} 下载失败！")
elif response.status_code != 200:
raise Exception(f"下载文件 {file_url} 失败：{response.status_code} - {response.reason}")
raise Exception(f"下载文件 {real_url} 失败：{response.status_code} - {response.reason}")
text = response.content.decode('utf-8')
if text.find("doctype html") > 0:
raise Exception(f"下载文件 {file_url} 失败：{response.status_code} - {response.reason}")
raise Exception(f"下载文件 {real_url} 失败：{response.status_code} - {response.reason}")
if "try again later" in text:
raise Exception(f"下载文件 {file_url} 失败：{text}")
raise Exception(f"下载文件 {real_url} 失败：{text}")
identifiers: List[str] = text.split('\n')
ret += identifiers
# flitter 过滤空行
@@ -131,7 +131,7 @@ class RemoteIdentifiers(_PluginBase):
'component': 'VCol',
'props': {
'cols': 12,
'md': 3
'md': 2
},
'content': [
{
@@ -146,7 +146,7 @@ class RemoteIdentifiers(_PluginBase):
'component': 'VCol',
'props': {
'cols': 12,
'md': 3
'md': 2
},
'content': [
{
@@ -172,13 +172,7 @@ class RemoteIdentifiers(_PluginBase):
}
}
]
}
]
},
{
'component': 'VRow',
'content': [
{
}, {
'component': 'VCol',
'props': {
'cols': 12,