fuo-qqmusic 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

fuo_qqmusic/api.py

@@ -287,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 = {
@@ -319,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']
@@ -438,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)),
@@ -448,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
 

fuo_qqmusic/provider.py

@@ -4,6 +4,7 @@ from feeluown.excs import ModelNotFound
 from feeluown.library import (
     AbstractProvider,
     BriefSongModel,
+    BriefPlaylistModel,
     PlaylistModel,
     Collection,
     CollectionType,
@@ -280,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)
@@ -381,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()
@@ -415,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):

fuo_qqmusic/provider_ui.py

@@ -1,16 +1,15 @@
-import json
 import logging
 import os
 
+from PyQt5.QtWidgets import QMenu
+
 from feeluown.utils.dispatch import Signal
 from feeluown.utils.aio import run_fn
-from feeluown.consts import DATA_DIR
 from feeluown.gui.widgets.login import CookiesLoginDialog, InvalidCookies
 from feeluown.gui.provider_ui import AbstractProviderUi
 from feeluown.app.gui_app import GuiApp
 
 from .provider import provider
-from .excs import QQIOError
 from .login import read_cookies, write_cookies
 
 logger = logging.getLogger(__name__)
@@ -29,7 +28,7 @@ class ProviderUI(AbstractProviderUi):
         return os.path.join(os.path.dirname(__file__), 'assets', 'icon.svg')
 
     def login_or_go_home(self):
-        if provider._user is None:
+        if not provider.has_current_user():
             # According to #14, we have two ways to login:
             # 1. the default way, as the code shows
             # 2. a way for VIP user(maybe):
@@ -39,8 +38,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()
@@ -52,10 +52,19 @@ class ProviderUI(AbstractProviderUi):
     def login_event(self):
         return self._login_event
 
+    def context_menu_add_items(self, menu: QMenu):
+        action = menu.addAction('重新登录')
+        action.triggered.connect(self._re_login)
+
     def on_login_succeed(self):
         del self._dialog
         self.login_event.emit(self, 1)
 
+    def _re_login(self):
+        provider.auth(None)
+        self.login_or_go_home()
+
+
 
 class LoginDialog(CookiesLoginDialog):
 

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.7.dist-info → fuo_qqmusic-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fuo_qqmusic
-Version: 1.0.7
+Version: 1.0.9
 Summary: feeluown qqmusic plugin
 Home-page: https://github.com/feeluown/feeluown-qqmusic
 Author: Cosven
@@ -13,7 +13,7 @@ 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<4.0.0,>=3.0
 Dynamic: author

fuo_qqmusic-1.0.9.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=MTjobwbkb3XGmZujE5XZBdRJEOsEeNPWnr55jIR5xg4,2662
+fuo_qqmusic/schemas.py,sha256=bS6PgqAypCo-4I11_iVyu_ZgBXxmkoVQ9cRIQDymjlc,12129
+fuo_qqmusic/assets/icon.svg,sha256=o48VTiHroJU6S2g8LbxfnK25G2QW3d1XtQZKoL3ZMGA,1216
+fuo_qqmusic-1.0.9.dist-info/METADATA,sha256=ECCEvYtYEhlr8KF6cEn55z4xGIG3wk619gvxEMAwJiE,811
+fuo_qqmusic-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fuo_qqmusic-1.0.9.dist-info/entry_points.txt,sha256=XUL7UwcsLZEuEbBJIcsFemC3BiYb7dSTiXB9r6SJ5zY,39
+fuo_qqmusic-1.0.9.dist-info/top_level.txt,sha256=Qn_g3dRwtoVZgVPZ9uRehspXi62T-E1x9_kLIdYFic4,12
+fuo_qqmusic-1.0.9.dist-info/RECORD,,

fuo_qqmusic-1.0.7.dist-info/RECORD

@@ -1,14 +0,0 @@
-fuo_qqmusic/__init__.py,sha256=YxZHAp5Qaye5B5V8GBPyxqnEUe-FcwUv6TiF_29qBEs,537
-fuo_qqmusic/api.py,sha256=yDT6iyq9ZdkRQkqDI96uFE3ctbh7HseUU8NVsuu3jBM,27381
-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=QUw5VvLaKodVVaKp2lPuSm8z1edXy5qUdmlzpE5Ldds,19025
-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.7.dist-info/METADATA,sha256=U6tM7hrztEL-AjtHR_R2U-MkOrPauHrgc54LemZGj8g,810
-fuo_qqmusic-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fuo_qqmusic-1.0.7.dist-info/entry_points.txt,sha256=XUL7UwcsLZEuEbBJIcsFemC3BiYb7dSTiXB9r6SJ5zY,39
-fuo_qqmusic-1.0.7.dist-info/top_level.txt,sha256=Qn_g3dRwtoVZgVPZ9uRehspXi62T-E1x9_kLIdYFic4,12
-fuo_qqmusic-1.0.7.dist-info/RECORD,,