fuo-qqmusic 1.0.5__py3-none-any.whl → 1.0.7__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
@@ -518,6 +519,33 @@ class API(object):
         js = self.rpc(payload)
         return js['songlist']['data']['tracks']
 
+    def get_diss_info(self, dissid, offset=0, limit=50):
+        """获取歌单的详情
+
+        这是一种特殊的歌单，它的内容是动态的，由官方生成。比如“百万收藏”。
+
+        :param dissid: int, 举个例子 211111 是百万收藏。
+        :return: 参考 fixtures/get_diss_info.json
+        """
+        payload = {
+            'req': {
+                "module": "music.srfDissInfo.aiDissInfo",
+                "method":"uniform_get_Dissinfo",
+                "param": {
+                    "disstid":dissid,
+                    "userinfo":1,  # 不懂啥意思
+                    "tag":1,  # 不懂啥意思
+                    "orderlist":1,
+                    "song_begin": offset,
+                    "song_num": limit,
+                    "onlysonglist":0,
+                    "enc_host_uin":""  # 注：即使登录了，这个也是空
+                }
+            }
+        }
+        js = self.rpc(payload)
+        return js['req']['data']
+
     def get_song_url(self, song_mid):
         uin = self._uin
         songvkey = str(random.random()).replace("0.", "")
@@ -690,5 +718,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/login.py

@@ -0,0 +1,24 @@
+import json
+import os
+
+from feeluown.consts import DATA_DIR
+
+USER_INFO_FILE = DATA_DIR + '/qqmusic_user_info.json'
+
+
+def read_cookies():
+    if os.path.exists(USER_INFO_FILE):
+        # if the file is broken, just raise error
+        with open(USER_INFO_FILE) as f:
+            return json.load(f).get('cookies', None)
+
+
+def write_cookies(user, cookies):
+    js = {
+        'identifier': user.identifier,
+        'name': user.name,
+        'cookies': cookies
+    }
+    with open(USER_INFO_FILE, 'w') as f:
+        json.dump(js, f, indent=2)
+

fuo_qqmusic/provider.py

@@ -1,5 +1,5 @@
 import logging
-from typing import List, Optional, Protocol
+from typing import List, Optional, Protocol, Tuple
 from feeluown.excs import ModelNotFound
 from feeluown.library import (
     AbstractProvider,
@@ -23,13 +23,21 @@ 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
+from .excs import QQIOError
 
 
 logger = logging.getLogger(__name__)
@@ -50,6 +58,9 @@ class Supports(
     SupportsPlaylistSongsReader,
     SupportsRecACollectionOfSongs,
     SupportsAlbumSongsReader,
+    SupportsCurrentUserDislikeSongsReader,
+    SupportsCurrentUserDislikeAddSong,
+    SupportsCurrentUserDislikeRemoveSong,
     Protocol,
 ):
     pass
@@ -67,6 +78,7 @@ class QQProvider(AbstractProvider, ProviderV2):
     def __init__(self):
         super().__init__()
         self.api = API()
+        self.current_user_changed = Signal()
 
     def _(self) -> Supports:
         return self
@@ -79,6 +91,32 @@ class QQProvider(AbstractProvider, ProviderV2):
     def name(self):
         return "QQ 音乐"
 
+    def auto_login(self):
+        cookies = read_cookies()
+        user, err = self.try_get_user_from_cookies(cookies)
+        if user:
+            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
+            return None, 'empty cookies'
+
+        uin = provider.api.get_uin_from_cookies(cookies)
+        if uin is None:
+            return None, "can't extract user info from cookies"
+
+        provider.api.set_cookies(cookies)
+        # try to extract current user
+        try:
+            user = provider.user_get(uin)
+        except QQIOError:
+            provider.api.set_cookies(None)
+            return None, 'get user info with cookies failed, expired cookies?'
+        return user, ''
+
     def use_model_v2(self, mtype):
         return mtype in (
             ModelType.song,
@@ -259,6 +297,27 @@ class QQProvider(AbstractProvider, ProviderV2):
             pl["logo"] = pl["cover"]
         return [_deserialize(playlist, QQPlaylistSchema) for playlist in playlists]
 
+    def rec_list_daily_songs(self):
+        # TODO: cache API result
+        feed = self.api.get_recommend_feed()
+        card = None
+        for shelf_ in feed['v_shelf']:
+            if 'moduleID' not in shelf_['extra_info']:
+                for batch in shelf_['v_niche']:
+                    for card in batch['v_card']:
+                        if (
+                            card['extra_info'].get('moduleID', '').startswith('recforyou')
+                            and card['jumptype'] == 10014  # 10014->playlist
+                        ):
+                            card = card
+                            break
+        if card is None:
+            logger.warning("No daily songs found")
+            return []
+        playlist_id = card['id']
+        playlist = self.playlist_get(playlist_id)
+        return self.playlist_create_songs_rd(playlist).readall()
+
     def rec_list_daily_playlists(self):
         # TODO: cache API result
         feed = self.api.get_recommend_feed()
@@ -368,6 +427,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

@@ -11,20 +11,11 @@ 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__)
 
 
-USER_INFO_FILE = DATA_DIR + '/qqmusic_user_info.json'
-
-
-def read_cookies():
-    if os.path.exists(USER_INFO_FILE):
-        # if the file is broken, just raise error
-        with open(USER_INFO_FILE) as f:
-            return json.load(f).get('cookies', None)
-
-
 class ProviderUI(AbstractProviderUi):
     def __init__(self, app: GuiApp):
         self._app = app
@@ -72,31 +63,13 @@ class LoginDialog(CookiesLoginDialog):
         provider._user = user
 
     async def user_from_cookies(self, cookies):
-        if not cookies:  # is None or empty
-            raise InvalidCookies('empty cookies')
-
-        uin = provider.api.get_uin_from_cookies(cookies)
-        if uin is None:
-            raise InvalidCookies("can't extract user info from cookies")
-
-        provider.api.set_cookies(cookies)
-        # try to extract current user
-        try:
-            user = await run_fn(provider.user_get, uin)
-        except QQIOError:
-            provider.api.set_cookies(None)
-            raise InvalidCookies('get user info with cookies failed, expired cookies?')
-        else:
+        user, err = await run_fn(provider.try_get_user_from_cookies, cookies)
+        if user:
             return user
+        raise InvalidCookies(err)
 
     def load_user_cookies(self):
         return read_cookies()
 
     def dump_user_cookies(self, user, cookies):
-        js = {
-            'identifier': user.identifier,
-            'name': user.name,
-            'cookies': cookies
-        }
-        with open(USER_INFO_FILE, 'w') as f:
-            json.dump(js, f, indent=2)
+        write_cookies(user, cookies)

{fuo_qqmusic-1.0.5.dist-info → fuo_qqmusic-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fuo_qqmusic
-Version: 1.0.5
+Version: 1.0.7
 Summary: feeluown qqmusic plugin
 Home-page: https://github.com/feeluown/feeluown-qqmusic
 Author: Cosven
@@ -13,7 +13,13 @@ 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.3
 Requires-Dist: requests
-Requires-Dist: marshmallow (>=3.0)
-
+Requires-Dist: marshmallow<4.0.0,>=3.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: requires-dist
+Dynamic: summary

fuo_qqmusic-1.0.7.dist-info/RECORD

@@ -0,0 +1,14 @@
+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,,

{fuo_qqmusic-1.0.5.dist-info → fuo_qqmusic-1.0.7.dist-info}/WHEEL

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

fuo_qqmusic-1.0.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-fuo_qqmusic/__init__.py,sha256=YxZHAp5Qaye5B5V8GBPyxqnEUe-FcwUv6TiF_29qBEs,537
-fuo_qqmusic/api.py,sha256=w_anRMxAqL9FaMJVRmZ3A_uV4rzr7_S_1xMjZf-uovY,23597
-fuo_qqmusic/consts.py,sha256=9VFc9yE6z6c0IzK03PQTEO0JqgXi37RahEvZRP-A4Dk,185
-fuo_qqmusic/excs.py,sha256=SBcER_wESjvui6a0Li1dX5utep4ouDS7HaTXqXPOQiA,160
-fuo_qqmusic/provider.py,sha256=JmQtjPVPsaZ1n12phJDd_Ll3Y83RfaHb5S6i0d1xrjw,15669
-fuo_qqmusic/provider_ui.py,sha256=UKmzK6SImyWZe_wtkjcfXH_gy2XXbcnnI4Er0fICM6I,3197
-fuo_qqmusic/schemas.py,sha256=Sbka-YuK3UTn26CbfwOb0ZfB6XmiJHW-ibCLThj49VQ,12128
-fuo_qqmusic/assets/icon.svg,sha256=o48VTiHroJU6S2g8LbxfnK25G2QW3d1XtQZKoL3ZMGA,1216
-fuo_qqmusic-1.0.5.dist-info/METADATA,sha256=EgB-48xvBBqTnxxGYFAjK3rqBpaYK6hS5Csvdx5ubAM,675
-fuo_qqmusic-1.0.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-fuo_qqmusic-1.0.5.dist-info/entry_points.txt,sha256=XUL7UwcsLZEuEbBJIcsFemC3BiYb7dSTiXB9r6SJ5zY,39
-fuo_qqmusic-1.0.5.dist-info/top_level.txt,sha256=Qn_g3dRwtoVZgVPZ9uRehspXi62T-E1x9_kLIdYFic4,12
-fuo_qqmusic-1.0.5.dist-info/RECORD,,