diff --git a/package.v2.json b/package.v2.json index e91cd99..3316fa6 100644 --- a/package.v2.json +++ b/package.v2.json @@ -328,11 +328,12 @@ "name": "订阅规则自动填充", "description": "电视剧下载后自动添加官组等信息到订阅;添加订阅后根据二级分类名称自定义订阅规则。", "labels": "订阅", - "version": "2.8.4", + "version": "2.8.5", "icon": "teamwork.png", "author": "thsrite", "level": 2, "history": { + "v2.8.5": "修复订阅填充", "v2.8.4": "修复订阅分辨率", "v2.8.3": "规则填充忽略大小写", "v2.8.2": "订阅填充规则支持优先级规则组", diff --git a/plugins.v2/subscribegroup/__init__.py b/plugins.v2/subscribegroup/__init__.py index 8f87d57..c0becdf 100644 --- a/plugins.v2/subscribegroup/__init__.py +++ b/plugins.v2/subscribegroup/__init__.py @@ -9,7 +9,7 @@ from app.db.site_oper import SiteOper from app.db.subscribe_oper import SubscribeOper from app.log import logger from app.plugins import _PluginBase -from app.schemas.types import EventType, SystemConfigKey +from app.schemas.types import EventType, SystemConfigKey, MediaType class SubscribeGroup(_PluginBase): @@ -20,7 +20,7 @@ class SubscribeGroup(_PluginBase): # 插件图标 plugin_icon = "teamwork.png" # 插件版本 - plugin_version = "2.8.4" + plugin_version = "2.8.5" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -164,8 +164,13 @@ class SubscribeGroup(_PluginBase): sid = event_data.get("subscribe_id") category = event_data.get("mediainfo").get("category") if not category: - logger.error(f"订阅ID:{sid} 未获取到二级分类") - return + media_info = self.chain.recognize_media(mtype=MediaType(event_data.get("mediainfo").get("type")), + tmdbid=event_data.get("mediainfo").get("tmdb_id")) + if media_info and media_info.get("category"): + category = media_info.get("category") + else: + logger.error(f"订阅ID:{sid} 未获取到二级分类") + return if category not in self._subscribe_confs.keys(): logger.error(f"订阅ID:{sid} 二级分类:{category} 未配置自定义规则")