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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qqmusic-api-python
-Version: 0.1.5
+Version: 0.1.7
 Summary: QQ音乐API封装库
 Keywords: music,api,qqmusic,tencentmusic
 Home-page: https://github.com/luren-dc/QQMusicApi
@@ -22,9 +22,8 @@ Project-URL: Repository, https://github.com/luren-dc/QQMusicApi
 Project-URL: Documentation, https://github.com/luren-dc/QQMusicApi
 Requires-Python: <4.0,>=3.9
 Requires-Dist: cryptography<42.0.0,>=41.0.2
-Requires-Dist: requests<3.0.0,>=2.31.0
-Requires-Dist: aiohttp<4.0.0,>=3.9.5
 Requires-Dist: typing-extensions>=4.12.2
+Requires-Dist: httpx>=0.27.0
 Description-Content-Type: text/markdown
 
 <div align="center">
@@ -71,9 +70,10 @@ Description-Content-Type: text/markdown
 
 ## 依赖
 
-- [AIOHTTP](https://docs.aiohttp.org/)
-- [Requests](https://requests.readthedocs.io/)
+- ~~[AIOHTTP](https://docs.aiohttp.org/)~~
+- ~~[Requests](https://requests.readthedocs.io/)~~
 - [Cryptography](https://cryptography.io/)
+- [HTTPX](https://github.com/encode/httpx/)
 
 ## 快速上手
 

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

@@ -42,9 +42,10 @@
 
 ## 依赖
 
-- [AIOHTTP](https://docs.aiohttp.org/)
-- [Requests](https://requests.readthedocs.io/)
+- ~~[AIOHTTP](https://docs.aiohttp.org/)~~
+- ~~[Requests](https://requests.readthedocs.io/)~~
 - [Cryptography](https://cryptography.io/)
+- [HTTPX](https://github.com/encode/httpx/)
 
 ## 快速上手
 

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

@@ -12,9 +12,8 @@ authors = [
 ]
 dependencies = [
     "cryptography<42.0.0,>=41.0.2",
-    "requests<3.0.0,>=2.31.0",
-    "aiohttp<4.0.0,>=3.9.5",
     "typing-extensions>=4.12.2",
+    "httpx>=0.27.0",
 ]
 requires-python = "<4.0,>=3.9"
 readme = "README.md"
@@ -40,7 +39,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dynamic = []
-version = "0.1.5"
+version = "0.1.7"
 
 [project.license]
 text = "MIT"
@@ -73,7 +72,6 @@ docs = [
 ]
 mypy = [
     "mypy>=1.11.0",
-    "types-requests>=2.32.0.20240712",
 ]
 linting = [
     "ruff>=0.5.4",
@@ -121,9 +119,11 @@ convention = "google"
 "tests/*" = [
     "D",
 ]
+"examples/*" = [
+    "D",
+    "T",
+]
 "qqmusic_api/login.py" = [
-    "F405",
-    "F403",
     "D102",
 ]
 "qqmusic_api/__init__.py" = [

qqmusic_api_python-0.1.7/qqmusic_api/__init__.py

@@ -0,0 +1,22 @@
+from . import album, login, lyric, mv, search, singer, song, songlist, top
+from .utils.credential import Credential
+from .utils.network import get_session, set_session
+from .utils.sync import sync
+
+__version__ = "0.1.7"
+
+__all__ = [
+    "album",
+    "Credential",
+    "get_session",
+    "login",
+    "lyric",
+    "mv",
+    "search",
+    "set_session",
+    "singer",
+    "song",
+    "songlist",
+    "sync",
+    "top",
+]

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

@@ -2,7 +2,6 @@
 
 from typing import Optional
 
-from .song import Song
 from .utils.network import Api
 from .utils.utils import get_api
 
@@ -14,27 +13,45 @@ class Album:
 
     Attributes:
         mid: 专辑 mid
+        id:  专辑 id
     """
 
     def __init__(
         self,
+        *,
         mid: Optional[str] = None,
         id: Optional[int] = None,
     ):
         """初始化专辑类
 
+        Note:
+            歌曲 mid 和 id，两者至少提供一个
+
         Args:
             mid: 专辑 mid
-            id: 专辑 id
+            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
+        self._info: Optional[dict] = None
+
+    async def get_mid(self) -> str:
+        """获取专辑 mid
+
+        Returns:
+            专辑 mid
+        """
+        return (await self.get_detail())["basicInfo"]["albumMid"]
+
+    async def get_id(self) -> int:
+        """获取专辑 id
 
-    def __repr__(self) -> str:
-        return f"Album(mid={self.mid}, id={self.id})"
+        Returns:
+            专辑 id
+        """
+        return (await self.get_detail())["basicInfo"]["albumID"]
 
     async def get_detail(self) -> dict:
         """获取专辑详细信息
@@ -42,13 +59,15 @@ class Album:
         Returns:
             专辑详细信息
         """
-        return await Api(**API["detail"]).update_params(albumMid=self.mid, albumId=self.id).result
+        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[Song]:
+    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.from_dict(song["songInfo"]) for song in result["songList"]]
+        return [song["songInfo"] for song in result["songList"]]

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.7}/qqmusic_api/data/api/login.json

@@ -3,7 +3,10 @@
         "module": "QQConnectLogin.LoginServer",
         "method": "QQLogin",
         "params": {
-            "code": "str 鉴权码"
+            "code": "str 鉴权码",
+            "musicid": "int",
+            "musickey": "str",
+            "refresh_key": "str"
         },
         "extra_common": {
             "tmeLoginType": "str 2"
@@ -15,7 +18,11 @@
         "method": "Login",
         "params": {
             "strAppid": "wx48db31d50e334801",
-            "code": "str 鉴权码"
+            "code": "str 鉴权码",
+            "str_musicid": "str",
+            "musickey": "str",
+            "refresh_key": "str",
+            "loginMode": "int 2"
         },
         "extra_common": {
             "tmeLoginType": "str 1"
@@ -47,23 +54,5 @@
             "tmeLoginMethod": "str 3"
         },
         "comment": "发送验证码"
-    },
-    "refresh": {
-        "module": "music.login.LoginServer",
-        "method": "Login",
-        "params": {
-            "openid": "str",
-            "access_token": "str",
-            "refresh_token": "str",
-            "expired_in": "int",
-            "musicid": "str 必须",
-            "musickey": "str",
-            "refresh_key": "str 必须",
-            "loginMode": "int 2"
-        },
-        "extra_common": {
-            "tmeLoginMethod": "str 可填2"
-        },
-        "comment": "刷新cookies"
     }
 }

qqmusic_api_python-0.1.7/qqmusic_api/data/api/lyric.json

@@ -0,0 +1,25 @@
+{
+    "info": {
+        "module": "music.musichallSong.PlayLyricInfo",
+        "method": "GetPlayLyricInfo",
+        "params": {
+            "ct": "int 11",
+            "cv": "int 13020508",
+            "lrc_t": "int 0",
+            "roma": "int 是否返回罗马歌词",
+            "roma_t": "int 0",
+            "trans": "int 是否返回翻译歌词",
+            "trans_t": "int 0",
+            "type": "int 1",
+            "albumName": "str 专辑名字",
+            "crypt": "int 是否加密歌词",
+            "qrc": "int 是否返回 qrc",
+            "qrc_t": "int 0",
+            "singerName": "str 歌手名字(取第一个)",
+            "songId": "int 歌曲 id",
+            "songMid": "str 歌曲 mid",
+            "songName": "str 歌曲名字"
+        },
+        "comment": "获取歌曲歌词信息"
+    }
+}

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.7}/qqmusic_api/data/api/search.json

@@ -11,10 +11,10 @@
         "module": "tencent_music_soso_smartbox_cgi.SmartBoxCgi",
         "method": "GetSmartBoxResult",
         "params": {
+            "search_id": "int 随机生成",
             "query": "str 搜索词",
             "num_per_page": "int 每页返回数量",
-            "highlight": "int 是否高亮搜索词",
-            "page_idx": "int 页数"
+            "page_idx": "int 1"
         },
         "comment": "获取搜索词补全"
     },
@@ -30,12 +30,13 @@
         "module": "music.adaptor.SearchAdaptor",
         "method": "do_search_v2",
         "params": {
-            "search_id": "int 随机生成",
+            "searchid": "int 随机生成",
             "search_type": "int 100",
             "query": "str 搜索词",
-            "highlight": "int 是否高亮搜索词",
             "grp": "int 是否返回歌曲其他版本",
-            "page_id": "int 页数"
+            "highlight": "int 是否高亮搜索词",
+            "page_id": "int 页数",
+            "page_num": "int 15"
         },
         "comment": "综合搜索"
     },
@@ -46,10 +47,9 @@
             "search_id": "int 随机生成",
             "search_type": "int 搜索类型",
             "query": "str 搜索词",
-            "highlight": "int 是否高亮搜索词",
-            "page_id": "int 页数",
             "page_num": "int 页数",
             "num_per_page": "int 每页返回数量",
+            "highlight": "int 是否高亮搜索词",
             "selectors": "dict 选择器"
         },
         "comment": "桌面端搜索"
@@ -58,13 +58,12 @@
         "module": "music.search.SearchCgiService",
         "method": "DoSearchForQQMusicMobile",
         "params": {
-            "search_id": "int 随机生成",
+            "searchid": "int 随机生成",
             "search_type": "int 搜索类型",
             "query": "str 搜索词",
-            "highlight": "int 是否高亮搜索词",
-            "page_id": "int 页数",
             "page_num": "int 页数",
             "grp": "int 是否返回歌曲其他版本",
+            "highlight": "int 是否高亮搜索词",
             "num_per_page": "int 每页返回数量",
             "selectors": "dict 选择器"
         },

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.7}/qqmusic_api/data/api/song.json

@@ -50,7 +50,8 @@
         "method": "GetSongRelatedMv",
         "params": {
             "songid": "int 歌曲 ID",
-            "songmid": "str 歌曲 mid"
+            "songtype": "int 1",
+            "lastmvid": "用于刷新列表"
         },
         "comment": "获取相关MV"
     },
@@ -80,6 +81,17 @@
         },
         "comment": "获取歌曲制作团队"
     },
+    "evkey": {
+        "module": "music.vkey.GetEVkey",
+        "method": "CgiGetEVkey",
+        "params": {
+            "filename": "[f'{file_type.s}{_}{_}{file_type.e}' for _ in mid]",
+            "guid": "str 随机32位字符串",
+            "songmid": "list mid 列表",
+            "songtype": "[1 for _ in range(len(mid))]"
+        },
+        "comment": "获取加密文件链接"
+    },
     "play_url": {
         "module": "music.vkey.GetVkey",
         "method": "UrlGetVkey",

{qqmusic_api_python-0.1.5 → qqmusic_api_python-0.1.7}/qqmusic_api/data/file_type.json

@@ -15,6 +15,10 @@
         "s": "F000",
         "e": ".flac"
     },
+    "ogg_320": {
+        "s": "O800",
+        "e": ".ogg"
+    },
     "ogg_192": {
         "s": "O600",
         "e": ".ogg"