-
Notifications
You must be signed in to change notification settings - Fork 178
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: 添加视频浏览任务 * fix: 修复无法找到视频任务配置的问题 * feat: 添加未设置`login_user_agent`提示 * fix: string statement has no effect
- Loading branch information
1 parent
8a7913a
commit 971b867
Showing
4 changed files
with
31 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,7 +27,7 @@ jobs: | |
pipreqs . --encoding=utf8 --force | ||
- name: Upload requirements.txt | ||
uses: EndBug/[email protected].3 | ||
uses: EndBug/[email protected].4 | ||
with: | ||
author_name: github-actions[bot] | ||
author_email: github-actions[bot]@users.noreply.github.com | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
{ | ||
// 使用 IntelliSense 了解相关属性。 | ||
// 悬停以查看现有属性的描述。 | ||
// 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387 | ||
"version": "0.2.0", | ||
"configurations": [ | ||
{ | ||
"name": "Python 调试程序: 签到", | ||
"type": "debugpy", | ||
"request": "launch", | ||
"program": "${workspaceFolder}/miuitask.py", | ||
"console": "integratedTerminal" | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,9 @@ | ||
""" | ||
Author: Night-stars-1 [email protected] | ||
Date: 2024-02-21 22:50:45 | ||
LastEditTime: 2024-04-05 22:43:45 | ||
LastEditTime: 2024-08-20 22:36:18 | ||
LastEditors: Night-stars-1 [email protected] | ||
""" | ||
|
||
# new Env("MIUI-Auto-Task") # pylint: disable=missing-module-docstring | ||
# cron 30 8 * * * miuitask.py | ||
|
||
import asyncio | ||
|
||
from tenacity import Retrying, stop_after_attempt | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
""" | ||
Date: 2023-11-12 14:05:06 | ||
LastEditors: Night-stars-1 [email protected] | ||
LastEditTime: 2024-04-05 22:53:24 | ||
LastEditTime: 2024-08-20 22:40:54 | ||
""" | ||
|
||
import time | ||
|
@@ -14,8 +14,8 @@ | |
from ..data_model import LoginResultHandler | ||
from ..logger import log | ||
from ..request import get, post | ||
from .sign import BaseSign | ||
from ..utils import generate_qrcode | ||
from .sign import BaseSign | ||
|
||
|
||
class Login: | ||
|
@@ -33,6 +33,9 @@ async def login( | |
self, | ||
) -> Union[Dict[str, str], bool]: | ||
"""登录小米账号""" | ||
if not self.user_agent: | ||
log.error("请设置 login_user_agent") | ||
return False | ||
headers = { | ||
"Content-Type": "application/x-www-form-urlencoded", | ||
"User-Agent": self.user_agent, | ||
|
@@ -83,15 +86,14 @@ async def login( | |
log.success("小米账号登录成功") | ||
self.account.cookies["passToken"] = api_data.pass_token | ||
self.account.uid = api_data.user_id | ||
if ( | ||
cookies := await self.get_cookies_by_passtk( | ||
api_data.user_id, api_data.pass_token | ||
) | ||
) is False: | ||
return False | ||
self.account.cookies.update(cookies) | ||
write_plugin_data() | ||
return cookies | ||
if cookies := await self.get_cookies_by_passtk( | ||
api_data.user_id, api_data.pass_token | ||
): | ||
self.account.cookies.update(cookies) | ||
write_plugin_data() | ||
return cookies | ||
log.error("获取Cookie失败,可能是 login_user_agent 异常") | ||
return False | ||
elif api_data.pwd_wrong: | ||
log.error("小米账号登录失败:用户名或密码不正确, 请扫码登录") | ||
check_url = await self.qr_login() | ||
|
@@ -120,9 +122,7 @@ async def get_cookies(self, url: str) -> Union[Dict[str, str], bool]: | |
log.exception("社区获取 Cookie 失败") | ||
return False | ||
|
||
async def get_cookies_by_passtk( | ||
self, user_id: str, pass_token: str | ||
) -> Union[Dict[str, str], bool]: | ||
async def get_cookies_by_passtk(self, user_id: str, pass_token: str): | ||
"""使用passToken获取签到cookies""" | ||
try: | ||
headers = { | ||
|