fuo-qqmusic 1.0.10__tar.gz → 1.0.12__tar.gz

{fuo_qqmusic-1.0.10 → fuo_qqmusic-1.0.12}/PKG-INFO

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

{fuo_qqmusic-1.0.10 → fuo_qqmusic-1.0.12}/README.md

@@ -20,7 +20,13 @@ pip3 install fuo-qqmusic
 [操作示例](https://github.com/feeluown/feeluown-qqmusic/issues/6)。
 
 ## changelog
-### 1.1.10 (2025-07-29)
+### 1.0.12 (2025-09-22)
+- 支持展示歌曲评论
+
+### 1.0.11 (2025-08-12)
+- 尝试修复wx登录有时会失败的问题
+
+### 1.0.10 (2025-07-29)
 - 修复歌曲链接会失效的问题（仅 FeelUOwn>=4.1.14 可用）
 
 ### 1.0.9 (2025-07-24)

{fuo_qqmusic-1.0.10 → fuo_qqmusic-1.0.12}/fuo_qqmusic/api.py

@@ -17,6 +17,14 @@ logger = logging.getLogger(__name__)
 
 api_base_url = 'http://c.y.qq.com'
 
+class CodeShouldBe200(QQIOError):
+    def __init__(self, data):
+        self._code = data['code']
+        self._data = data
+
+    def __str__(self):
+        return f'json code field should be 200, got {self._code}. data: {self._data}'
+
 
 def djb2(string):
     ''' Hash a word using the djb2 algorithm with the specified base. '''
@@ -449,6 +457,13 @@ class API(object):
         }
         js = self.rpc(data)
         return js['req_0']['data']
+    
+    def get_comment(self, comment_id):
+        url = api_base_url + f'/base/fcgi-bin/fcg_global_comment_h5.fcg?biztype=1&cmd=8&topid={comment_id}&pagenum=0&pagesize=25'
+        res_data = requests.get(url, headers=self._headers)
+        if res_data.status_code == 200:
+            return res_data.json()
+        raise CodeShouldBe200(res_data)
 
     def get_lyric_by_songmid(self, songmid):
         url = api_base_url + '/lyric/fcgi-bin/fcg_query_lyric_new.fcg'

{fuo_qqmusic-1.0.10 → fuo_qqmusic-1.0.12}/fuo_qqmusic/provider.py

@@ -3,11 +3,14 @@ from typing import List, Optional, Protocol, Tuple
 from feeluown.excs import ModelNotFound
 from feeluown.library import (
     AbstractProvider,
+    BriefCommentModel,
     BriefSongModel,
     BriefPlaylistModel,
+    BriefUserModel,
     PlaylistModel,
     Collection,
     CollectionType,
+    CommentModel,
     ProviderV2,
     ProviderFlags as PF,
     SupportsSongGet,
@@ -30,6 +33,7 @@ from feeluown.library import (
     SupportsCurrentUserChanged,
     SimpleSearchResult,
     SearchType,
+    ModelState,
     ModelType,
     UserModel,
 )
@@ -193,6 +197,32 @@ class QQProvider(AbstractProvider, ProviderV2):
         must not return None with a valid quality.
         """
         return list(self._song_get_q_media_mapping(song))
+    
+    def song_list_hot_comments(self, song):
+        logger.info(f'Fetching hot comments for song: {song.title}({song.identifier})')
+        data = self.api.get_comment(song.identifier)
+        hot_comments_data = data["hot_comment"]["commentlist"]
+        hot_comments = []
+        for comment_data in hot_comments_data:
+            user = BriefUserModel(
+                identifier='',
+                source=SOURCE,
+                name=comment_data['nick'],
+                state=ModelState.not_exists,
+            )
+            comment = CommentModel(
+                identifier=str(comment_data["commentid"]),
+                source=SOURCE,
+                user=user,
+                content=comment_data["rootcommentcontent"],
+                liked_count=comment_data["praisenum"],
+                time=comment_data["time"],
+                parent=None,
+                root_comment_id=str(comment_data["rootcommentcontent"])
+            )
+            hot_comments.append(comment)
+        return hot_comments
+
 
     def song_get_media(self, song, quality: Quality.Audio) -> Optional[Media]:
         """Get song's media by a specified quality

{fuo_qqmusic-1.0.10 → fuo_qqmusic-1.0.12}/fuo_qqmusic/provider_ui.py

@@ -38,8 +38,27 @@ class ProviderUI(AbstractProviderUi):
             #
             #    - keys: ['skey']
             url = os.getenv('FUO_QQMUSIC_LOGIN_URL', 'https://y.qq.com')
+            # NOTE(cosven): 经过一番探索，我‘观察’到，wx的快捷登录还挺方便，
+            # 它可以识别到我浏览器当前登录的wx账户。它是怎样识别到我的账户的呢？
+            # 理论上可以在第一次扫码的时候，在浏览器开发者工具中抓包，看 set-cookie 字段就知道了。
+            # 我目前怀疑是大概率是 _qimei 相关的字段，但不太确认，一下子也没找到很可靠的资料。
+            #
+            # 另外，值得备注的是，我发现登录后，会有一些 oauth 相关字段存在 cookie 里面，
+            # 对于wx登录这种方式来说，我猜测它没有被用上。猜测的依据是：每隔一两天，
+            # 无论是网页版，还是我们这里的逻辑，都需要通过“微信快捷登录”来登录。
+            # 而我们这里目前根本没用使用 refresh_token 做任何事情。
+            #
+            # 不过还是备注一下，wx 登录的话，下面字段或许可以用来刷新 cookie
+            #  'wxunionid', 'wxrefresh_token'
+            # qq 登录的话，下面几个字段或许可以用来刷新 cookie
+            #   'psrf_access_token_expiresAt',
+            #   'psrf_musickey_createtime',
+            #   'psrf_qqaccess_token',
+            #   'psrf_qqopenid',
+            #   'psrf_qqrefresh_token',
             keys_str = os.getenv('FUO_QQMUSIC_LOGIN_COOKIE_KEYS',
-                                 'qqmusic_key,wxuin|qqmusic_key,uin')
+                                 ('qqmusic_key,wxuin,qm_keyst'
+                                  '|qqmusic_key,uin,qm_keyst'))
             self._dialog = LoginDialog(url, [keys.split(',') for keys in keys_str.split('|')])
             self._dialog.login_succeed.connect(self.on_login_succeed)
             self._dialog.show()

{fuo_qqmusic-1.0.10 → fuo_qqmusic-1.0.12}/fuo_qqmusic.egg-info/PKG-INFO

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

{fuo_qqmusic-1.0.10 → fuo_qqmusic-1.0.12}/setup.py

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