From 082126bdef2b9406038a93f9264eb8490be10072 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Wed, 24 Apr 2024 11:55:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=A7=8D=E5=AD=90=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=A1=AB=E5=85=85=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8D=A0=E4=BD=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          | 2 +-
 package.json                       | 5 +++--
 plugins/subscribegroup/__init__.py | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 64a98aa..928f40e 100644
--- a/README.md
+++ b/README.md
@@ -33,5 +33,5 @@ MoviePilot三方插件市场：https://github.com/thsrite/MoviePilot-Plugins/
 - docker自定义任务 1.2
 - 插件彻底卸载 1.0
 - 实时软连接 1.3
-- 订阅规则自动填充 1.8
+- 订阅规则自动填充 2.0
 
diff --git a/package.json b/package.json
index 0ea0963..16ecf74 100644
--- a/package.json
+++ b/package.json
@@ -322,12 +322,13 @@
       "SubscribeGroup": {
         "name": "订阅规则自动填充",
         "description": "电视剧下载后自动添加官组等信息到订阅；添加订阅后根据二级分类名称自定义订阅规则。",
-        "version": "1.8",
+        "version": "2.0",
         "icon": "teamwork.png",
         "author": "thsrite",
         "level": 2,
         "history": {
-          "v1.8": "支持自定义占位符、修复种子下载不填充bug",
+          "v2.0": "种子下载自定义填充支持自定义占位符",
+          "v1.8": "修复种子下载不填充bug",
           "v1.7": "操作历史Unicode编码转中文",
           "v1.6": "支持一行配置多个二级分类名称",
           "v1.5": "支持操作历史",
diff --git a/plugins/subscribegroup/__init__.py b/plugins/subscribegroup/__init__.py
index 6789e05..a0f5e69 100644
--- a/plugins/subscribegroup/__init__.py
+++ b/plugins/subscribegroup/__init__.py
@@ -20,7 +20,7 @@ class SubscribeGroup(_PluginBase):
     # 插件图标
     plugin_icon = "teamwork.png"
     # 插件版本
-    plugin_version = "1.8"
+    plugin_version = "2.0"
     # 插件作者
     plugin_author = "thsrite"
     # 作者主页
@@ -310,7 +310,7 @@ class SubscribeGroup(_PluginBase):
                 history.append({
                     'name': subscribe.name,
                     'type': '种子下载自定义配置',
-                    'content': f'官组 {resource_team} 站点 {sites} 分辨率 {resource_pix} 质量 {resource_type} 特效 {resource_effect}',
+                    'content': f'包含关键词 {resource_team} 站点 {sites} 分辨率 {resource_pix} 质量 {resource_type} 特效 {resource_effect}',
                     "time": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))
                 })
                 # 保存历史
@@ -651,7 +651,7 @@ class SubscribeGroup(_PluginBase):
                     },
                     {
                         'component': 'td',
-                        'text': history.get("content").encode('utf-8').decode('unicode-escape')
+                        'text': history.get("content").encode('utf-8').decode() if history.get("content") else ''
                     }
                 ]
             } for history in historys