fuo-qqmusic 1.0.4__tar.gz → 1.0.6__tar.gz

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fuo_qqmusic
-Version: 1.0.4
+Version: 1.0.6
 Summary: feeluown qqmusic plugin
 Home-page: https://github.com/feeluown/feeluown-qqmusic
 Author: Cosven
@@ -13,3 +13,13 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Dist: feeluown>=4.1.3
+Requires-Dist: requests
+Requires-Dist: marshmallow>=3.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: requires-dist
+Dynamic: summary

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/README.md

@@ -20,6 +20,14 @@ pip3 install fuo-qqmusic
 [操作示例](https://github.com/feeluown/feeluown-qqmusic/issues/6)。
 
 ## changelog
+### 1.0.6 (2025-05-08)
+- 支持每日推荐
+- 支持自动登录
+
+### 1.0.5 (2024-06-03)
+- 修复搜索接口，支持搜索歌单、视频、专辑
+- 支持提供歌单的播放次数
+
 ### 1.0.4 (2024-05-21)
 - 歌手歌曲排序切换为”按热度排序”
 - 修复推荐歌单接口

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/fuo_qqmusic/api.py

@@ -58,7 +58,7 @@ class API(object):
     Please http capture request from (mobile) qqmusic mobile web page
     """
 
-    def __init__(self, timeout=1):
+    def __init__(self, timeout=2):
         # TODO: 暂时无脑统一一个 timeout
         # 正确的应该是允许不同接口有不同的超时时间
         self._timeout = timeout
@@ -124,10 +124,14 @@ class API(object):
         # Other supported types: songlist, user, mv, qc, gedantip, zhida.
         if type_ == 0:
             key_ = 'song'
-        elif type_ == 8:
-            key_ = 'album'
-        elif type_ == 9:
+        elif type_ == 1:
             key_ = 'singer'
+        elif type_ == 2:
+            key_ = 'album'
+        elif type_ == 3:
+            key_ = 'songlist'  # playlist
+        elif type_ == 4:
+            key_ = 'mv'  # video
         else:
             raise QQIOError('invalid search type_:%d', type_)
         payload = {
@@ -514,6 +518,33 @@ class API(object):
         js = self.rpc(payload)
         return js['songlist']['data']['tracks']
 
+    def get_diss_info(self, dissid, offset=0, limit=50):
+        """获取歌单的详情
+
+        这是一种特殊的歌单，它的内容是动态的，由官方生成。比如“百万收藏”。
+
+        :param dissid: int, 举个例子 211111 是百万收藏。
+        :return: 参考 fixtures/get_diss_info.json
+        """
+        payload = {
+            'req': {
+                "module": "music.srfDissInfo.aiDissInfo",
+                "method":"uniform_get_Dissinfo",
+                "param": {
+                    "disstid":dissid,
+                    "userinfo":1,  # 不懂啥意思
+                    "tag":1,  # 不懂啥意思
+                    "orderlist":1,
+                    "song_begin": offset,
+                    "song_num": limit,
+                    "onlysonglist":0,
+                    "enc_host_uin":""  # 注：即使登录了，这个也是空
+                }
+            }
+        }
+        js = self.rpc(payload)
+        return js['req']['data']
+
     def get_song_url(self, song_mid):
         uin = self._uin
         songvkey = str(random.random()).replace("0.", "")

fuo_qqmusic-1.0.6/fuo_qqmusic/login.py

@@ -0,0 +1,24 @@
+import json
+import os
+
+from feeluown.consts import DATA_DIR
+
+USER_INFO_FILE = DATA_DIR + '/qqmusic_user_info.json'
+
+
+def read_cookies():
+    if os.path.exists(USER_INFO_FILE):
+        # if the file is broken, just raise error
+        with open(USER_INFO_FILE) as f:
+            return json.load(f).get('cookies', None)
+
+
+def write_cookies(user, cookies):
+    js = {
+        'identifier': user.identifier,
+        'name': user.name,
+        'cookies': cookies
+    }
+    with open(USER_INFO_FILE, 'w') as f:
+        json.dump(js, f, indent=2)
+

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/fuo_qqmusic/provider.py

@@ -1,5 +1,5 @@
 import logging
-from typing import List, Optional, Protocol
+from typing import List, Optional, Protocol, Tuple
 from feeluown.excs import ModelNotFound
 from feeluown.library import (
     AbstractProvider,
@@ -18,6 +18,7 @@ from feeluown.library import (
     SupportsVideoGet,
     SupportsSongLyric,
     SupportsAlbumGet,
+    SupportsAlbumSongsReader,
     SupportsArtistGet,
     SupportsPlaylistGet,
     SupportsPlaylistSongsReader,
@@ -25,10 +26,13 @@ from feeluown.library import (
     SimpleSearchResult,
     SearchType,
     ModelType,
+    UserModel,
 )
 from feeluown.media import Media, Quality
 from feeluown.utils.reader import create_reader, SequentialReader
 from .api import API
+from .login import read_cookies
+from .excs import QQIOError
 
 
 logger = logging.getLogger(__name__)
@@ -48,6 +52,7 @@ class Supports(
     SupportsPlaylistGet,
     SupportsPlaylistSongsReader,
     SupportsRecACollectionOfSongs,
+    SupportsAlbumSongsReader,
     Protocol,
 ):
     pass
@@ -77,6 +82,31 @@ class QQProvider(AbstractProvider, ProviderV2):
     def name(self):
         return "QQ 音乐"
 
+    def auto_login(self):
+        cookies = read_cookies()
+        user, err = self.try_get_user_from_cookies(cookies)
+        if user:
+            self.auth(user)
+        else:
+            logger.info(f'Auto login failed: {err}')
+
+    def try_get_user_from_cookies(self, cookies) -> Tuple[Optional[UserModel], str]:
+        if not cookies:  # is None or empty
+            return None, 'empty cookies'
+
+        uin = provider.api.get_uin_from_cookies(cookies)
+        if uin is None:
+            return None, "can't extract user info from cookies"
+
+        provider.api.set_cookies(cookies)
+        # try to extract current user
+        try:
+            user = provider.user_get(uin)
+        except QQIOError:
+            provider.api.set_cookies(None)
+            return None, 'get user info with cookies failed, expired cookies?'
+        return user, ''
+
     def use_model_v2(self, mtype):
         return mtype in (
             ModelType.song,
@@ -224,6 +254,10 @@ class QQProvider(AbstractProvider, ProviderV2):
         album = _deserialize(data_album, QQAlbumSchema)
         return album
 
+    def album_create_songs_rd(self, album):
+        album = self.album_get(album.identifier)
+        return create_reader(album.songs)
+
     def user_get(self, identifier):
         data = self.api.user_detail(identifier)
         data["creator"]["fav_pid"] = data["mymusic"][0]["id"]
@@ -253,6 +287,27 @@ class QQProvider(AbstractProvider, ProviderV2):
             pl["logo"] = pl["cover"]
         return [_deserialize(playlist, QQPlaylistSchema) for playlist in playlists]
 
+    def rec_list_daily_songs(self):
+        # TODO: cache API result
+        feed = self.api.get_recommend_feed()
+        card = None
+        for shelf_ in feed['v_shelf']:
+            if 'moduleID' not in shelf_['extra_info']:
+                for batch in shelf_['v_niche']:
+                    for card in batch['v_card']:
+                        if (
+                            card['extra_info'].get('moduleID', '').startswith('recforyou')
+                            and card['jumptype'] == 10014  # 10014->playlist
+                        ):
+                            card = card
+                            break
+        if card is None:
+            logger.warning("No daily songs found")
+            return []
+        playlist_id = card['id']
+        playlist = self.playlist_get(playlist_id)
+        return self.playlist_create_songs_rd(playlist).readall()
+
     def rec_list_daily_playlists(self):
         # TODO: cache API result
         feed = self.api.get_recommend_feed()
@@ -267,14 +322,14 @@ class QQProvider(AbstractProvider, ProviderV2):
         playlists = []
         for batch in shelf['v_niche']:
             for card in batch['v_card']:
-                print(card['title'], card['jumptype'])
                 if card['jumptype'] == 10014:  # 10014->playlist
                     playlists.append(
                         PlaylistModel(identifier=str(card['id']),
                                       source=SOURCE,
                                       name=card['title'],
                                       cover=card['cover'],
-                                      description=card['miscellany']['rcmdtemplate'])
+                                      description=card['miscellany']['rcmdtemplate'],
+                                      play_count=card['cnt'])
                     )
         return playlists
 
@@ -394,26 +449,29 @@ def create_g(func, identifier, schema):
 
 def search(keyword, **kwargs):
     type_ = SearchType.parse(kwargs["type_"])
-    if type_ == SearchType.pl:
-        data = provider.api.search_playlists(keyword)
-        playlists = [_deserialize(playlist, _BriefPlaylistSchema) for playlist in data]
+    type_type_map = {
+        SearchType.so: 0,
+        SearchType.ar: 1,
+        SearchType.al: 2,
+        SearchType.pl: 3,
+        SearchType.vi: 4,
+    }
+    data = provider.api.search(keyword, type_=type_type_map[type_])
+    if type_ == SearchType.so:
+        songs = [_deserialize(song, QQSongSchema) for song in data]
+        return SimpleSearchResult(q=keyword, songs=songs)
+    if type_ == SearchType.ar:
+        artists = [_deserialize(artist, SearchArtistSchema) for artist in data]
+        return SimpleSearchResult(q=keyword, artists=artists)
+    elif type_ == SearchType.al:
+        albums = [_deserialize(album, SearchAlbumSchema) for album in data]
+        return SimpleSearchResult(q=keyword, albums=albums)
+    elif type_ == SearchType.pl:
+        playlists = [_deserialize(playlist, SearchPlaylistSchema) for playlist in data]
         return SimpleSearchResult(q=keyword, playlists=playlists)
-    else:
-        type_type_map = {
-            SearchType.so: 0,
-            SearchType.al: 8,
-            SearchType.ar: 9,
-        }
-        data = provider.api.search(keyword, type_=type_type_map[type_])
-        if type_ == SearchType.so:
-            songs = [_deserialize(song, QQSongSchema) for song in data]
-            return SimpleSearchResult(q=keyword, songs=songs)
-        elif type_ == SearchType.al:
-            albums = [_deserialize(album, _BriefAlbumSchema) for album in data]
-            return SimpleSearchResult(q=keyword, albums=albums)
-        else:
-            artists = [_deserialize(artist, _BriefArtistSchema) for artist in data]
-            return SimpleSearchResult(q=keyword, artists=artists)
+    elif type_ == SearchType.vi:
+        models = [_deserialize(model, SearchMVSchema) for model in data]
+        return SimpleSearchResult(q=keyword, videos=models)
 
 
 provider = QQProvider()
@@ -427,9 +485,12 @@ from .schemas import (  # noqa
     _BriefAlbumSchema,
     _UserArtistSchema,
     _BriefArtistSchema,
-    _BriefPlaylistSchema,
     QQAlbumSchema,
     QQPlaylistSchema,
     QQUserSchema,
     _UserAlbumSchema,
+    SearchAlbumSchema,
+    SearchArtistSchema,
+    SearchPlaylistSchema,
+    SearchMVSchema,
 )  # noqa

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/fuo_qqmusic/provider_ui.py

@@ -11,20 +11,11 @@ from feeluown.app.gui_app import GuiApp
 
 from .provider import provider
 from .excs import QQIOError
+from .login import read_cookies, write_cookies
 
 logger = logging.getLogger(__name__)
 
 
-USER_INFO_FILE = DATA_DIR + '/qqmusic_user_info.json'
-
-
-def read_cookies():
-    if os.path.exists(USER_INFO_FILE):
-        # if the file is broken, just raise error
-        with open(USER_INFO_FILE) as f:
-            return json.load(f).get('cookies', None)
-
-
 class ProviderUI(AbstractProviderUi):
     def __init__(self, app: GuiApp):
         self._app = app
@@ -72,31 +63,13 @@ class LoginDialog(CookiesLoginDialog):
         provider._user = user
 
     async def user_from_cookies(self, cookies):
-        if not cookies:  # is None or empty
-            raise InvalidCookies('empty cookies')
-
-        uin = provider.api.get_uin_from_cookies(cookies)
-        if uin is None:
-            raise InvalidCookies("can't extract user info from cookies")
-
-        provider.api.set_cookies(cookies)
-        # try to extract current user
-        try:
-            user = await run_fn(provider.user_get, uin)
-        except QQIOError:
-            provider.api.set_cookies(None)
-            raise InvalidCookies('get user info with cookies failed, expired cookies?')
-        else:
+        user, err = await run_fn(provider.try_get_user_from_cookies, cookies)
+        if user:
             return user
+        raise InvalidCookies(err)
 
     def load_user_cookies(self):
         return read_cookies()
 
     def dump_user_cookies(self, user, cookies):
-        js = {
-            'identifier': user.identifier,
-            'name': user.name,
-            'cookies': cookies
-        }
-        with open(USER_INFO_FILE, 'w') as f:
-            json.dump(js, f, indent=2)
+        write_cookies(user, cookies)

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/fuo_qqmusic/schemas.py

@@ -10,6 +10,7 @@ from feeluown.library import (
     PlaylistModel,
     BriefPlaylistModel,
     UserModel,
+    VideoModel,
 )
 
 logger = logging.getLogger(__name__)
@@ -143,6 +144,17 @@ class _BriefArtistSchema(Schema):
         return create_model(BriefArtistModel, data, ["mid"])
 
 
+class SearchArtistSchema(_BriefArtistSchema):
+    pic_url = fields.Str(data_key="singerPic", required=True)
+
+    @post_load
+    def create_model(self, data, **kwargs):
+        data['hot_songs'] = []
+        data['description'] = ''
+        data['aliases'] = []
+        return create_model(ArtistModel, data, ["mid"])
+
+
 class _BriefAlbumSchema(Schema):
     identifier = fields.Int(data_key="albumID", required=True)
     mid = fields.Str(data_key="albumMID", required=True)
@@ -153,6 +165,20 @@ class _BriefAlbumSchema(Schema):
         return create_model(BriefAlbumModel, data, ["mid"])
 
 
+class SearchAlbumSchema(_BriefAlbumSchema):
+    cover = fields.Str(data_key="albumPic", required=True)
+    released = fields.Str(data_key="publicTime", required=True)
+    song_count = fields.Int(required=True)
+    artists = fields.List(fields.Nested(_SongArtistSchema),
+                          data_key="singer_list",
+                          required=True)
+    @post_load
+    def create_model(self, data, **kwargs):
+        data['description'] = ''
+        data['songs'] = []
+        return create_model(AlbumModel, data, ['mid'])
+
+
 class _BriefPlaylistSchema(Schema):
     identifier = fields.Int(data_key="dissid", required=True)
     name = fields.Str(data_key="dissname", required=True)
@@ -164,6 +190,27 @@ class _BriefPlaylistSchema(Schema):
         return create_model(PlaylistModel, **data)
 
 
+class PlaylistUserSchema(Schema):
+    identifier = fields.Str(data_key="creator_uin", required=True)
+    mid = fields.Str(data_key="encrypt_uin", required=True)
+    name = fields.Str(required=True)
+    avatar_url = fields.Str(required=True, data_key="avatarUrl")
+
+    @post_load
+    def create_model(self, data, **kwargs):
+        return create_model(UserModel, data, ['mid'])
+
+
+class SearchPlaylistSchema(_BriefPlaylistSchema):
+    creator = fields.Nested("PlaylistUserSchema", required=True)
+    description = fields.Str(data_key="introduction", required=True)
+    play_count = fields.Int(data_key="listennum", required=True)
+
+    @post_load
+    def create_model(self, data, **kwargs):
+        return create_model(PlaylistModel, data)
+
+
 class QQArtistSchema(Schema):
     """歌手详情 Schema、歌曲歌手简要信息 Schema"""
 
@@ -294,3 +341,19 @@ class QQUserSchema(Schema):
             playlists=playlists,
         )
         return create_model(UserModel, data, ['mid', 'fav_pid', 'playlists'])
+
+
+class SearchMVSchema(Schema):
+    # 使用 mv_id 字段的话，目前拿不到播放 url，用 v_id  比较合适
+    identifier = fields.Str(data_key="v_id", required=True)
+    title = fields.Str(data_key="mv_name", required=True)
+    artists = fields.List(fields.Nested("_SongArtistSchema"),
+                          data_key="singer_list",
+                          required=True)
+    duration = fields.Int(required=True)
+    cover = fields.Str(data_key="mv_pic_url", required=True)
+    play_count = fields.Int(required=True)
+
+    @post_load
+    def create_model(self, data, **kwargs):
+        return create_model(VideoModel, data)

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/fuo_qqmusic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: fuo-qqmusic
-Version: 1.0.4
+Metadata-Version: 2.4
+Name: fuo_qqmusic
+Version: 1.0.6
 Summary: feeluown qqmusic plugin
 Home-page: https://github.com/feeluown/feeluown-qqmusic
 Author: Cosven
@@ -13,3 +13,13 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Dist: feeluown>=4.1.3
+Requires-Dist: requests
+Requires-Dist: marshmallow>=3.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: requires-dist
+Dynamic: summary

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/fuo_qqmusic.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ fuo_qqmusic/__init__.py
 fuo_qqmusic/api.py
 fuo_qqmusic/consts.py
 fuo_qqmusic/excs.py
+fuo_qqmusic/login.py
 fuo_qqmusic/provider.py
 fuo_qqmusic/provider_ui.py
 fuo_qqmusic/schemas.py
@@ -13,4 +14,5 @@ fuo_qqmusic.egg-info/dependency_links.txt
 fuo_qqmusic.egg-info/entry_points.txt
 fuo_qqmusic.egg-info/requires.txt
 fuo_qqmusic.egg-info/top_level.txt
-fuo_qqmusic/assets/icon.svg
+fuo_qqmusic/assets/icon.svg
+tests/test_provider.py

{fuo_qqmusic-1.0.4 → fuo_qqmusic-1.0.6}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
     name='fuo_qqmusic',
-    version='1.0.4',
+    version='1.0.6',
     description='feeluown qqmusic plugin',
     author='Cosven',
     author_email='yinshaowen241@gmail.com',

fuo_qqmusic-1.0.6/tests/test_provider.py

@@ -0,0 +1,26 @@
+import json
+import os
+from unittest.mock import patch
+
+import pytest
+
+from fuo_qqmusic import provider
+from fuo_qqmusic.api import API
+
+
+def _read_json_fixture(path):
+    path = os.path.join('data/fixtures', path)
+    with open(path, 'r', encoding='utf-8') as f:
+        data = json.load(f)
+    return data
+
+
+@pytest.fixture
+def album_3913679():
+    return _read_json_fixture('album_3913679.json')
+
+
+def test_provider_album_get(album_3913679):
+    patch.object(API, 'album_detail', return_value=album_3913679)
+    album = provider.album_get('3913679')
+    assert album.identifier == '3913679'