diff --git a/README.md b/README.md index 68628e3..156da8e 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.5 +- 订阅规则自动填充 1.6 diff --git a/package.json b/package.json index c26843b..6ab8e16 100644 --- a/package.json +++ b/package.json @@ -322,11 +322,12 @@ "SubscribeGroup": { "name": "订阅规则自动填充", "description": "电视剧下载后自动添加官组等信息到订阅;添加订阅后根据二级分类名称自定义订阅规则。", - "version": "1.5", + "version": "1.6", "icon": "teamwork.png", "author": "thsrite", "level": 2, "history": { + "v1.6": "支持一行配置多个二级分类名称", "v1.5": "支持操作历史", "v1.4": "支持根据二级分类名称自定义订阅规则", "v1.3": "增加质量、分辨率、特效信息填充", diff --git a/plugins/subscribegroup/__init__.py b/plugins/subscribegroup/__init__.py index f1161f3..f82f070 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.5" + plugin_version = "1.6" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -87,14 +87,15 @@ class SubscribeGroup(_PluginBase): sites.append(active_site.id) break if category: - self._subscribe_confs[category] = { - 'resolution': resolution, - 'quality': quality, - 'effect': effect, - 'include': include, - 'exclude': exclude, - 'sites': sites - } + for c in str(category).split(","): + self._subscribe_confs[c] = { + 'resolution': resolution, + 'quality': quality, + 'effect': effect, + 'include': include, + 'exclude': exclude, + 'sites': sites + } logger.info(f"获取到二级分类自定义配置 {len(self._subscribe_confs.keys())} 个") else: self._subscribe_confs = {} @@ -471,7 +472,7 @@ class SubscribeGroup(_PluginBase): 'label': '二级分类自定义填充', 'rows': 3, 'placeholder': 'category:日番#include:.*(CR.*简繁|简繁英).RLWeb|ADWeb.#sites:观众,红叶PT\n' - 'category:港台剧#include:国粤' + 'category:港台剧,日韩剧#include:国粤' } } ] @@ -536,7 +537,7 @@ class SubscribeGroup(_PluginBase): 'props': { 'type': 'info', 'variant': 'tonal', - 'text': 'category:二级分类名称,resolution:分辨率,quality:质量,effect:特效,include:包含关键词,' + 'text': 'category:二级分类名称(多个分类名称逗号拼接),resolution:分辨率,quality:质量,effect:特效,include:包含关键词,' 'exclude:排除关键词,sites:站点名称(多个站点用逗号拼接)。' 'category必填,多组属性用#分割。例如category:动漫#resolution:1080p' '(添加的动漫订阅,指定分辨率为1080p)。'