qqmusic-api-python 0.1.4__tar.gz → 0.1.5__tar.gz

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qqmusic-api-python
-Version: 0.1.4
+Version: 0.1.5
 Summary: QQ音乐API封装库
 Keywords: music,api,qqmusic,tencentmusic
 Home-page: https://github.com/luren-dc/QQMusicApi
@@ -39,7 +39,7 @@ Description-Content-Type: text/markdown
     <a href="https://pdm-project.org">
         <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fcdn.jsdelivr.net%2Fgh%2Fpdm-project%2F.github%2Fbadge.json" alt="pdm-managed">
     </a>
-    <a href="https://github.com/luren-dc/QQMusicApi/tree/build?tab=License-1-ov-file">
+    <a href="https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file">
         <img src="https://img.shields.io/github/license/luren-dc/PyQQMusicApi" alt="GitHub license">
     </a>
     <a href="https://github.com/luren-dc/QQMusicApi/stargazers">

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/README.md

@@ -10,7 +10,7 @@
     <a href="https://pdm-project.org">
         <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fcdn.jsdelivr.net%2Fgh%2Fpdm-project%2F.github%2Fbadge.json" alt="pdm-managed">
     </a>
-    <a href="https://github.com/luren-dc/QQMusicApi/tree/build?tab=License-1-ov-file">
+    <a href="https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file">
         <img src="https://img.shields.io/github/license/luren-dc/PyQQMusicApi" alt="GitHub license">
     </a>
     <a href="https://github.com/luren-dc/QQMusicApi/stargazers">

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/pyproject.toml

@@ -40,7 +40,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dynamic = []
-version = "0.1.4"
+version = "0.1.5"
 
 [project.license]
 text = "MIT"
@@ -79,14 +79,6 @@ linting = [
     "ruff>=0.5.4",
 ]
 
-[tool.pdm.build]
-source-includes = [
-    "qqmusic_api",
-    "README.md",
-    "LICENSE",
-    "tests",
-]
-
 [tool.pdm.scripts]
 docs = "mkdocs serve"
 
@@ -129,6 +121,11 @@ convention = "google"
 "tests/*" = [
     "D",
 ]
+"qqmusic_api/login.py" = [
+    "F405",
+    "F403",
+    "D102",
+]
 "qqmusic_api/__init__.py" = [
     "F405",
     "F403",

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/qqmusic_api/__init__.py

@@ -2,7 +2,7 @@ from . import album, login, mv, search, singer, song, songlist, top
 from .utils.credential import Credential
 from .utils.network import get_aiohttp_session, set_aiohttp_session
 
-__version__ = "0.1.4"
+__version__ = "0.1.5"
 
 __all__ = [
     "album",

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/qqmusic_api/album.py

@@ -1,5 +1,7 @@
 """专辑相关 API"""
 
+from typing import Optional
+
 from .song import Song
 from .utils.network import Api
 from .utils.utils import get_api
@@ -14,16 +16,25 @@ class Album:
         mid: 专辑 mid
     """
 
-    def __init__(self, mid: str):
+    def __init__(
+        self,
+        mid: Optional[str] = None,
+        id: Optional[int] = None,
+    ):
         """初始化专辑类
 
         Args:
             mid: 专辑 mid
+            id: 专辑 id
         """
+        # ID 检查
+        if mid is None and id is None:
+            raise ValueError("mid or id must be provided")
         self.mid = mid
+        self.id = id
 
     def __repr__(self) -> str:
-        return f"Album(mid={self.mid})"
+        return f"Album(mid={self.mid}, id={self.id})"
 
     async def get_detail(self) -> dict:
         """获取专辑详细信息
@@ -31,7 +42,7 @@ class Album:
         Returns:
             专辑详细信息
         """
-        return await Api(**API["detail"]).update_params(albumMid=self.mid).result
+        return await Api(**API["detail"]).update_params(albumMid=self.mid, albumId=self.id).result
 
     async def get_song(self) -> list[Song]:
         """获取专辑歌曲
@@ -39,5 +50,5 @@ class Album:
         Returns:
             歌曲列表
         """
-        result = await Api(**API["song"]).update_params(albumMid=self.mid, begin=0, num=0).result
+        result = await Api(**API["song"]).update_params(albumMid=self.mid, albumId=self.id, begin=0, num=0).result
         return [Song.from_dict(song["songInfo"]) for song in result["songList"]]

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/qqmusic_api/data/api/album.json

@@ -3,7 +3,8 @@
         "module": "music.musichallAlbum.AlbumInfoServer",
         "method": "GetAlbumDetail",
         "params": {
-            "albumMid": "str 专辑 mid"
+            "albumMid": "str 专辑 mid",
+            "albumId": "str 专辑 id"
         },
         "comment": "获取专辑信息"
     },
@@ -12,6 +13,7 @@
         "method": "GetAlbumSongList",
         "params": {
             "albumMid": "str 专辑 mid",
+            "albumId": "str 专辑 id",
             "begin": "int 开启位置",
             "num": "int 返回数量"
         },

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/qqmusic_api/login.py

@@ -2,6 +2,7 @@
 
 import random
 import re
+import sys
 import time
 import uuid
 from abc import ABC, abstractmethod
@@ -9,7 +10,11 @@ from enum import Enum
 from typing import Optional
 
 import aiohttp
-from typing_extensions import override
+
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
 
 from .exceptions import LoginException, ResponseCodeException
 from .utils.credential import Credential
@@ -51,7 +56,7 @@ class PhoneLoginEvents(Enum):
     OTHER = 5
 
 
-class Login:
+class Login(ABC):
     """登录基类
 
     Attributes:
@@ -64,7 +69,7 @@ class Login:
         self.credential: Optional[Credential] = None
 
 
-class QRCodeLogin(Login, ABC):
+class QRCodeLogin(Login):
     """二维码登录基类
 
     Attributes:
@@ -76,14 +81,19 @@ class QRCodeLogin(Login, ABC):
         self.musicid = ""
         self._state: Optional[QrCodeLoginEvents] = None
         self._qrcode_data: Optional[bytes] = None
+        self._session = aiohttp.ClientSession()
+
+    async def close(self):
+        """关闭登录会话"""
+        if not self._session.closed:
+            await self._session.close()
 
     async def __aenter__(self):
-        self.session = aiohttp.ClientSession()
+        await self._session.__aenter__()
         return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
-        if not self.session.closed:
-            await self.session.close()
+        await self.close()
 
     @abstractmethod
     async def get_qrcode(self) -> bytes:
@@ -128,7 +138,7 @@ class QQLogin(QRCodeLogin):
             QrCodeLoginEvents.DONE,
         ]:
             return self._qrcode_data
-        async with self.session.get(
+        async with self._session.get(
             "https://xui.ptlogin2.qq.com/cgi-bin/xlogin",
             params={
                 "appid": "716027609",
@@ -146,7 +156,7 @@ class QQLogin(QRCodeLogin):
             },
         ) as res:
             self.sig = res.cookies.get("pt_login_sig").value
-        async with self.session.get(
+        async with self._session.get(
             "https://ssl.ptlogin2.qq.com/ptqrshow",
             params={
                 "appid": "716027609",
@@ -168,7 +178,7 @@ class QQLogin(QRCodeLogin):
     async def get_qrcode_state(self):
         if not self._qrcode_data:
             raise LoginException("请先获取二维码")
-        async with self.session.get(
+        async with self._session.get(
             "https://ssl.ptlogin2.qq.com/ptqrlogin",
             params={
                 "u1": "https://graph.qq.com/oauth2.0/login_jump",
@@ -216,7 +226,7 @@ class QQLogin(QRCodeLogin):
         if self._state != QrCodeLoginEvents.DONE:
             raise LoginException("未完成二维码认证")
         # TODO: 优化获取 p_skey
-        async with self.session.get(self.auth_url, allow_redirects=False) as res:  # type: ignore
+        async with self._session.get(self.auth_url, allow_redirects=False) as res:  # type: ignore
             from http import cookies
 
             set_cookie_header = res.headers.getall("Set-Cookie", [])
@@ -225,10 +235,10 @@ class QQLogin(QRCodeLogin):
                 cookie.load(header)
                 for key, morsel in cookie.items():
                     if morsel.value:
-                        self.session.cookie_jar.update_cookies(cookie)
+                        self._session.cookie_jar.update_cookies(cookie)
 
-        skey = self.session.cookie_jar.filter_cookies(self.auth_url).get("p_skey").value  # type: ignore
-        async with self.session.post(
+        skey = self._session.cookie_jar.filter_cookies(self.auth_url).get("p_skey").value  # type: ignore
+        async with self._session.post(
             "https://graph.qq.com/oauth2.0/authorize",
             params={
                 "Referer": "https://graph.qq.com/oauth2.0/show?which=Login&display=pc&response_type=code&client_id"
@@ -277,7 +287,7 @@ class WXLogin(QRCodeLogin):
             QrCodeLoginEvents.DONE,
         ]:
             return self._qrcode_data
-        async with self.session.get(
+        async with self._session.get(
             "https://open.weixin.qq.com/connect/qrconnect",
             params={
                 "appid": "wx48db31d50e334801",
@@ -289,7 +299,7 @@ class WXLogin(QRCodeLogin):
             },
         ) as res:
             self.__uuid = re.findall(r"uuid=(.+?)\"", await res.text())[0]
-        async with self.session.get(
+        async with self._session.get(
             f"https://open.weixin.qq.com/connect/qrcode/{self.__uuid}",
             headers={
                 "referer": "https://open.weixin.qq.com/connect/qrconnect?appid=wx48db31d50e334801"
@@ -308,7 +318,7 @@ class WXLogin(QRCodeLogin):
     async def get_qrcode_state(self):
         if not self._qrcode_data:
             raise LoginException("请先获取二维码")
-        async with self.session.get(
+        async with self._session.get(
             "https://lp.open.weixin.qq.com/connect/l/qrconnect",
             headers={
                 "referer": "https://open.weixin.qq.com/",
@@ -338,7 +348,7 @@ class WXLogin(QRCodeLogin):
                 "https://y.qq.com/portal/wx_redirect.html?login_type=2"
                 f"&surl=https://y.qq.com/&code={self.musicid}&state=STATE"
             )
-            await self.session.get(
+            await self._session.get(
                 "https://lp.open.weixin.qq.com/connect/l/qrconnect",
                 params={
                     "uuid": self.__uuid,
@@ -354,7 +364,7 @@ class WXLogin(QRCodeLogin):
             return self.credential
         if self._state != QrCodeLoginEvents.DONE:
             raise LoginException("未完成二维码认证")
-        await self.session.get(self.auth_url, allow_redirects=False)  # type: ignore
+        await self._session.get(self.auth_url, allow_redirects=False)  # type: ignore
         res = (
             await Api(**API["WX_login"])
             .update_params(strAppid="wx48db31d50e334801", code=self.musicid)

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/qqmusic_api/singer.py

@@ -106,7 +106,6 @@ class TabType(Enum):
     VIDEO = ("video", "VideoTab")
 
     def __init__(self, tabID: str, tabName: str) -> None:
-        super().__init__()
         self.tabID = tabID
         self.tabName = tabName
 

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/qqmusic_api/song.py

@@ -93,7 +93,7 @@ class Song:
         """
         # ID 检查
         if mid is None and id is None:
-            raise TypeError("mid or id must be provided")
+            raise ValueError("mid or id must be provided")
         self._mid = mid
         self._id = id
         self._info: Optional[dict] = None

{qqmusic_api_python-0.1.4 → qqmusic_api_python-0.1.5}/qqmusic_api/utils/network.py

@@ -261,7 +261,7 @@ def __clean() -> None:
         if s0 is not None and not s0.closed:
             await s0.close()
 
-    if loop.is_closed():
+    if not loop.is_closed():
         loop.run_until_complete(__clean_task())
     else:
-        loop.create_task(__clean_task())
+        asyncio.run(__clean_task())