Merge remote-tracking branch 'origin/main' into main

package.json

@@ -821,5 +821,27 @@
       "v1.3": "调整插件开启状态判断条件",
       "v1.2": "增强API安全性"
     }
+  },
+  "WeatherWidget": {
+    "name": "天气",
+    "description": "定时推送天气，并在仪表盘中显示实时天气。",
+    "labels": "工具,仪表板",
+    "version": "1.8.1",
+    "icon": "https://raw.githubusercontent.com/InfinityPacer/MoviePilot-Plugins/main/icons/weatherwidget.png",
+    "author": "InfinityPacer",
+    "level": 1,
+    "v2": true,
+    "history": {
+      "v1.8.1": "修复消息推送（I神摆烂了）",
+      "v1.8": "增加自动高度及组件规格，部分显示效果需要主程序升级1.9.3+版本及后续优化",
+      "v1.7": "天气时间以及空气质量调整为原生渲染，优化显示效果",
+      "v1.6": "增加天气定时推送以及对应的Bot指令",
+      "v1.5": "优化了天气显示效果，可以根据日出和日落时间自动切换不同的主题背景，并可根据设备选择不同的适配模式",
+      "v1.4": "优化不同天气下的背景显示效果",
+      "v1.3": "优化无边框显示效果，支持切换显示边框，进一步优化性能",
+      "v1.2": "精准匹配城市，并支持无边框显示，需要主程序升级v1.8.8+版本",
+      "v1.1": "性能优化以及天气图片显示优化",
+      "v1.0": "增加天气插件，支持在仪表盘中显示实时天气小部件"
+    }
   }
 }

package.v2.json

@@ -349,11 +349,12 @@
     "name": "订阅规则自动填充",
     "description": "电视剧下载后自动添加官组等信息到订阅；添加订阅后根据二级分类名称自定义订阅规则。",
     "labels": "订阅",
-    "version": "2.8.6",
+    "version": "2.8.7",
     "icon": "teamwork.png",
     "author": "thsrite",
     "level": 2,
     "history": {
+      "v2.8.7": "修复下载填充",
       "v2.8.6": "修复订阅填充",
       "v2.8.4": "修复订阅分辨率",
       "v2.8.3": "规则填充忽略大小写",

plugins.v2/cd2assistant/__init__.py

@@ -5,14 +5,9 @@ from typing import Any, List, Dict, Tuple, Optional
 import pytz
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.cron import CronTrigger
-try:
-    from clouddrive import CloudDriveClient, Client
-    from clouddrive.proto import CloudDrive_pb2
-except ImportError:
-    from sys import executable
-    from subprocess import run
 
-    run([executable, "-m", "pip", "install", "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/refs/heads/main/data/clouddrive-0.0.12.7.1.tar.gz"], check=True)
+from clouddrive import CloudDriveClient, Client
+from clouddrive.proto import CloudDrive_pb2
 
 from app import schemas
 from app.core.config import settings
@@ -22,7 +17,6 @@ from app.plugins import _PluginBase
 from app.schemas import NotificationType
 from app.schemas.types import EventType
 
-
 class Cd2Assistant(_PluginBase):
     # 插件名称
     plugin_name = "CloudDrive2助手"

plugins.v2/cd2assistant/requirements.txt

@@ -0,0 +1,17 @@
+https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/refs/heads/main/data/clouddrive-0.0.12.7.1.tar.gz
+glob_pattern
+grpcio
+grpcio-tools
+grpclib
+grpclib[protobuf]
+http_response
+path_ignore_pattern
+protobuf
+python-argtools
+python-dateutil
+python-download>=0.0.3
+python-filewrap>=0.1.1
+python-httpfile>=0.0.2
+python-http_request>=0.0.6
+python-urlopen
+yarl

plugins.v2/subscribegroup/__init__.py

@@ -20,7 +20,7 @@ class SubscribeGroup(_PluginBase):
     # 插件图标
     plugin_icon = "teamwork.png"
     # 插件版本
-    plugin_version = "2.8.6"
+    plugin_version = "2.8.7"
     # 插件作者
     plugin_author = "thsrite"
     # 作者主页
@@ -329,7 +329,7 @@ class SubscribeGroup(_PluginBase):
                         update_dict['include'] = resource_team
                 # 站点
                 if "站点" in self._update_details and (
-                        not subscribe.sites or (subscribe.sites and len(json.loads(subscribe.sites)) == 0)):
+                        not subscribe.sites or (subscribe.sites and len(subscribe.sites) == 0)):
                     # 站点 判断是否在订阅站点范围内
                     rss_sites = self.systemconfig.get(SystemConfigKey.RssSites) or []
                     if _torrent and _torrent.site and int(_torrent.site) in rss_sites:

plugins/cloudflarespeedtest/__init__.py

@@ -62,7 +62,7 @@ class CloudflareSpeedTest(_PluginBase):
     _cf_ipv6 = None
     _result_file = None
     _release_prefix = 'https://github.com/XIU2/CloudflareSpeedTest/releases/download'
-    _binary_name = 'CloudflareST'
+    _binary_name = 'cfst'
 
     def init_plugin(self, config: dict = None):
         # 停止现有任务
@@ -370,7 +370,7 @@ class CloudflareSpeedTest(_PluginBase):
                 if SystemUtils.is_windows():
                     self.__get_windows_cloudflarest(download_url, proxies)
                 else:
-                    os.system(f'wget -P {self._cf_path} https://ghproxy.com/{download_url}')
+                    os.system(f'wget -P {self._cf_path} https://ghfast.top/{download_url}')
 
         # 判断是否下载好安装包
         if Path(f'{self._cf_path}/{cf_file_name}').exists():
@@ -832,4 +832,4 @@ class CloudflareSpeedTest(_PluginBase):
                     self._scheduler.shutdown()
                 self._scheduler = None
         except Exception as e:
-            logger.error("退出插件失败：%s" % str(e))
+            logger.error("退出插件失败：%s" % str(e))