diff --git a/README.md b/README.md index d44317a..bef9948 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.0 +- 订阅制作组填充 1.1 diff --git a/package.json b/package.json index c9f8bcd..ba6de20 100644 --- a/package.json +++ b/package.json @@ -321,11 +321,12 @@ "SubscribeGroup": { "name": "订阅制作组填充", "description": "订阅首次下载自动添加官组和站点到订阅信息,以保证订阅资源的统一性。", - "version": "1.0", + "version": "1.1", "icon": "teamwork.png", "author": "thsrite", "level": 2, "history": { + "v1.1": "fix bug", "v1.0": "init" } } diff --git a/plugins/subscribegroup/__init__.py b/plugins/subscribegroup/__init__.py index 7f6ef83..66ff86a 100644 --- a/plugins/subscribegroup/__init__.py +++ b/plugins/subscribegroup/__init__.py @@ -1,3 +1,5 @@ +import json + from app.db.downloadhistory_oper import DownloadHistoryOper from app.db.subscribe_oper import SubscribeOper from app.plugins import _PluginBase @@ -15,7 +17,7 @@ class SubscribeGroup(_PluginBase): # 插件图标 plugin_icon = "teamwork.png" # 插件版本 - plugin_version = "1.0" + plugin_version = "1.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -99,10 +101,10 @@ class SubscribeGroup(_PluginBase): return for subscribe in subscribes: if subscribe.type != '电视剧': - logger.warning(f"订阅记录:{subscribe.title} 不是电视剧,不进行官组填充") + logger.warning(f"订阅记录:{subscribe.name} 不是电视剧,不进行官组填充") return if subscribe.include or subscribe.sites: - logger.warning(f"订阅记录:{subscribe.title} 已有官组或站点信息,不进行官组填充") + logger.warning(f"订阅记录:{subscribe.name} 已有官组或站点信息,不进行官组填充") return # 开始填充官组和站点 @@ -111,25 +113,25 @@ class SubscribeGroup(_PluginBase): _meta = context.meta_info # 官组 + resource_team = None if _meta: resource_team = _meta.resource_team - if resource_team: - subscribe.include = resource_team # 站点 + sites = None if _torrent: site_id = _torrent.site if site_id: - subscribe.sites = [site_id] + sites = json.dumps([site_id]) # 更新订阅记录 - if subscribe.include or subscribe.sites: + if resource_team or sites: self._subscribeoper.update(subscribe.id, { - 'include': subscribe.include, - 'sites': subscribe.sites + 'include': resource_team, + 'sites': sites }) logger.info( - f"订阅记录:{subscribe.title} 填充官组 {subscribe.include} 和站点 {subscribe.sites} 成功") + f"订阅记录:{subscribe.name} 填充官组 {resource_team} 和站点 {sites} 成功") def get_state(self) -> bool: return self._enabled