From ef2f91f22291d5d5b06e66516c6729c899394a04 Mon Sep 17 00:00:00 2001 From: Attente <19653207+wikrin@users.noreply.github.com> Date: Wed, 23 Oct 2024 07:08:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AB=99=E7=82=B9,=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AB=99=E7=82=B9=E5=88=97=E8=A1=A8,=20?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=86=8D=E7=95=99=E4=B8=8B=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=20fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E6=9C=AA=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E5=8F=82=E6=95=B0=E5=AF=BC=E8=87=B4=E7=9A=84=E5=AD=A3?= =?UTF-8?q?=E5=BA=A6=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- plugins/bangumicoll/__init__.py | 25 +++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 82e637b..cf47843 100644 --- a/package.json +++ b/package.json @@ -3,12 +3,13 @@ "name": "Bangumi收藏订阅", "description": "Bangumi用户收藏添加到订阅", "labels": "订阅", - "version": "1.5", + "version": "1.5.1", "icon": "https://raw.githubusercontent.com/wikrin/MoviePilot-Plugins/main/icons/bangumi_b.png", "author": "Attente", "level": 1, "v2": true, "history": { + "v1.5.1": "修复季度信息未传递的问题. 新增站点列表同步删除", "v1.5": "修复总集数会同步TMDB变动的问题,增加开关选项", "v1.4": "结构优化", "v1.3.1": "修复因修改季号导致未下载剧集而完成订阅的问题" diff --git a/plugins/bangumicoll/__init__.py b/plugins/bangumicoll/__init__.py index 192d236..e101103 100644 --- a/plugins/bangumicoll/__init__.py +++ b/plugins/bangumicoll/__init__.py @@ -14,6 +14,7 @@ from sqlalchemy.orm import Session from app.chain.subscribe import SubscribeChain, Subscribe from app.core.config import settings from app.core.context import MediaInfo +from app.core.event import eventmanager, Event from app.core.meta import MetaBase from app.core.metainfo import MetaInfo from app.db.models.subscribehistory import SubscribeHistory @@ -23,7 +24,7 @@ from app.db import db_query from app.helper.subscribe import SubscribeHelper from app.log import logger from app.plugins import _PluginBase -from app.schemas.types import NotificationType +from app.schemas.types import EventType, NotificationType from app.utils.http import RequestUtils @@ -35,7 +36,7 @@ class BangumiColl(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/wikrin/MoviePilot-Plugins/main/icons/bangumi_b.png" # 插件版本 - plugin_version = "1.5" + plugin_version = "1.5.1" # 插件作者 plugin_author = "Attente" # 作者主页 @@ -47,7 +48,7 @@ class BangumiColl(_PluginBase): # 可使用的用户级别 auth_level = 1 - # 私有变量 + # 私有属性 _scheduler: Optional[BackgroundScheduler] = None siteoper: SiteOper = None subscribehelper: SubscribeHelper = None @@ -95,6 +96,12 @@ class BangumiColl(_PluginBase): "sites", ): setattr(self, f"_{key}", config.get(key, getattr(self, f"_{key}"))) + # 获得所有站点 + site_ids = {site.id for site in self.siteoper.list_order_by_pri()} + # 过滤已删除的站点 + self._sites = [site_id for site_id in self._sites if site_id in site_ids] + # 更新配置 + self.__update_config() def schedule_once(self): """调度一次性任务""" @@ -138,7 +145,6 @@ class BangumiColl(_PluginBase): {"title": site.name, "value": site.id} for site in self.siteoper.list_order_by_pri() ] - return form(sites_options) def get_service(self) -> List[Dict[str, Any]]: @@ -167,6 +173,16 @@ class BangumiColl(_PluginBase): except Exception as e: logger.error(f"退出插件失败：{str(e)}") + @eventmanager.register(EventType.SiteDeleted) + def site_deleted(self, event: Event): + """ + 删除对应站点 + """ + site_id = event.event_data.get("site_id") + if site_id in self._sites: + self._sites.remove(site_id) + self.__update_config() + def get_api(self): pass @@ -276,6 +292,7 @@ class BangumiColl(_PluginBase): sid, msg = self.subscribechain.add( title=mediainfo.title, year=mediainfo.year, + season=mediainfo.number_of_seasons, bangumiid=self._subid, exist_ok=True, username="Bangumi订阅",