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

fuo_qqmusic/provider.py

@@ -183,7 +183,7 @@ class QQProvider(AbstractProvider, ProviderV2):
         return Media(q_media_mapping[quality.value])
 
     def video_list_quality(self, video):
-        q_media_mapping = self._model_cache_get_or_fetch(video, "q_url_mapping")
+        q_media_mapping = self._model_cache_get_or_fetch(video, "q_url_mapping", ttl=3600)
         return [Quality.Video(k) for k, v in q_media_mapping.items() if v]
 
     def song_list_quality(self, song) -> List[Quality.Audio]:
@@ -223,9 +223,11 @@ class QQProvider(AbstractProvider, ProviderV2):
         q_media_mapping, exists = song.cache_get("q_media_mapping")
         if exists is True:
             return q_media_mapping
-        quality_suffix = self._model_cache_get_or_fetch(song, "quality_suffix")
-        mid = self._model_cache_get_or_fetch(song, "mid")
-        media_id = self._model_cache_get_or_fetch(song, "media_id")
+        # 根据过去经验，这个东西一段时间之后会过期。
+        # 具体多久，不是很清楚。
+        quality_suffix = self._model_cache_get_or_fetch(song, "quality_suffix", ttl=3600)
+        mid = self._model_cache_get_or_fetch(song, "mid", ttl=3600)
+        media_id = self._model_cache_get_or_fetch(song, "media_id", ttl=3600)
         q_media_mapping = {}
         # 注：self.quality_suffix 这里可能会触发一次网络请求
         for idx, (q, t, b, s) in enumerate(quality_suffix):

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):
@@ -53,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-1.0.8.dist-info → fuo_qqmusic-1.0.10.dist-info}/METADATA

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

fuo_qqmusic-1.0.10.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=d0AGT90M5bBmNljwrnZ1ejx1wf4Kz8fI1OW8KKAm6dg,20428
+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.10.dist-info/METADATA,sha256=T8gyBnx30aGc3sJPWu0E3iUONg6sMfarovrQjMtAAhE,812
+fuo_qqmusic-1.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fuo_qqmusic-1.0.10.dist-info/entry_points.txt,sha256=XUL7UwcsLZEuEbBJIcsFemC3BiYb7dSTiXB9r6SJ5zY,39
+fuo_qqmusic-1.0.10.dist-info/top_level.txt,sha256=Qn_g3dRwtoVZgVPZ9uRehspXi62T-E1x9_kLIdYFic4,12
+fuo_qqmusic-1.0.10.dist-info/RECORD,,

fuo_qqmusic-1.0.8.dist-info/RECORD

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