fuo-qqmusic 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

fuo_qqmusic/api.py

@@ -8,6 +8,7 @@ import math
 import json
 import random
 import time
+from enum import Enum
 
 import requests
 from .excs import QQIOError
@@ -286,6 +287,34 @@ class API(object):
         resp = requests.get(url, params=params)
         return resp.json()['data']
 
+    def playlist_remove_songs(self, playlist_id, song_id_list):
+        payload = {
+            'req_0': {
+                'method': 'DelSonglist',
+                'module': 'music.musicasset.PlaylistDetailWrite',
+                'param': {
+                    'dirId': playlist_id,  # int
+                    'v_songInfo': [{'songId': int(song_id), 'songType': 0} for song_id in song_id_list]
+                }
+            }
+        }
+        js = self.rpc(payload)
+        return js['req_0']['code'] == 0
+
+    def playlist_add_songs(self, playlist_id, song_id_list):
+        payload = {
+            'req_0': {
+                'method': 'AddSonglist',
+                'module': 'music.musicasset.PlaylistDetailWrite',
+                'param': {
+                    'dirId': int(playlist_id),  # int
+                    'v_songInfo': [{'songId': int(song_id), 'songType': 0} for song_id in song_id_list]
+                }
+            }
+        }
+        js = self.rpc(payload)
+        return js['req_0']['code'] == 0
+
     def playlist_detail(self, pid, offset=0, limit=50):
         url = api_base_url + '/qzone/fcg-bin/fcg_ucc_getcdinfo_byids_cp.fcg'
         params = {
@@ -318,6 +347,7 @@ class API(object):
         resp = requests.get(url, params=params, headers=self._headers,
                             cookies=self._cookies, timeout=self._timeout)
         js = resp.json()
+        logger.debug(f"user detail response: {js}")
         if js['code'] != 0:
             raise CodeShouldBe0(js)
         return js['data']
@@ -437,6 +467,7 @@ class API(object):
     def rpc(self, payload):
         if 'comm' not in payload:
             payload['comm'] = self.get_common_params()
+        logger.debug(f"rpc payload: {payload}")
         data_str = json.dumps(payload, ensure_ascii=False)
         params = {
             '_': int(round(time.time() * 1000)),
@@ -447,6 +478,7 @@ class API(object):
         resp = requests.get(url, params=params, headers=self._headers,
                             cookies=self._cookies, timeout=self._timeout)
         js = resp.json()
+        logger.debug(f"rpc response json: {js}")
         CodeShouldBe0.check(js)
         return js
 
@@ -717,5 +749,85 @@ class API(object):
             return 'http://isure.stream.qqmusic.qq.com/{}'.format(midurlinfo[0]['purl'])
         return ''
 
+    class DislikeListType(Enum):
+        singer = 2
+        song = 3
+        _style_unsupported = 4 # TODO: 这是什么？似乎是不喜欢的风格列表，不确定，暂时不支持
+
+    def get_dislike_list(self, page=1, type_=DislikeListType.song, last_id=0):
+        payload = {
+            "req_0": {
+                "module": "music.feedback.FeedbackBlack",
+                "method": "GetDislikeList",
+                "param": {
+                    "Cmd": type_.value,
+                    "Page": page,
+                    "SongLastid": last_id if type_ == API.DislikeListType.song else 0,
+                    "SingersLastid": (
+                        last_id if type_ == API.DislikeListType.singer else 0
+                    ),
+                },
+            },
+        }
+        js = self.rpc(payload)
+        if type_ == API.DislikeListType.song:
+            return js["req_0"]["data"]["Songs"]
+        elif type_ == API.DislikeListType.singer:
+            return js["req_0"]["data"]["Singers"]
+        else:
+            raise QQIOError(f"Unknown dislike list type: {type_}")
+
+    def add_to_dislike_list(self, items, type_=DislikeListType.song):
+        req_param = {
+            "Singers": [],
+            "Songs": [],
+            "Styles": [],
+            "OnlyAdd": 1,
+        }
+        if type_ == API.DislikeListType.song:
+            req_param["Songs"] = items
+        elif type_ == API.DislikeListType.singer:
+            req_param["Singers"] = items
+        else:
+            raise QQIOError(f"Unknown dislike list type: {type_}")
+
+        payload = {
+             "req_0": {
+                 "module": "music.feedback.FeedbackBlack",
+                 "method": "AddDislike",
+                 "param": req_param,
+             },
+        }
+        js = self.rpc(payload)
+        # Response example, {'code': 0, 'data': {'Retcode': 0, 'Msg': '', 'Token': ''}}
+        CodeShouldBe0.check(js['req_0'])
+        return js['req_0']['data']
+
+    def remove_from_dislike_list(self, items, type_=DislikeListType.song):
+        req_param = {
+            "Singers": [],
+            "Songs": [],
+            "Styles": [],
+            "OnlyAdd": 0,
+        }
+        if type_ == API.DislikeListType.song:
+            req_param["Songs"] = items
+        elif type_ == API.DislikeListType.singer:
+            req_param["Singers"] = items
+        else:
+            raise QQIOError(f"Unknown dislike list type: {type_}")
+
+        payload = {
+            "req_0": {
+                "module": "music.feedback.FeedbackBlack",
+                "method": "CancelDislike",
+                "param": req_param,
+            },
+        }
+        js = self.rpc(payload)
+        CodeShouldBe0.check(js)
+        CodeShouldBe0.check(js['req_0'])
+        return js['req_0']['data']
+
 
 api = API()

fuo_qqmusic/provider.py

@@ -4,6 +4,7 @@ from feeluown.excs import ModelNotFound
 from feeluown.library import (
     AbstractProvider,
     BriefSongModel,
+    BriefPlaylistModel,
     PlaylistModel,
     Collection,
     CollectionType,
@@ -23,12 +24,17 @@ from feeluown.library import (
     SupportsPlaylistGet,
     SupportsPlaylistSongsReader,
     SupportsRecACollectionOfSongs,
+    SupportsCurrentUserDislikeSongsReader,
+    SupportsCurrentUserDislikeAddSong,
+    SupportsCurrentUserDislikeRemoveSong,
+    SupportsCurrentUserChanged,
     SimpleSearchResult,
     SearchType,
     ModelType,
     UserModel,
 )
 from feeluown.media import Media, Quality
+from feeluown.utils.dispatch import Signal
 from feeluown.utils.reader import create_reader, SequentialReader
 from .api import API
 from .login import read_cookies
@@ -53,6 +59,9 @@ class Supports(
     SupportsPlaylistSongsReader,
     SupportsRecACollectionOfSongs,
     SupportsAlbumSongsReader,
+    SupportsCurrentUserDislikeSongsReader,
+    SupportsCurrentUserDislikeAddSong,
+    SupportsCurrentUserDislikeRemoveSong,
     Protocol,
 ):
     pass
@@ -70,6 +79,7 @@ class QQProvider(AbstractProvider, ProviderV2):
     def __init__(self):
         super().__init__()
         self.api = API()
+        self.current_user_changed = Signal()
 
     def _(self) -> Supports:
         return self
@@ -89,6 +99,7 @@ class QQProvider(AbstractProvider, ProviderV2):
             self.auth(user)
         else:
             logger.info(f'Auto login failed: {err}')
+        self.current_user_changed.emit(user)
 
     def try_get_user_from_cookies(self, cookies) -> Tuple[Optional[UserModel], str]:
         if not cookies:  # is None or empty
@@ -270,6 +281,22 @@ class QQProvider(AbstractProvider, ProviderV2):
         data = self.api.playlist_detail(int(identifier), limit=1000)
         return _deserialize(data, QQPlaylistSchema)
 
+    def playlist_add_song(self, playlist, song):
+        # FIXME: 目前 playlist 相关接口用的都是 diss 结构体，而这里需要一个 dirid。
+        # 平台方也提供了 dir 相关的接口，我大胆猜测，diss 是一套老接口。
+        playlist._cache.pop("songs", None)
+        dirid = self._get_dirid_by_playlist_id(playlist.identifier)
+        return self.api.playlist_add_songs(dirid, [song.identifier])
+
+    def playlist_remove_song(self, playlist, song):
+        playlist._cache.pop("songs", None)
+        dirid = self._get_dirid_by_playlist_id(playlist.identifier)
+        return self.api.playlist_remove_songs(dirid, [song.identifier])
+
+    def _get_dirid_by_playlist_id(self, playlist_id):
+        data = self.api.playlist_detail(int(playlist_id), limit=1)
+        return data["dirid"]
+
     def playlist_create_songs_rd(self, playlist):
         songs = self._model_cache_get_or_fetch(playlist, "songs")
         return create_reader(songs)
@@ -371,7 +398,13 @@ class QQProvider(AbstractProvider, ProviderV2):
         if user is None:
             return []
         playlists = self._model_cache_get_or_fetch(user, "playlists")
-        return playlists
+        fav_pid = self._model_cache_get_or_fetch(user, "fav_pid")
+        my_love = BriefPlaylistModel(
+            source=SOURCE,
+            identifier=str(fav_pid),
+            name='我喜欢'
+        )
+        return [my_love] + playlists
 
     def current_user_fav_create_songs_rd(self):
         user = self.get_current_user()
@@ -405,6 +438,9 @@ class QQProvider(AbstractProvider, ProviderV2):
             return create_reader([])
         mid = self._model_cache_get_or_fetch(user, "mid")
         playlists = self.api.user_favorite_playlists(user.identifier, mid)
+        # HACK: 给 playlist 加一个 disstid 字段，这样可以兼容 QQPlaylistSchema
+        for playlist in playlists:
+            playlist["disstid"] = playlist["dissid"]
         return [_deserialize(playlist, QQPlaylistSchema) for playlist in playlists]
 
     def has_current_user(self):
@@ -417,6 +453,35 @@ class QQProvider(AbstractProvider, ProviderV2):
         data_songs = self.api.song_similar(int(song.identifier))
         return [_deserialize(data_song, QQSongSchema) for data_song in data_songs]
 
+    def current_user_dislike_create_songs_rd(self):
+        user = self.get_current_user()
+        if user is None:
+            return create_reader([])
+        # FIXME: 如果用户的黑名单歌曲数量较多的话，这样处理则是不够的
+        items = self.api.get_dislike_list(1, API.DislikeListType.song, 0)
+        songs = []
+        for item in items:
+            name = item['Name']
+            title, artists_name = name.split(' - ')
+            song = BriefSongModel(
+                source=SOURCE,
+                identifier=item['ID'],
+                title=title,
+                artists_name=artists_name,
+            )
+            songs.append(song)
+        return create_reader(songs)
+
+    def current_user_dislike_add_song(self, song):
+        items = [{'ID': song.identifier}]
+        js = self.api.add_to_dislike_list(items, API.DislikeListType.song)
+        return js.get('Retcode') == 0
+
+    def current_user_dislike_remove_song(self, song):
+        items = [{'ID': song.identifier}]
+        js = self.api.remove_from_dislike_list(items, API.DislikeListType.song)
+        return js.get('Retcode') == 0
+
 
 def _deserialize(data, schema_cls):
     schema = schema_cls()

fuo_qqmusic/provider_ui.py

@@ -39,8 +39,9 @@ class ProviderUI(AbstractProviderUi):
             #
             #    - keys: ['skey']
             url = os.getenv('FUO_QQMUSIC_LOGIN_URL', 'https://y.qq.com')
-            keys = os.getenv('FUO_QQMUSIC_LOGIN_COOKIE_KEYS', 'qqmusic_key').split(',')
-            self._dialog = LoginDialog(url, keys)
+            keys_str = os.getenv('FUO_QQMUSIC_LOGIN_COOKIE_KEYS',
+                                 'qqmusic_key,wxuin|qqmusic_key,uin')
+            self._dialog = LoginDialog(url, [keys.split(',') for keys in keys_str.split('|')])
             self._dialog.login_succeed.connect(self.on_login_succeed)
             self._dialog.show()
             self._dialog.autologin()

fuo_qqmusic/schemas.py

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

{fuo_qqmusic-1.0.6.dist-info → fuo_qqmusic-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fuo_qqmusic
-Version: 1.0.6
+Version: 1.0.8
 Summary: feeluown qqmusic plugin
 Home-page: https://github.com/feeluown/feeluown-qqmusic
 Author: Cosven
@@ -13,9 +13,9 @@ 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: feeluown>=4.1.13
 Requires-Dist: requests
-Requires-Dist: marshmallow>=3.0
+Requires-Dist: marshmallow<4.0.0,>=3.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

fuo_qqmusic-1.0.8.dist-info/RECORD

@@ -0,0 +1,14 @@
+fuo_qqmusic/__init__.py,sha256=YxZHAp5Qaye5B5V8GBPyxqnEUe-FcwUv6TiF_29qBEs,537
+fuo_qqmusic/api.py,sha256=vzsPBhoivJs_LA_L8g7gR49o3jqtH_xpt3LInrBWBfI,28548
+fuo_qqmusic/consts.py,sha256=9VFc9yE6z6c0IzK03PQTEO0JqgXi37RahEvZRP-A4Dk,185
+fuo_qqmusic/excs.py,sha256=SBcER_wESjvui6a0Li1dX5utep4ouDS7HaTXqXPOQiA,160
+fuo_qqmusic/login.py,sha256=zNPPncKl1Pr8uYBbLrdPlVJyKBsNfS2FotRfn9l3LEA,542
+fuo_qqmusic/provider.py,sha256=S3gcS0od5nF-7_YLZ_VFGRSpycr4LMH31sexqDFvO_0,20270
+fuo_qqmusic/provider_ui.py,sha256=YzYVnst6OhYH8ii0rHrfZ6T41zJk844rkxL3E4gyD4Y,2459
+fuo_qqmusic/schemas.py,sha256=bS6PgqAypCo-4I11_iVyu_ZgBXxmkoVQ9cRIQDymjlc,12129
+fuo_qqmusic/assets/icon.svg,sha256=o48VTiHroJU6S2g8LbxfnK25G2QW3d1XtQZKoL3ZMGA,1216
+fuo_qqmusic-1.0.8.dist-info/METADATA,sha256=OIWBsFTaCfZJQ3Mk0Mudvur_JzErhXiDNYOko6retJk,811
+fuo_qqmusic-1.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fuo_qqmusic-1.0.8.dist-info/entry_points.txt,sha256=XUL7UwcsLZEuEbBJIcsFemC3BiYb7dSTiXB9r6SJ5zY,39
+fuo_qqmusic-1.0.8.dist-info/top_level.txt,sha256=Qn_g3dRwtoVZgVPZ9uRehspXi62T-E1x9_kLIdYFic4,12
+fuo_qqmusic-1.0.8.dist-info/RECORD,,

{fuo_qqmusic-1.0.6.dist-info → fuo_qqmusic-1.0.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

fuo_qqmusic-1.0.6.dist-info/RECORD

@@ -1,14 +0,0 @@
-fuo_qqmusic/__init__.py,sha256=YxZHAp5Qaye5B5V8GBPyxqnEUe-FcwUv6TiF_29qBEs,537
-fuo_qqmusic/api.py,sha256=bFgr9eyRMrBhsQC8qR1sJ5SN616tdn06eXG6igZ6_ms,24587
-fuo_qqmusic/consts.py,sha256=9VFc9yE6z6c0IzK03PQTEO0JqgXi37RahEvZRP-A4Dk,185
-fuo_qqmusic/excs.py,sha256=SBcER_wESjvui6a0Li1dX5utep4ouDS7HaTXqXPOQiA,160
-fuo_qqmusic/login.py,sha256=zNPPncKl1Pr8uYBbLrdPlVJyKBsNfS2FotRfn9l3LEA,542
-fuo_qqmusic/provider.py,sha256=LqFB18PtXVBVFl2SfDoaQea6R4aq16My9PGrhhLotPg,17478
-fuo_qqmusic/provider_ui.py,sha256=K70BjKvlx4h6gVYqeHOZhP68nnUWH2_mFbUK3jjvJ5U,2366
-fuo_qqmusic/schemas.py,sha256=Sbka-YuK3UTn26CbfwOb0ZfB6XmiJHW-ibCLThj49VQ,12128
-fuo_qqmusic/assets/icon.svg,sha256=o48VTiHroJU6S2g8LbxfnK25G2QW3d1XtQZKoL3ZMGA,1216
-fuo_qqmusic-1.0.6.dist-info/METADATA,sha256=nhPvAwYN2IzTfRbkBivKvgsaZtiCZroqPKIdfhZZsRc,803
-fuo_qqmusic-1.0.6.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-fuo_qqmusic-1.0.6.dist-info/entry_points.txt,sha256=XUL7UwcsLZEuEbBJIcsFemC3BiYb7dSTiXB9r6SJ5zY,39
-fuo_qqmusic-1.0.6.dist-info/top_level.txt,sha256=Qn_g3dRwtoVZgVPZ9uRehspXi62T-E1x9_kLIdYFic4,12
-fuo_qqmusic-1.0.6.dist-info/RECORD,,