aioqzone 1.3.0.dev2__tar.gz → 1.3.1.dev3__tar.gz

{aioqzone-1.3.0.dev2 → aioqzone-1.3.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.3.0.dev2
+Version: 1.3.1.dev3
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0

{aioqzone-1.3.0.dev2 → aioqzone-1.3.1.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.3.0.dev2"
+version = "1.3.1.dev3"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"

{aioqzone-1.3.0.dev2 → aioqzone-1.3.1.dev3}/src/aioqzone/api/h5/raw.py

@@ -157,19 +157,22 @@ class QzoneH5RawAPI:
         async def retry_closure():
             async with self.host_get("/mqzone/index", attach_token=False) as r:
                 r.raise_for_status()
-                return await r.text()
-
-        html = await retry_closure()
-        scripts: List = fromstring(html).xpath('body/script[@type="application/javascript"]')
-        if not scripts:
-            log.debug(html)
-            raise RuntimeError("script tag not found")
-
-        texts: List[str] = [s.text for s in scripts]
-        script = firstn(texts, lambda s: "shine0callback" in s)
-        if not script:
-            raise RuntimeError("data script not found")
 
+                html = await r.text()
+                scripts: List = fromstring(html).xpath(
+                    'body/script[@type="application/javascript"]'
+                )
+                if not scripts:
+                    log.debug("jump to %s", str(r.url))
+                    raise QzoneError(-3000, "script tag not found")
+
+                texts: List[str] = [s.text for s in scripts]
+                script = firstn(texts, lambda s: "shine0callback" in s)
+                if not script:
+                    raise QzoneError(-3000, "data script not found")
+                return script
+
+        script = await retry_closure()
         m = re.search(r'window\.shine0callback.*return "([0-9a-f]+?)";', script)
         if m is None:
             raise RuntimeError("data script not found")

{aioqzone-1.3.0.dev2 → aioqzone-1.3.1.dev3}/src/qqqr/up/web.py

@@ -254,7 +254,11 @@ class UpWebLogin(_UpHookMixin, LoginBase[UpWebSession]):
 
         if sess.code == StatusCode.NeedCaptcha:
             log.warning("需通过防水墙")
-            if await self.pass_vc(sess) is None:
+            try:
+                sess = await self.pass_vc(sess)
+            except NotImplementedError:
+                raise TencentLoginError(StatusCode.NeedCaptcha, "非滑动验证码，无法自动通过")
+            if sess is None:
                 raise TencentLoginError(StatusCode.NeedCaptcha, "未安装依赖，无法识别验证码")
             if sess.verify_rst is None or not sess.verify_rst.ticket:
                 raise TencentLoginError(StatusCode.NeedCaptcha, "验证过程出现错误")
@@ -311,6 +315,7 @@ class UpWebLogin(_UpHookMixin, LoginBase[UpWebSession]):
         It is called when :meth:`.try_login` returns a :obj:`StatusCode.NeedCaptcha` code.
 
         :param sess: the session object
+        :raise NotImplementedError: if not a slide captcha
         :return: The session with :obj:`~UpWebSession.verify_rst` is set, or None if :exc:`ImportError`.
         """
         solver = self.captcha(sess.check_rst.session)
@@ -318,10 +323,7 @@ class UpWebLogin(_UpHookMixin, LoginBase[UpWebSession]):
             return
 
         for retry in range(4):
-            try:
-                sess.verify_rst = await solver.verify()
-            except NotImplementedError:
-                return
+            sess.verify_rst = await solver.verify()
             if sess.verify_rst.ticket:
                 break
             log.warning(f"ticket is empty. retry={retry}")