diff --git a/README.md b/README.md index 06b4a31..ee27eeb 100644 --- a/README.md +++ b/README.md @@ -33,5 +33,4 @@ MoviePilot三方插件市场:https://github.com/thsrite/MoviePilot-Plugins/ - docker自定义任务 1.2 - 插件彻底卸载 1.0 - 实时软连接 1.3 -- 订阅规则自动填充 2.3 - +- 订阅规则自动填充 2.4 diff --git a/package.json b/package.json index 5ae4689..fa103fb 100644 --- a/package.json +++ b/package.json @@ -322,11 +322,12 @@ "SubscribeGroup": { "name": "订阅规则自动填充", "description": "电视剧下载后自动添加官组等信息到订阅;添加订阅后根据二级分类名称自定义订阅规则。", - "version": "2.3", + "version": "2.4", "icon": "teamwork.png", "author": "thsrite", "level": 2, "history": { + "v2.4": "保存路径支持变量{name} (订阅名称 (年份))", "v2.3": "二级分类自定义填充支持保存路径", "v2.2": "优化", "v2.1": "站点与官组分开,修复质量无填充", diff --git a/plugins/subscribegroup/__init__.py b/plugins/subscribegroup/__init__.py index b743995..61cddfa 100644 --- a/plugins/subscribegroup/__init__.py +++ b/plugins/subscribegroup/__init__.py @@ -20,7 +20,7 @@ class SubscribeGroup(_PluginBase): # 插件图标 plugin_icon = "teamwork.png" # 插件版本 - plugin_version = "2.3" + plugin_version = "2.4" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -185,7 +185,12 @@ class SubscribeGroup(_PluginBase): if category_conf.get('effect'): update_dict['effect'] = self.__parse_effect(category_conf.get('effect')) if category_conf.get('savepath'): - update_dict['savepath'] = category_conf.get('savepath') + # 判断是否有变量{name} + if '{name}' in category_conf.get('savepath'): + savepath = category_conf.get('savepath').replace('{name}', f"{subscribe.name} ({subscribe.year})") + update_dict['savepath'] = savepath + else: + update_dict['savepath'] = category_conf.get('savepath') # 更新订阅自定义配置 self._subscribeoper.update(sid, update_dict) @@ -609,7 +614,7 @@ class SubscribeGroup(_PluginBase): 'type': 'info', 'variant': 'tonal', 'text': 'category:二级分类名称(多个分类名称逗号拼接),resolution:分辨率,quality:质量,effect:特效,include:包含关键词,' - 'exclude:排除关键词,sites:站点名称(多个站点用逗号拼接),savepath:保存路径。' + 'exclude:排除关键词,sites:站点名称(多个站点用逗号拼接),savepath:保存路径/{name}({name}为当前订阅的名称和年份)。' 'category必填,多组属性用#分割。例如category:动漫#resolution:1080p' '(添加的动漫订阅,指定分辨率为1080p)。' }