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

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

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

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

@@ -20,6 +20,10 @@ pip3 install fuo-qqmusic
 [操作示例](https://github.com/feeluown/feeluown-qqmusic/issues/6)。
 
 ## changelog
+### 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.4}/fuo_qqmusic/api.py

@@ -247,6 +247,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.4}/fuo_qqmusic/provider.py

@@ -240,7 +240,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 +253,45 @@ 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'])
+                    )
+        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']:

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

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

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

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