From aa3a4f7ec9f54155480bb89d6096765190ac6dfe Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 19 Oct 2024 17:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9V2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.v2.json                     | 14 +++++++++++++-
 plugins.v2/rsssubscribe/__init__.py |  8 ++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/package.v2.json b/package.v2.json
index 49dc247..01e3580 100644
--- a/package.v2.json
+++ b/package.v2.json
@@ -1,5 +1,5 @@
 {
-  "SiteStatistic": {
+    "SiteStatistic": {
         "name": "站点数据统计",
         "description": "站点统计数据图表。",
         "labels": "站点,仪表板",
@@ -97,5 +97,17 @@
             "v1.7": "MoviePilot V2 版本自动转移做种插件",
             "v1.7.1": "修复兼容性问题"
         }
+    },
+    "RssSubscribe": {
+        "name": "自定义订阅",
+        "description": "定时刷新RSS报文，识别内容后添加订阅或直接下载。",
+        "labels": "订阅",
+        "version": "2.0",
+        "icon": "rss.png",
+        "author": "jxxghp",
+        "level": 2,
+        "history": {
+            "v2.0": "兼容MoviePilot V2 版本"
+        }
     }
 }
\ No newline at end of file
diff --git a/plugins.v2/rsssubscribe/__init__.py b/plugins.v2/rsssubscribe/__init__.py
index 2fdc278..4480b2d 100644
--- a/plugins.v2/rsssubscribe/__init__.py
+++ b/plugins.v2/rsssubscribe/__init__.py
@@ -33,7 +33,7 @@ class RssSubscribe(_PluginBase):
     # 插件图标
     plugin_icon = "rss.png"
     # 插件版本
-    plugin_version = "1.5"
+    plugin_version = "2.0"
     # 插件作者
     plugin_author = "jxxghp"
     # 作者主页
@@ -409,7 +409,7 @@ class RssSubscribe(_PluginBase):
                                         'component': 'VSwitch',
                                         'props': {
                                             'model': 'filter',
-                                            'label': '使用过滤规则',
+                                            'label': '使用订阅优先级规则',
                                         }
                                     }
                                 ]
@@ -628,7 +628,7 @@ class RssSubscribe(_PluginBase):
                 logger.error(f"未获取到RSS数据：{url}")
                 return
             # 过滤规则
-            filter_rule = self.systemconfig.get(SystemConfigKey.SubscribeFilterRules)
+            filter_groups = self.systemconfig.get(SystemConfigKey.SubscribeFilterRuleGroups)
             # 解析数据
             for result in results:
                 try:
@@ -680,7 +680,7 @@ class RssSubscribe(_PluginBase):
                     # 过滤种子
                     if self._filter:
                         result = self.chain.filter_torrents(
-                            rule_string=filter_rule,
+                            rule_groups=filter_groups,
                             torrent_list=[torrentinfo],
                             mediainfo=mediainfo
                         )