From 971b86732192b798a5d3cd4cbba964d63808b935 Mon Sep 17 00:00:00 2001 From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:51:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AElog?= =?UTF-8?q?in=5Fuser=5Fagent=E6=8F=90=E7=A4=BA=20(#293)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 添加视频浏览任务 * fix: 修复无法找到视频任务配置的问题 * feat: 添加未设置`login_user_agent`提示 * fix: string statement has no effect --- .github/workflows/up_requirement.yml | 2 +- .vscode/launch.json | 15 +++++++++++++++ miuitask.py | 6 +----- utils/api/login.py | 28 ++++++++++++++-------------- 4 files changed, 31 insertions(+), 20 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.github/workflows/up_requirement.yml b/.github/workflows/up_requirement.yml index 927dd89..8db2554 100644 --- a/.github/workflows/up_requirement.yml +++ b/.github/workflows/up_requirement.yml @@ -27,7 +27,7 @@ jobs: pipreqs . --encoding=utf8 --force - name: Upload requirements.txt - uses: EndBug/add-and-commit@v9.1.3 + uses: EndBug/add-and-commit@v9.1.4 with: author_name: github-actions[bot] author_email: github-actions[bot]@users.noreply.github.com diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..47c9030 --- /dev/null +++ b/.vscode/launch.json @@ -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" + } + ] +} \ No newline at end of file diff --git a/miuitask.py b/miuitask.py index d939e77..9326081 100644 --- a/miuitask.py +++ b/miuitask.py @@ -1,13 +1,9 @@ """ Author: Night-stars-1 nujj1042633805@gmail.com 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 nujj1042633805@gmail.com """ - -# new Env("MIUI-Auto-Task") # pylint: disable=missing-module-docstring -# cron 30 8 * * * miuitask.py - import asyncio from tenacity import Retrying, stop_after_attempt diff --git a/utils/api/login.py b/utils/api/login.py index c4d4dc5..36ef0c8 100644 --- a/utils/api/login.py +++ b/utils/api/login.py @@ -1,7 +1,7 @@ """ Date: 2023-11-12 14:05:06 LastEditors: Night-stars-1 nujj1042633805@gmail.com -LastEditTime: 2024-04-05 22:53:24 +LastEditTime: 2024-08-20 22:40:54 """ import time @@ -14,8 +14,8 @@ from ..config import Account, write_plugin_data 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 @@ class 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 @@ class 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 @@ class Login: 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 = {