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

fix playwright proxy

Browse Source
This commit is contained in:
jxxghp
2023-06-16 08:25:20 +08:00
parent 6a5e117f0b
commit 0ce6e652a0
28 changed files with 108 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/plugins/autosignin/__init__.py
View File

@ -139,6 +139,7 @@ class AutoSignIn(_PluginBase):
ua = site_info.get("ua")
render = site_info.get("render")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
if not site_url or not site_cookie:
logger.warn(f"未配置 {site} 的站点地址或Cookie，无法签到")
return ""
@ -154,7 +155,7 @@ class AutoSignIn(_PluginBase):
page_source = PlaywrightHelper().get_page_source(url=checkin_url,
cookies=site_cookie,
ua=ua,
proxies=proxies)
proxies=proxy_server)
if not SiteUtils.is_logged_in(page_source):
if under_challenge(page_source):
return f"【{site}】无法通过Cloudflare！"

3
app/plugins/autosignin/sites/52pt.py
View File

@ -46,12 +46,13 @@ class Pt52(_ISiteSigninHandler):
ua = site_info.get("ua")
render = site_info.get("render")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
# 判断今日是否已签到
html_text = self.get_page_source(url='https://52pt.site/bakatest.php',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:

6
app/plugins/autosignin/sites/btschool.py
View File

@ -38,13 +38,15 @@ class BTSchool(_ISiteSigninHandler):
ua = site_info.get("ua")
render = site_info.get("render")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
logger.info(f"{site} 开始签到")
# 判断今日是否已签到
html_text = self.get_page_source(url='https://pt.btschool.club',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
@ -63,7 +65,7 @@ class BTSchool(_ISiteSigninHandler):
html_text = self.get_page_source(url='https://pt.btschool.club/index.php?action=addbonus',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:

3
app/plugins/autosignin/sites/chdbits.py
View File

@ -46,13 +46,14 @@ class CHDBits(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 判断今日是否已签到
html_text = self.get_page_source(url='https://chdbits.co/bakatest.php',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:

3
app/plugins/autosignin/sites/haidan.py
View File

@ -37,13 +37,14 @@ class HaiDan(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 签到
html_text = self.get_page_source(url='https://www.haidan.video/signin.php',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")

3
app/plugins/autosignin/sites/hares.py
View File

@ -39,13 +39,14 @@ class Hares(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 获取页面html
html_text = self.get_page_source(url='https://club.hares.top',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:

3
app/plugins/autosignin/sites/hdcity.py
View File

@ -39,13 +39,14 @@ class HDCity(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 获取页面html
html_text = self.get_page_source(url='https://hdcity.city/sign',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")

3
app/plugins/autosignin/sites/hdsky.py
View File

@ -41,13 +41,14 @@ class HDSky(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 判断今日是否已签到
html_text = self.get_page_source(url='https://hdsky.me',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")

5
app/plugins/autosignin/sites/hdupt.py
View File

@ -41,13 +41,14 @@ class HDUpt(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 获取页面html
html_text = self.get_page_source(url='https://pt.hdupt.com',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")
@ -67,7 +68,7 @@ class HDUpt(_ISiteSigninHandler):
html_text = self.get_page_source(url='https://pt.hdupt.com/added.php?action=qiandao',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")

5
app/plugins/autosignin/sites/opencd.py
View File

@ -42,13 +42,14 @@ class Opencd(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 判断今日是否已签到
html_text = self.get_page_source(url='https://www.open.cd',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")
@ -66,7 +67,7 @@ class Opencd(_ISiteSigninHandler):
html_text = self.get_page_source(url='https://www.open.cd/plugin_sign-in.php',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")

3
app/plugins/autosignin/sites/pterclub.py
View File

@ -35,13 +35,14 @@ class PTerClub(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 签到
html_text = self.get_page_source(url='https://pterclub.com/attendance-ajax.php',
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，签到接口请求失败")

3
app/plugins/autosignin/sites/tjupt.py
View File

@ -56,6 +56,7 @@ class Tjupt(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 创建正确答案存储目录
@ -66,7 +67,7 @@ class Tjupt(_ISiteSigninHandler):
html_text = self.get_page_source(url=self._sign_in_url,
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
# 获取签到后返回html，判断是否签到成功

3
app/plugins/autosignin/sites/ttg.py
View File

@ -43,13 +43,14 @@ class TTG(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 获取页面html
html_text = self.get_page_source(url="https://totheglory.im",
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")

3
app/plugins/autosignin/sites/u2.py
View File

@ -49,6 +49,7 @@ class U2(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
now = datetime.datetime.now()
@ -61,7 +62,7 @@ class U2(_ISiteSigninHandler):
html_text = self.get_page_source(url="https://u2.dmhy.org/showup.php",
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"签到失败，请检查站点连通性")

3
app/plugins/autosignin/sites/zhuque.py
View File

@ -37,13 +37,14 @@ class ZhuQue(_ISiteSigninHandler):
site_cookie = site_info.get("cookie")
ua = site_info.get("ua")
proxies = settings.PROXY if site_info.get("proxy") else None
proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None
render = site_info.get("render")
# 获取页面html
html_text = self.get_page_source(url="https://zhuque.in",
cookie=site_cookie,
ua=ua,
proxies=proxies,
proxies=proxy_server,
render=render)
if not html_text:
logger.error(f"模拟登录失败，请检查站点连通性")

3
app/plugins/sitestatistic/__init__.py
View File

@ -101,6 +101,7 @@ class SiteStatistic(_PluginBase):
ua = site_info.get("ua")
session = requests.Session()
proxies = settings.PROXY if proxy else None
proxy_server = settings.PROXY_SERVER if proxy else None
render = site_info.get("render")
logger.debug(f"站点 {site_name} url={url} site_cookie={site_cookie} ua={ua}")
@ -109,7 +110,7 @@ class SiteStatistic(_PluginBase):
html_text = PlaywrightHelper().get_page_source(url=url,
cookies=site_cookie,
ua=ua,
proxies=proxies)
proxies=proxy_server)
else:
# 普通模式
res = RequestUtils(cookies=site_cookie,