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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qqmusic-api-python
-Version: 0.1.6
+Version: 0.1.7
 Summary: QQ音乐API封装库
 Keywords: music,api,qqmusic,tencentmusic
 Home-page: https://github.com/luren-dc/QQMusicApi

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

@@ -39,7 +39,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dynamic = []
-version = "0.1.6"
+version = "0.1.7"
 
 [project.license]
 text = "MIT"

{qqmusic_api_python-0.1.6 → qqmusic_api_python-0.1.7}/qqmusic_api/__init__.py

@@ -1,15 +1,16 @@
-from . import album, login, mv, search, singer, song, songlist, top
+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.6"
+__version__ = "0.1.7"
 
 __all__ = [
     "album",
     "Credential",
     "get_session",
     "login",
+    "lyric",
     "mv",
     "search",
     "set_session",

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

@@ -22,9 +22,10 @@ class Album:
         mid: Optional[str] = None,
         id: Optional[int] = None,
     ):
-        """/// admonition | 注意
-        歌曲 mid 和 id，两者至少提供一个
-        ///
+        """初始化专辑类
+
+        Note:
+            歌曲 mid 和 id，两者至少提供一个
 
         Args:
             mid: 专辑 mid

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.6 → qqmusic_api_python-0.1.7}/qqmusic_api/data/api/song.json

@@ -81,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.6 → 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"

{qqmusic_api_python-0.1.6 → qqmusic_api_python-0.1.7}/qqmusic_api/login.py

@@ -273,8 +273,8 @@ class QQLogin(QRCodeLogin):
         )
         location = res.headers.get("Location", "")
         code = re.findall(r"(?<=code=)(.+?)(?=&)", location)[0]
-        res = await Api(**API["QQ_login"]).update_params(code=code).update_extra_common(tmeLoginType="2").result
-        self.credential = Credential.from_cookies(res)
+        response = await Api(**API["QQ_login"]).update_params(code=code).update_extra_common(tmeLoginType="2").result
+        self.credential = Credential.from_cookies(response)
         return self.credential
 
 

qqmusic_api_python-0.1.7/qqmusic_api/lyric.py

@@ -0,0 +1,68 @@
+"""歌词 API"""
+
+import xml.etree.ElementTree as ET
+from typing import Optional
+
+from .utils.network import Api
+from .utils.utils import get_api, qrc_decrypt
+
+API = get_api("lyric")
+
+
+async def get_lyric(
+    *,
+    mid: Optional[str] = None,
+    id: Optional[int] = None,
+    qrc: bool = False,
+    trans: bool = False,
+    roma: bool = False,
+) -> dict[str, str]:
+    """获取歌词
+
+    Note:
+        歌曲 mid 和 id，两者至少提供一个
+
+    Args:
+        mid:   歌曲 mid
+        id:    歌曲 id
+        qrc:   是否返回逐字歌词
+        trans: 是否返回翻译歌词
+        roma:  是否返回罗马歌词
+
+    Returns:
+        {"lyric": 歌词或逐字歌词, "trans": 翻译歌词, "roma": 罗马歌词}
+    """
+    if mid is None and id is None:
+        raise ValueError("mid or id must be provided")
+
+    params = {
+        "crypt": 1,
+        "ct": 11,
+        "cv": 13020508,
+        "lrc_t": 0,
+        "qrc": qrc,
+        "qrc_t": 0,
+        "roma": roma,
+        "roma_t": 0,
+        "songId": id,
+        "songMid": mid,
+        "trans": trans,
+        "trans_t": 0,
+        "type": 1,
+    }
+    res = await Api(**API["info"]).update_params(**params).result
+
+    lyric = qrc_decrypt(res["lyric"])
+
+    if lyric and qrc:
+        tree = ET.fromstring(lyric)
+        try:
+            lyric = tree.find(".//Lyric_0").attrib.get("LyricContent", "")  # type: ignore
+        except AttributeError:
+            pass
+
+    return {
+        "lyric": lyric,
+        "trans": qrc_decrypt(res["trans"]),
+        "roma": qrc_decrypt(res["roma"]),
+    }

{qqmusic_api_python-0.1.6 → qqmusic_api_python-0.1.7}/qqmusic_api/search.py

@@ -85,8 +85,8 @@ async def general_search(
 
     Args:
         keyword:   关键词
-        page:      页码. Defaluts to 1
-        highlight: 是否高亮关键词. Defaluts to True
+        page:      页码
+        highlight: 是否高亮关键词
 
     Returns:
         包含直接结果，歌曲，歌手，专辑，歌单，mv等.
@@ -114,10 +114,10 @@ async def search_by_type(
 
     Args:
         keyword:     关键词
-        search_type: 搜索类型. Defaluts to SearchType.SONG
-        num:         返回数量. Defaluts to 10
-        page:        页码. Defaluts to 1
-        highlight:   是否高亮关键词. Defaluts to True
+        search_type: 搜索类型
+        num:         返回数量
+        page:        页码
+        highlight:   是否高亮关键词
 
     Returns:
         搜索结果

{qqmusic_api_python-0.1.6 → qqmusic_api_python-0.1.7}/qqmusic_api/singer.py

@@ -212,9 +212,9 @@ class Singer:
         """获取歌手歌曲
 
         Args:
-            type: Tab 类型. Defaluts to TabType.SONG
-            page: 页码. Defaluts to 1
-            num:  返回数量. Defaluts to 100
+            type: Tab 类型
+            page: 页码
+            num:  返回数量
 
         Returns:
             歌曲信息列表

{qqmusic_api_python-0.1.6 → qqmusic_api_python-0.1.7}/qqmusic_api/song.py

@@ -19,6 +19,7 @@ class SongFileType(Enum):
     + NEW_1:   臻品全景声
     + NEW_2:   臻品音质2.0
     + FLAC:    无损音频压缩格式
+    + OGG_320: OGG 格式，320kbps，size_new[3]
     + OGG_192: OGG 格式，192kbps
     + OGG_96:  OGG 格式，96kbps
     + MP3_320: MP3 格式，320kbps
@@ -26,13 +27,13 @@ class SongFileType(Enum):
     + ACC_192: AAC 格式，192kbps
     + ACC_96:  AAC 格式，96kbps
     + ACC_48:  AAC 格式，48kbps
-    + TRY:     试听文件
     """
 
     NEW_0 = ("AI00", ".flac")
     NEW_1 = ("Q000", ".flac")
     NEW_2 = ("Q001", ".flac")
     FLAC = ("F000", ".flac")
+    OGG_320 = ("O800", ".ogg")
     OGG_192 = ("O600", ".ogg")
     OGG_96 = ("O400", ".ogg")
     MP3_320 = ("M800", ".mp3")
@@ -40,7 +41,6 @@ class SongFileType(Enum):
     ACC_192 = ("C600", ".m4a")
     ACC_96 = ("C400", ".m4a")
     ACC_48 = ("C200", ".m4a")
-    TRY = ("RS02", ".mp3")
 
     def __init__(self, start_code: str, extension: str):
         self.__start_code = start_code
@@ -55,15 +55,37 @@ class SongFileType(Enum):
         return self.__extension
 
 
-class UrlType(Enum):
-    """歌曲文件链接类型
+class EncryptedSongFileType(Enum):
+    """加密歌曲文件类型
 
-    + PLAY:     播放链接
-    + DOWNLOAD: 下载链接
+    + NEW_0:   臻品母带2.0
+    + NEW_1:   臻品全景声
+    + NEW_2:   臻品音质2.0
+    + FLAC:    无损音频压缩格式
+    + OGG_320: OGG 格式，320kbps，size_new[3]
+    + OGG_192: OGG 格式，192kbps
+    + OGG_96:  OGG 格式，96kbps
     """
 
-    PLAY = "play_url"
-    DOWNLOAD = "download_url"
+    NEW_0 = ("AIM0", ".mflac")
+    NEW_1 = ("Q0M0", ".mflac")
+    NEW_2 = ("Q0M1", ".mflac")
+    FLAC = ("F0M0", ".mflac")
+    OGG_320 = ("O800", ".mgg")
+    OGG_192 = ("O6M0", ".mgg")
+    OGG_96 = ("O4M0", ".mgg")
+
+    def __init__(self, start_code: str, extension: str):
+        self.__start_code = start_code
+        self.__extension = extension
+
+    @property
+    def s(self) -> str:  # noqa : D102
+        return self.__start_code
+
+    @property
+    def e(self) -> str:  # noqa: D102
+        return self.__extension
 
 
 class Song:
@@ -80,9 +102,10 @@ class Song:
         mid: Optional[str] = None,
         id: Optional[int] = None,
     ):
-        """/// admonition | 注意
-        歌曲 mid 和 id，两者至少提供一个
-        ///
+        """初始化歌曲类
+
+        Note:
+            歌曲 mid 和 id，两者至少提供一个
 
         Args:
             mid: 歌曲 mid
@@ -167,9 +190,15 @@ class Song:
         Returns:
             MV信息
         """
-        return (await Api(**API["mv"]).update_params(songid=str(await self.get_id()), songtype=1, lastvid=0).result)[
-            "list"
-        ]
+        return (
+            await Api(**API["mv"])
+            .update_params(
+                songid=str(await self.get_id()),
+                songtype=1,
+                lastvid=0,
+            )
+            .result
+        )["list"]
 
     async def get_other_version(self) -> list[dict]:
         """获取歌曲其他版本
@@ -197,21 +226,19 @@ class Song:
 
     async def get_url(
         self,
-        file_type: SongFileType = SongFileType.MP3_128,
-        url_type: UrlType = UrlType.PLAY,
+        file_type: Union[SongFileType, EncryptedSongFileType] = SongFileType.MP3_128,
         credential: Optional[Credential] = None,
     ) -> str:
         """获取歌曲文件链接
 
         Args:
-            file_type:  歌曲文件类型. Defaults to SongFileType.MP3_128
-            url_type:   歌曲链接类型. Defaults to UrlType.PLAY
-            credential: 账号凭证. Defaults to None
+            file_type:  歌曲文件类型
+            credential: 账号凭证
 
         Returns:
             链接字典
         """
-        return (await get_song_urls([await self.get_mid()], file_type, url_type, credential))[self.mid]
+        return (await get_song_urls([await self.get_mid()], file_type, credential))[self.mid][0]
 
 
 async def query_song(value: Union[list[str], list[int]]) -> list[dict]:
@@ -242,26 +269,26 @@ async def query_song(value: Union[list[str], list[int]]) -> list[dict]:
 
 async def get_song_urls(
     mid: list[str],
-    file_type: SongFileType = SongFileType.MP3_128,
-    url_type: UrlType = UrlType.PLAY,
+    file_type: Union[EncryptedSongFileType, SongFileType] = SongFileType.MP3_128,
     credential: Optional[Credential] = None,
-) -> dict[str, str]:
+) -> Union[dict[str, str], dict[str, tuple[str, str]]]:
     """获取歌曲文件链接
 
     Args:
         mid:        歌曲 mid
-        file_type:  歌曲文件类型. Defaults to SongFileType.MP3_128
-        url_type:   歌曲链接类型. Defaults to UrlType.PLAY
-        credential: Credential 类. Defaluts to None
+        file_type:  歌曲文件类型
+        credential: Credential 类
 
     Returns:
-       链接字典
+        返回链接字典，加密歌曲返回 `ekey` 用于解密
     """
+    encrypted = isinstance(file_type, EncryptedSongFileType)
     # 分割 id,单次最大请求100
     mid_list = [mid[i : i + 100] for i in range(0, len(mid), 100)]
     # 选择文件域名
-    domain = "https://isure.stream.qqmusic.qq.com/" if url_type == UrlType.PLAY else "https://dl.stream.qqmusic.qq.com/"
-    api = Api(**API[url_type.value], credential=credential or Credential())
+    domain = "https://isure.stream.qqmusic.qq.com/"
+    api_data = API["play_url"] if not encrypted else API["evkey"]
+    api = Api(**api_data, credential=credential or Credential())
     urls = {}
 
     async def get_song_url(mid):
@@ -278,7 +305,42 @@ async def get_song_urls(
         data = res["midurlinfo"]
         for info in data:
             song_url = domain + info["wifiurl"] if info["wifiurl"] else ""
-            urls[info["songmid"]] = song_url
+            if not encrypted:
+                urls[info["songmid"]] = song_url
+            else:
+                urls[info["songmid"]] = (song_url, info["ekey"])
 
     await asyncio.gather(*[asyncio.create_task(get_song_url(mid)) for mid in mid_list])
     return urls
+
+
+async def get_try_url(mid: str, vs: str) -> Optional[str]:
+    """获取试听文件链接
+
+    Tips:
+        使用 `size_try` 字段判断是否存在试听文件
+        参数 `vs` 请传入歌曲信息 `vs` 字段第一个
+
+    Args:
+        mid: 歌曲 mid
+        vs:  歌曲 vs
+
+    Returns:
+        试听文件链接
+    """
+    res = await (
+        Api(**API["play_url"])
+        .update_params(
+            filename=[f"RS02{vs}.mp3"],
+            guid="".join(
+                random.choices("abedf1234567890", k=32),
+            ),
+            songmid=[mid],
+            songtype=[1],
+        )
+        .result
+    )
+    if url := res["midurlinfo"][0]["wifiurl"]:
+        return f"https://isure.stream.qqmusic.qq.com/{url}"
+    else:
+        return None