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

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

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

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

@@ -20,6 +20,12 @@ pip3 install fuo-qqmusic
 [操作示例](https://github.com/feeluown/feeluown-qqmusic/issues/6)。
 
 ## changelog
+### 1.0.3 (2024-04-21)
+- 适配 feeluown 4.1.3 的新主页功能
+
+### 1.0.2 (2024-03-04)
+- 修复获取歌单封面失败的问题 #21
+- 修复获取歌曲播放链接失败的问题 #20
 
 ### 1.0 (2024-01-1)
 - 使用 FeelUOwn 新接口

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

@@ -177,6 +177,25 @@ class API(object):
             return None
         return data_song
 
+    def batch_song_details(self, song_ids):
+        """
+        song_ids should be a list of int
+        """
+        payload = {
+            'comm': self.get_wkv17_common_params(),
+            'req_0': {
+                'module': 'music.trackInfo.UniformRuleCtrl',
+                'method': 'CgiGetTrackInfo',
+                'param': {
+                    'ids': song_ids,
+                    'types': [200]*len(song_ids),
+                    'source': 'AiNoFree',
+                }
+            }
+        }
+        js = self.rpc(payload)
+        return js['req_0']['data']['tracks']
+
     def song_similar(self, song_id):
         payload = {
             "simsongs": {
@@ -377,24 +396,24 @@ class API(object):
         playlist = js['recomPlaylist']
         return playlist['data']['v_hot']
 
-    def get_recommend_playlists_ids(self, index=0):
+    def get_recommend_feed(self, page=1):
+        # APIs are found in https://y.qq.com/wk_v17/#/recommend
         data = {
             'req_0': {
                 'module': 'recommend.RecommendFeedServer',
                 'method': 'get_recommend_feed',
                 'param': {
                     'direction': 0,
-                    'page': 1,
+                    'page': page,
                     'v_cache': [],
                     'v_uniq': [],
                     's_num': 0
                 }
             },
+            'comm': self.get_wkv17_common_params(),
         }
         js = self.rpc(data)
-        ids = [card['id']
-               for card in js['req_0']['data']['v_shelf'][index]['v_niche'][0]['v_card']]
-        return ids
+        return js['req_0']['data']
 
     def get_lyric_by_songmid(self, songmid):
         url = api_base_url + '/lyric/fcgi-bin/fcg_query_lyric_new.fcg'
@@ -426,6 +445,22 @@ class API(object):
         CodeShouldBe0.check(js)
         return js
 
+    def get_wkv17_common_params(self):
+        return {
+            # ct field is important, without this field,
+            # the req_0 result is completely different.
+            "ct": 20,
+            "cv": 1770,
+            'g_tk': 5381,
+            'uin': self._uin,
+            'format': 'json',
+            'inCharset': 'utf-8',
+            'outCharset': 'utf-8',
+            'platform': 'wk_v17',
+            'uid': '',
+            'guid': '',
+        }
+
     def get_common_params(self):
         return {
             'loginUin': self._uin,
@@ -476,13 +511,7 @@ class API(object):
             },
         }
         js = self.rpc(payload)
-        res_json = []
-        for track in js['songlist']['data']['tracks']:
-            track['songid'] = track.pop('id')
-            track['songmid'] = track.pop('mid')
-            track['songname'] = track.pop('name')
-            res_json.append(track)
-        return res_json
+        return js['songlist']['data']['tracks']
 
     def get_song_url(self, song_mid):
         uin = self._uin

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

@@ -3,6 +3,10 @@ from typing import List, Optional, Protocol
 from feeluown.excs import ModelNotFound
 from feeluown.library import (
     AbstractProvider,
+    BriefSongModel,
+    PlaylistModel,
+    Collection,
+    CollectionType,
     ProviderV2,
     ProviderFlags as PF,
     SupportsSongGet,
@@ -17,6 +21,7 @@ from feeluown.library import (
     SupportsArtistGet,
     SupportsPlaylistGet,
     SupportsPlaylistSongsReader,
+    SupportsRecACollectionOfSongs,
     SimpleSearchResult,
     SearchType,
     ModelType,
@@ -42,6 +47,7 @@ class Supports(
     SupportsArtistGet,
     SupportsPlaylistGet,
     SupportsPlaylistSongsReader,
+    SupportsRecACollectionOfSongs,
     Protocol,
 ):
     pass
@@ -153,13 +159,13 @@ class QQProvider(AbstractProvider, ProviderV2):
         :return: when quality is invalid, return None
         """
         q_media_mapping = self._song_get_q_media_mapping(song)
-        quality_suffix = song.cache_get("quality_suffix")
-        mid = song.cache_get("mid")
-        media_id = song.cache_get("media_id")
+        quality_suffix = self._model_cache_get_or_fetch(song, "quality_suffix")
+        mid = self._model_cache_get_or_fetch(song, "mid")
+        media_id = self._model_cache_get_or_fetch(song, "media_id")
         media = q_media_mapping.get(quality)
         if media is UNFETCHED_MEDIA:
             for q, t, b, s in quality_suffix:
-                if quality == q:
+                if quality == Quality.Audio(q):
                     url = self.api.get_song_url_v2(mid, media_id, t)
                     if url:
                         media = Media(url, bitrate=b, format=s)
@@ -247,6 +253,35 @@ class QQProvider(AbstractProvider, ProviderV2):
             pl["logo"] = pl["cover"]
         return [_deserialize(playlist, QQPlaylistSchema) for playlist in 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']:
+            # I guess 10046 means 'song'.
+            if shelf['miscellany'].get('jumptype') == 10046:
+                shelf = shelf
+        if shelf is None:
+            return '', []
+        title = shelf['title_content'] or shelf['title_template']
+        song_ids = []
+        for batch in shelf['v_niche']:
+            for card in batch['v_card']:
+                if card['jumptype'] == 10046:
+                    song_id = int(card['id'])
+                    if song_id not in song_ids:
+                        song_ids.append(song_id)
+
+        tracks = self.api.batch_song_details(song_ids)
+        return Collection(name=title,
+                          type_=CollectionType.only_songs,
+                          models=[_deserialize(track, QQSongSchema) for track in tracks],
+                          description='')
+
+    def current_user_get_radio_songs(self):
+        songs_data = self.api.get_radio_music()
+        return [_deserialize(s, QQSongSchema) for s in songs_data]
+
     def current_user_list_playlists(self):
         user = self.get_current_user()
         if user is None:

{fuo_qqmusic-1.0.1 → fuo_qqmusic-1.0.3}/fuo_qqmusic/schemas.py

@@ -226,7 +226,7 @@ class QQAlbumSchema(Schema):
 class QQPlaylistSchema(Schema):
     identifier = fields.Int(required=True, data_key="dissid")
     name = fields.Str(required=True, data_key="dissname")
-    cover = fields.Url(required=True, data_key="logo")
+    cover = fields.Str(required=True, data_key="logo")
     # songs field maybe null, though it can't be null in model
     songs = fields.List(
         fields.Nested(QQSongSchema), data_key="songlist", allow_none=True

{fuo_qqmusic-1.0.1 → fuo_qqmusic-1.0.3}/fuo_qqmusic.egg-info/PKG-INFO

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

{fuo_qqmusic-1.0.1 → fuo_qqmusic-1.0.3}/fuo_qqmusic.egg-info/requires.txt

@@ -1,3 +1,3 @@
-feeluown>=4.0a0
+feeluown>=4.1.3
 requests
 marshmallow>=3.0

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

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
     name='fuo_qqmusic',
-    version='1.0.1',
+    version='1.0.3',
     description='feeluown qqmusic plugin',
     author='Cosven',
     author_email='yinshaowen241@gmail.com',
@@ -27,7 +27,7 @@ setup(
         'Programming Language :: Python :: 3 :: Only',
     ],
     install_requires=[
-        'feeluown>=4.0a0',
+        'feeluown>=4.1.3',
         'requests',
         'marshmallow>=3.0'
     ],