qqmusic-api-python 0.2.2__py3-none-any.whl → 0.3.1__py3-none-any.whl

qqmusic_api/__init__.py

@@ -1,31 +1,27 @@
 import logging
 
-from . import album, login, login_utils, lyric, mv, search, singer, song, songlist, top, user
+from . import album, login, lyric, mv, search, singer, song, songlist, top, user
 from .utils.credential import Credential
-from .utils.session import create_session, get_session, set_session, set_session_credential
-from .utils.sync import sync
+from .utils.session import Session, get_session, set_session
 
-__version__ = "0.2.2"
+__version__ = "0.3.1"
 
 logger = logging.getLogger("qqmusicapi")
 
 
 __all__ = [
     "Credential",
+    "Session",
     "album",
-    "create_session",
     "get_session",
     "login",
-    "login_utils",
     "lyric",
     "mv",
     "search",
     "set_session",
-    "set_session_credential",
     "singer",
     "song",
     "songlist",
-    "sync",
     "top",
     "user",
 ]

qqmusic_api/album.py

@@ -1,14 +1,11 @@
 """专辑相关 API"""
 
-from typing import Literal
+from typing import Any, Literal
 
-from .utils.common import get_api
-from .utils.network import Api
+from .utils.network import NO_PROCESSOR, api_request
 
-API = get_api("album")
 
-
-def get_album_cover(mid: str, size: Literal[150, 300, 500, 800] = 300) -> str:
+def get_cover(mid: str, size: Literal[150, 300, 500, 800] = 300) -> str:
     """获取专辑封面链接
 
     Args:
@@ -23,70 +20,39 @@ def get_album_cover(mid: str, size: Literal[150, 300, 500, 800] = 300) -> str:
     return f"https://y.gtimg.cn/music/photo_new/T002R{size}x{size}M000{mid}.jpg"
 
 
-class Album:
-    """专辑类
+@api_request("music.musichallAlbum.AlbumInfoServer", "GetAlbumDetail")
+async def get_detail(value: str | int):
+    """获取专辑详细信息
 
-    Attributes:
-        mid: 专辑 mid
-        id:  专辑 id
+    Args:
+        value: 专辑 id 或 mid
     """
+    if isinstance(value, int):
+        return {"albumId": value}, NO_PROCESSOR
+
+    return {"albumMId": value}, NO_PROCESSOR
+
+
+@api_request("music.musichallAlbum.AlbumSongList", "GetAlbumSongList")
+async def get_song(value: str | int, num: int = 10, page: int = 1):
+    """获取专辑歌曲
+
+    Args:
+        value: 专辑 id 或 mid
+        num: 返回数量
+        page: 页码
+    """
+    params: dict[str, Any] = {
+        "begin": num * (page - 1),
+        "num": num,
+    }
+
+    def _processor(data: dict[str, Any]) -> list[dict[str, Any]]:
+        return [song["songInfo"] for song in data["songList"]]
+
+    if isinstance(value, int):
+        params["albumId"] = value
+    else:
+        params["albumMid"] = value
 
-    def __init__(
-        self,
-        *,
-        mid: str | None = None,
-        id: int | None = None,
-    ):
-        """初始化专辑类
-
-        Note:
-            歌曲 mid 和 id,两者至少提供一个
-
-        Args:
-            mid: 专辑 mid
-            id:  专辑 id
-        """
-        if mid is None and id is None:
-            raise ValueError("mid or id must be provided")
-        self.mid = mid or ""
-        self.id = id or 0
-        self._info: dict | None = None
-
-    async def get_mid(self) -> str:
-        """获取专辑 mid
-
-        Returns:
-            专辑 mid
-        """
-        if not self.mid:
-            self.mid = (await self.get_detail())["basicInfo"]["albumMid"]
-        return self.mid
-
-    async def get_id(self) -> int:
-        """获取专辑 id
-
-        Returns:
-            专辑 id
-        """
-        if not self.id:
-            self.id = (await self.get_detail())["basicInfo"]["albumID"]
-        return self.id
-
-    async def get_detail(self) -> dict:
-        """获取专辑详细信息
-
-        Returns:
-            专辑详细信息
-        """
-        if not self._info:
-            self._info = await Api(**API["detail"]).update_params(albumMid=self.mid, albumId=self.id).result
-        return self._info
-
-    async def get_song(self) -> list[dict]:
-        """获取专辑歌曲
-
-        Returns:
-            歌曲列表
-        """
-        result = await Api(**API["song"]).update_params(albumMid=self.mid, albumId=self.id, begin=0, num=0).result
-        return [song["songInfo"] for song in result["songList"]]
+    return params, _processor