fuo-qqmusic 1.0.5__tar.gz → 1.0.7__tar.gz

{fuo_qqmusic-1.0.5 → fuo_qqmusic-1.0.7}/PKG-INFO

@@ -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,3 +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: requests
+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.5 → fuo_qqmusic-1.0.7}/README.md

@@ -20,6 +20,13 @@ pip3 install fuo-qqmusic
 [操作示例](https://github.com/feeluown/feeluown-qqmusic/issues/6)。
 
 ## changelog
+### 1.0.7 (2025-05-31)
+- 支持音乐黑名单
+
+### 1.0.6 (2025-05-08)
+- 支持每日推荐
+- 支持自动登录
+
 ### 1.0.5 (2024-06-03)
 - 修复搜索接口，支持搜索歌单、视频、专辑
 - 支持提供歌单的播放次数

{fuo_qqmusic-1.0.5 → fuo_qqmusic-1.0.7}/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
@@ -58,7 +59,7 @@ class API(object):
     Please http capture request from (mobile) qqmusic mobile web page
     """
 
-    def __init__(self, timeout=1):
+    def __init__(self, timeout=2):
         # TODO: 暂时无脑统一一个 timeout
         # 正确的应该是允许不同接口有不同的超时时间
         self._timeout = timeout
@@ -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-1.0.7/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-1.0.5 → fuo_qqmusic-1.0.7}/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()
@@ -273,7 +332,6 @@ class QQProvider(AbstractProvider, ProviderV2):
         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']),
@@ -369,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-1.0.5 → fuo_qqmusic-1.0.7}/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 → fuo_qqmusic-1.0.7}/fuo_qqmusic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: fuo-qqmusic
-Version: 1.0.5
+Metadata-Version: 2.4
+Name: fuo_qqmusic
+Version: 1.0.7
 Summary: feeluown qqmusic plugin
 Home-page: https://github.com/feeluown/feeluown-qqmusic
 Author: Cosven
@@ -13,3 +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: requests
+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.5 → fuo_qqmusic-1.0.7}/fuo_qqmusic.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ fuo_qqmusic/__init__.py
 fuo_qqmusic/api.py
 fuo_qqmusic/consts.py
 fuo_qqmusic/excs.py
+fuo_qqmusic/login.py
 fuo_qqmusic/provider.py
 fuo_qqmusic/provider_ui.py
 fuo_qqmusic/schemas.py
@@ -13,4 +14,6 @@ fuo_qqmusic.egg-info/dependency_links.txt
 fuo_qqmusic.egg-info/entry_points.txt
 fuo_qqmusic.egg-info/requires.txt
 fuo_qqmusic.egg-info/top_level.txt
-fuo_qqmusic/assets/icon.svg
+fuo_qqmusic/assets/icon.svg
+tests/test_api.py
+tests/test_provider.py

{fuo_qqmusic-1.0.5 → fuo_qqmusic-1.0.7}/fuo_qqmusic.egg-info/requires.txt

@@ -1,3 +1,3 @@
 feeluown>=4.1.3
 requests
-marshmallow>=3.0
+marshmallow<4.0.0,>=3.0

{fuo_qqmusic-1.0.5 → fuo_qqmusic-1.0.7}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
     name='fuo_qqmusic',
-    version='1.0.5',
+    version='1.0.7',
     description='feeluown qqmusic plugin',
     author='Cosven',
     author_email='yinshaowen241@gmail.com',
@@ -29,7 +29,7 @@ setup(
     install_requires=[
         'feeluown>=4.1.3',
         'requests',
-        'marshmallow>=3.0'
+        'marshmallow>=3.0,<4.0.0'
     ],
     entry_points={
         'fuo.plugins_v1': [

fuo_qqmusic-1.0.7/tests/test_api.py

@@ -0,0 +1,56 @@
+from fuo_qqmusic.api import API
+import pytest
+
+
+def parse_cookie_to_dict(cookie_str):
+    # 初始化结果字典
+    result = {}
+
+    # 按分号分割字符串，得到每个键值对
+    pairs = cookie_str.split(";")
+
+    for pair in pairs:
+        # 去除两端空格
+        pair = pair.strip()
+
+        # 按等号分割键和值
+        if "=" in pair:
+            key, value = pair.split("=", 1)
+            key = key.strip()
+            value = value.strip()
+
+            # 如果值为空字符串，则设置为 None
+            if value == "":
+                value = None
+
+            # 存入字典
+            result[key] = value
+
+    return result
+
+
+cookie_str = "Your cookie string here"
+
+
+@pytest.mark.skip(reason="need valid cookies")
+def test_api():
+    api = API()
+    api.set_cookies(parse_cookie_to_dict(cookie_str))
+    # You can also use the following code to load cookies
+    # from fuo_qqmusic.provider import provider
+    # provider.auto_login()
+    # api = provider.api
+    items = [
+        {
+            "ID": "238159921",
+            "Name": "无人区-Vacuum Track#ADD8E6- - 米缐p.",
+            "IdType": 0,
+        }
+    ]
+    print(api.add_to_dislike_list(items, type_=API.DislikeListType.song))
+    print(api.get_dislike_list(type_=API.DislikeListType.song))
+    print(api.remove_from_dislike_list(items, type_=API.DislikeListType.song))
+
+
+if __name__ == "__main__":
+    test_api()

fuo_qqmusic-1.0.7/tests/test_provider.py

@@ -0,0 +1,26 @@
+import json
+import os
+from unittest.mock import patch
+
+import pytest
+
+from fuo_qqmusic import provider
+from fuo_qqmusic.api import API
+
+
+def _read_json_fixture(path):
+    path = os.path.join('data/fixtures', path)
+    with open(path, 'r', encoding='utf-8') as f:
+        data = json.load(f)
+    return data
+
+
+@pytest.fixture
+def album_3913679():
+    return _read_json_fixture('album_3913679.json')
+
+
+def test_provider_album_get(album_3913679):
+    patch.object(API, 'album_detail', return_value=album_3913679)
+    album = provider.album_get('3913679')
+    assert album.identifier == '3913679'