qqmusic-api-python 0.3.3__py3-none-any.whl → 0.3.4__py3-none-any.whl

qqmusic_api/__init__.py

@@ -4,7 +4,7 @@ from . import album, login, lyric, mv, search, singer, song, songlist, top, user
 from .utils.credential import Credential
 from .utils.session import Session, get_session, set_session
 
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 
 logger = logging.getLogger("qqmusicapi")
 

qqmusic_api/song.py

@@ -16,7 +16,7 @@ def _get_extract_func(key: str):
 
 
 @api_request("music.trackInfo.UniformRuleCtrl", "CgiGetTrackInfo")
-async def query_song(value: list[str] | list[int]):
+async def query_song(value: list[int] | list[str]):
     """根据 id 或 mid 获取歌曲信息
 
     Args:
@@ -114,6 +114,7 @@ class EncryptedSongFileType(BaseSongFileType):
 async def get_song_urls(
     mid: list[str],
     file_type: SongFileType = SongFileType.MP3_128,
+    *,
     credential: Credential | None = None,
 ) -> dict[str, str]: ...
 
@@ -122,6 +123,7 @@ async def get_song_urls(
 async def get_song_urls(
     mid: list[str],
     file_type: EncryptedSongFileType,
+    *,
     credential: Credential | None = None,
 ) -> dict[str, tuple[str, str]]: ...
 
@@ -129,6 +131,7 @@ async def get_song_urls(
 async def get_song_urls(
     mid: list[str],
     file_type: SongFileType | EncryptedSongFileType = SongFileType.MP3_128,
+    *,
     credential: Credential | None = None,
 ) -> dict[str, str] | dict[str, tuple[str, str]]:
     """获取歌曲文件链接

qqmusic_api/songlist.py

@@ -79,7 +79,7 @@ async def get_songlist(
 
 
 @api_request("music.musicasset.PlaylistBaseWrite", "AddPlaylist", verify=True, cacheable=False)
-async def create(dirname: str, credential: Credential | None = None):
+async def create(dirname: str, *, credential: Credential | None = None):
     """添加歌单, 重名会在名称后面添加时间戳
 
     Args:
@@ -95,7 +95,7 @@ async def create(dirname: str, credential: Credential | None = None):
 
 
 @api_request("music.musicasset.PlaylistBaseWrite", "DelPlaylist", verify=True, cacheable=False)
-async def delete(dirid: int, credential: Credential | None = None):
+async def delete(dirid: int, *, credential: Credential | None = None):
     """删除歌单
 
     Args:
@@ -111,7 +111,7 @@ async def delete(dirid: int, credential: Credential | None = None):
 
 
 @api_request("music.musicasset.PlaylistDetailWrite", "AddSonglist", verify=True, cacheable=False)
-async def add_songs(dirid: int = 1, song_ids: list[int] = [], credential: Credential | None = None):
+async def add_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Credential | None = None):
     """添加歌曲到歌单
 
     Args:
@@ -129,7 +129,7 @@ async def add_songs(dirid: int = 1, song_ids: list[int] = [], credential: Creden
 
 
 @api_request("music.musicasset.PlaylistDetailWrite", "DelSonglist", verify=True, cacheable=False)
-async def del_songs(dirid: int = 1, song_ids: list[int] = [], credential: Credential | None = None):
+async def del_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Credential | None = None):
     """删除歌单歌曲
 
     Args:

qqmusic_api/user.py

@@ -93,7 +93,7 @@ async def get_friend(page: int = 1, num: int = 10, *, credential: Credential | N
     return {
         "PageSize": num,
         "Page": page - 1,
-    }, lambda data: {"total": data.get("Total", 0), "list": data.get("List", [])}
+    }, lambda data: {"total": len(data.get("Friends", [])), "list": data.get("Friends", [])}
 
 
 @api_request("music.concern.RelationList", "GetFollowUserList", verify=True, cacheable=False)

qqmusic_api/utils/credential.py

@@ -84,16 +84,14 @@ class Credential:
         if not self.has_musicid() or not self.has_musickey():
             return False
         if await self.is_expired():
-            return bool(self.refresh_key) and bool(self.refresh_token)
+            return bool(self.refresh_key)
         return True
 
     async def is_expired(self) -> bool:
         """判断 credential 是否过期"""
         if "musickeyCreateTime" in self.extra_fields and "keyExpiresIn" in self.extra_fields:
             expired_time_stamp = self.extra_fields["musickeyCreateTime"] + self.extra_fields["keyExpiresIn"]
-            if expired_time_stamp >= time():
-                return True
-            return False
+            return expired_time_stamp <= time()
 
         from ..login import check_expired
 

{qqmusic_api_python-0.3.3.dist-info → qqmusic_api_python-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qqmusic-api-python
-Version: 0.3.3
+Version: 0.3.4
 Summary: QQ音乐API封装库
 Project-URL: homepage, https://luren-dc.github.io/QQMusicApi/
 Project-URL: repository, https://github.com/luren-dc/QQMusicApi
@@ -98,11 +98,7 @@ async def main():
 asyncio.run(main())
 ```
 
-## Web API
-```
-docker build . -t qq-music-api
-docker run -d -p 8000:8000 qq-music-api
-```
+## [Web API](./web/README.md)
 
 ## Licence
 

{qqmusic_api_python-0.3.3.dist-info → qqmusic_api_python-0.3.4.dist-info}/RECORD

@@ -1,26 +1,26 @@
-qqmusic_api/__init__.py,sha256=NWXFSITG759z1_W6eWvlmOklfdMPCEQS1OUBIFUzCHU,479
+qqmusic_api/__init__.py,sha256=Y-oh_zh_qp2Juec6CMJfvw5asRR9x77VXFKkGMLpxMw,479
 qqmusic_api/album.py,sha256=5kYuCizYzESVjlv5b6wdd30kgTBuuz4xFn6km3-31pI,1443
 qqmusic_api/login.py,sha256=alz69NgJonxtMcCuEKTzNuOZov0lKeQgc-OUNXZDZ9Y,12643
 qqmusic_api/lyric.py,sha256=NLB4CXfJg9ovsvc8XKy7b3Gw8lCASlDDXnqzRRTKs2w,1622
 qqmusic_api/mv.py,sha256=O-P-sqStnhce6bVAr7Z_jLrqAa1zVvX00NC9SkAU5RI,1962
 qqmusic_api/search.py,sha256=wRW9MylIkciOpcHoMPbJjaWOgw65-EtCJhKiNB3cKWg,3265
 qqmusic_api/singer.py,sha256=iZ5izSAiM81KUP0-44MYwamveL92Ia-pxRNne6V4lOk,10006
-qqmusic_api/song.py,sha256=TdYOB5blIc8BDhQXAxbObJM0u9DaHuefC-Yfian209o,9014
-qqmusic_api/songlist.py,sha256=l_8-YuDcqIwA4gyFrNlhREqKyntMIQ0D2Gx0aL2aGo8,4166
+qqmusic_api/song.py,sha256=_88chbJEAJi9sVGkLzZjPvE7CSwjrD83uDG8NefDkz0,9035
+qqmusic_api/songlist.py,sha256=lFMkXxqRHgDFgwsawecWnvzeNmHWGqdvaMimJh4sp-Q,4178
 qqmusic_api/top.py,sha256=tZ17l0SbqJ0wDeRHJ7V5jvX4ZyoIEA-GCQHdZAIk648,792
-qqmusic_api/user.py,sha256=Sj25ZzdJjUE3KUgry9nih0V-a_iH4BLZ2kaMmccWivI,6678
+qqmusic_api/user.py,sha256=WBJP5tp9fH4IiRUn75yIujPQc_GZ_njjiIwSvxj83ns,6689
 qqmusic_api/exceptions/__init__.py,sha256=KMohYPXJBcxigc1dpAioTPmPUHAQgOKXR4bkmv50EIQ,328
 qqmusic_api/exceptions/api_exception.py,sha256=CTex5NMVNk42oJE0ADFFtAFWK4smchkgPTgRyRHb7O4,1609
 qqmusic_api/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qqmusic_api/utils/common.py,sha256=ntnuT5HlQvzeg5xX-netXS8tQZn2beE3bf3JJrmR7FU,2240
-qqmusic_api/utils/credential.py,sha256=v_qbsyIvSNeAzXN-81Lpg3SdhjN1rmj6-qu9T0zk73Q,4280
+qqmusic_api/utils/credential.py,sha256=HHdAXRwm6c2N9A3RtN4fRlm__cPG8cZf6UW5hEalSLM,4201
 qqmusic_api/utils/device.py,sha256=fTfRtEWvTWVtB533_fm6cpRvnWwQL3i8S6n-xyGXum8,2952
 qqmusic_api/utils/network.py,sha256=kHvO9Le4sxpkRFtUE_uic2XfxPD9bJ_w_SHeT6haQDs,15202
 qqmusic_api/utils/qimei.py,sha256=LZEZdSdN8tAUmqKUZuM1sOCT_bBStY2oxofV6_JsXkU,5773
 qqmusic_api/utils/session.py,sha256=u-tSrQ5A8wy9ILJQrp8-bfyDTIkUhLlg0exmFXps9K8,3762
 qqmusic_api/utils/sign.py,sha256=WaG-93mJFv4FS7ueoxmMCOcnEW5KWRGYkePLceVc3_s,1363
 qqmusic_api/utils/tripledes.py,sha256=v_ivJ64MD3AZ8soN_7wx_3wL0rSBXCDeqe0GyOHrXLk,15852
-qqmusic_api_python-0.3.3.dist-info/METADATA,sha256=PuBAx3kotbGCe73IYmNK_02p2CW8FkJcx7PH_EZG-LU,3971
-qqmusic_api_python-0.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qqmusic_api_python-0.3.3.dist-info/licenses/LICENSE,sha256=dWHDhxdkwc4EVZ0xMf13_qTkjzPqbI1YL_1OzmZxaxU,1062
-qqmusic_api_python-0.3.3.dist-info/RECORD,,
+qqmusic_api_python-0.3.4.dist-info/METADATA,sha256=lMy4mQjk6obW72skcvvSPZuOEdgSUeIO-iWH1nlGRAk,3911
+qqmusic_api_python-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qqmusic_api_python-0.3.4.dist-info/licenses/LICENSE,sha256=dWHDhxdkwc4EVZ0xMf13_qTkjzPqbI1YL_1OzmZxaxU,1062
+qqmusic_api_python-0.3.4.dist-info/RECORD,,