codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix site test

Browse Source
This commit is contained in:
jxxghp 2024-03-27 15:35:01 +08:00
parent f9069bf19b
commit eb751bb581
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/endpoints/site.py
View File

@ -174,7 +174,7 @@ def test_site(site_id: int,
status_code=404, status_code=404,
detail=f"站点 {site_id} 不存在", detail=f"站点 {site_id} 不存在",
) )
status, message = SiteChain().test(site.domain) status, message = SiteChain().test(url=site.domain)
return schemas.Response(success=status, message=message) return schemas.Response(success=status, message=message)

14
app/chain/site.py
View File

@ -5,6 +5,7 @@ from typing import Union
from urllib.parse import urljoin from urllib.parse import urljoin
from lxml import etree from lxml import etree
from ruamel.yaml import CommentedMap
from app.chain import ChainBase from app.chain import ChainBase
from app.core.config import settings from app.core.config import settings
@ -184,7 +185,7 @@ class SiteChain(ChainBase):
site_info = self.siteoper.get_by_domain(domain) site_info = self.siteoper.get_by_domain(domain)
if site_info: if site_info:
# 站点已存在，检查站点连通性 # 站点已存在，检查站点连通性
status, msg = self.test(domain) status, msg = self.test(url=domain)
# 更新站点Cookie # 更新站点Cookie
if status: if status:
logger.info(f"站点【{site_info.name}】连通性正常，不同步CookieCloud数据") logger.info(f"站点【{site_info.name}】连通性正常，不同步CookieCloud数据")
@ -326,15 +327,20 @@ class SiteChain(ChainBase):
logger.info(f"清理站点配置：{key}") logger.info(f"清理站点配置：{key}")
self.systemconfig.delete(key) self.systemconfig.delete(key)
def test(self, url: str) -> Tuple[bool, str]: def test(self, url: str = None, site_info: CommentedMap = None) -> Tuple[bool, str]:
""" """
测试站点是否可用 测试站点是否可用
:param url: 站点域名 :param url: 站点域名
:param site_info: 站点信息
:return: (是否可用, 错误信息) :return: (是否可用, 错误信息)
""" """
# 检查域名是否可用 # 检查域名是否可用
domain = StringUtils.get_url_domain(url) if url:
site_info = self.siteoper.get_by_domain(domain) domain = StringUtils.get_url_domain(url)
site_info = self.siteoper.get_by_domain(domain)
else:
domain = StringUtils.get_url_domain(site_info.get("url"))
if not site_info: if not site_info:
return False, f"站点【{url}】不存在" return False, f"站点【{url}】不存在"