fuo-qqmusic 1.0.3__tar.gz → 1.0.5__tar.gz

{fuo_qqmusic-1.0.3 → fuo_qqmusic-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fuo_qqmusic
-Version: 1.0.3
+Version: 1.0.5
 Summary: feeluown qqmusic plugin
 Home-page: https://github.com/feeluown/feeluown-qqmusic
 Author: Cosven

{fuo_qqmusic-1.0.3 → fuo_qqmusic-1.0.5}/README.md

@@ -20,6 +20,14 @@ pip3 install fuo-qqmusic
 [操作示例](https://github.com/feeluown/feeluown-qqmusic/issues/6)。
 
 ## changelog
+### 1.0.5 (2024-06-03)
+- 修复搜索接口，支持搜索歌单、视频、专辑
+- 支持提供歌单的播放次数
+
+### 1.0.4 (2024-05-21)
+- 歌手歌曲排序切换为”按热度排序”
+- 修复推荐歌单接口
+
 ### 1.0.3 (2024-04-21)
 - 适配 feeluown 4.1.3 的新主页功能
 

{fuo_qqmusic-1.0.3 → fuo_qqmusic-1.0.5}/fuo_qqmusic/api.py

@@ -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 = {
@@ -247,6 +251,7 @@ class API(object):
                     'singerid': artist_id,
                     'begin': (page - 1) * page_size,
                     'num': page_size,
+                    'order': 1,  # 热门/新，不带这个字段就是按歌曲新旧排序
                     # 有 newsong 字段时，服务端会返回含有 file 字段的字典
                     'newsong': 1
                 }},

{fuo_qqmusic-1.0.3 → fuo_qqmusic-1.0.5}/fuo_qqmusic/provider.py

@@ -18,6 +18,7 @@ from feeluown.library import (
     SupportsVideoGet,
     SupportsSongLyric,
     SupportsAlbumGet,
+    SupportsAlbumSongsReader,
     SupportsArtistGet,
     SupportsPlaylistGet,
     SupportsPlaylistSongsReader,
@@ -48,6 +49,7 @@ class Supports(
     SupportsPlaylistGet,
     SupportsPlaylistSongsReader,
     SupportsRecACollectionOfSongs,
+    SupportsAlbumSongsReader,
     Protocol,
 ):
     pass
@@ -224,6 +226,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"]
@@ -240,7 +246,7 @@ class QQProvider(AbstractProvider, ProviderV2):
         songs = self._model_cache_get_or_fetch(playlist, "songs")
         return create_reader(songs)
 
-    def rec_list_daily_playlists(self):
+    def __rec_hot_playlists(self):
         user = self.get_current_user()
         if user is None:
             return []
@@ -253,16 +259,46 @@ class QQProvider(AbstractProvider, ProviderV2):
             pl["logo"] = pl["cover"]
         return [_deserialize(playlist, QQPlaylistSchema) for playlist in playlists]
 
+    def rec_list_daily_playlists(self):
+        # TODO: cache API result
+        feed = self.api.get_recommend_feed()
+        shelf = None
+        for shelf_ in feed['v_shelf']:
+            # I guess 10046 means 'song'.
+            if shelf_['extra_info'].get('moduleID', '').startswith('playlist'):
+                shelf = shelf_
+                break
+        if shelf is None:
+            return []
+        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'],
+                                      play_count=card['cnt'])
+                    )
+        return playlists
+
     def rec_a_collection_of_songs(self):
         # TODO: cache API result
         feed = self.api.get_recommend_feed()
         shelf = None
-        for shelf in feed['v_shelf']:
+        for shelf_ in feed['v_shelf']:
             # I guess 10046 means 'song'.
-            if shelf['miscellany'].get('jumptype') == 10046:
-                shelf = shelf
+            if int(shelf_['miscellany'].get('jumptype', 0)) == 10046:
+                shelf = shelf_
+                break
         if shelf is None:
-            return '', []
+            return Collection(name='',
+                              type_=CollectionType.only_songs,
+                              models=[],
+                              description='')
         title = shelf['title_content'] or shelf['title_template']
         song_ids = []
         for batch in shelf['v_niche']:
@@ -365,26 +401,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()
@@ -398,9 +437,12 @@ from .schemas import (  # noqa
     _BriefAlbumSchema,
     _UserArtistSchema,
     _BriefArtistSchema,
-    _BriefPlaylistSchema,
     QQAlbumSchema,
     QQPlaylistSchema,
     QQUserSchema,
     _UserAlbumSchema,
+    SearchAlbumSchema,
+    SearchArtistSchema,
+    SearchPlaylistSchema,
+    SearchMVSchema,
 )  # noqa

{fuo_qqmusic-1.0.3 → fuo_qqmusic-1.0.5}/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.3 → fuo_qqmusic-1.0.5}/fuo_qqmusic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fuo-qqmusic
-Version: 1.0.3
+Version: 1.0.5
 Summary: feeluown qqmusic plugin
 Home-page: https://github.com/feeluown/feeluown-qqmusic
 Author: Cosven

{fuo_qqmusic-1.0.3 → fuo_qqmusic-1.0.5}/setup.py

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