Merge pull request #544 from wikrin/main

package.json

@@ -890,16 +890,15 @@
     "name": "Bangumi收藏订阅",
     "description": "Bangumi用户收藏添加到订阅",
     "labels": "订阅",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "icon": "bangumi_b.png",
     "author": "Attente",
     "level": 1,
     "v2": true,
     "history": {
+     "v1.5.2": "修复定时任务未正确注册的问题",
       "v1.5.1": "修复季度信息未传递的问题. 新增站点列表同步删除",
-      "v1.5": "修复总集数会同步TMDB变动的问题,增加开关选项",
-      "v1.4": "结构优化",
-      "v1.3.1": "修复因修改季号导致未下载剧集而完成订阅的问题"
+      "v1.5": "修复总集数会同步TMDB变动的问题,增加开关选项"
     }
   }
 }

plugins/bangumicoll/__init__.py

@@ -36,7 +36,7 @@ class BangumiColl(_PluginBase):
     # 插件图标
     plugin_icon = "bangumi_b.png"
     # 插件版本
-    plugin_version = "1.5.1"
+    plugin_version = "1.5.2"
     # 插件作者
     plugin_author = "Attente"
     # 作者主页
@@ -49,7 +49,7 @@ class BangumiColl(_PluginBase):
     auth_level = 1
 
     # 私有属性
-    _scheduler: Optional[BackgroundScheduler] = None
+    _scheduler = None
     siteoper: SiteOper = None
     subscribehelper: SubscribeHelper = None
     subscribeoper: SubscribeOper = None
@@ -148,8 +148,10 @@ class BangumiColl(_PluginBase):
         return form(sites_options)
 
     def get_service(self) -> List[Dict[str, Any]]:
-        """注册插件公共服务"""
-        if self._enabled:
+        """
+        注册插件公共服务
+        """
+        if self._enabled or self._cron:
             trigger = CronTrigger.from_crontab(self._cron) if self._cron else "interval"
             kwargs = {"hours": 6} if not self._cron else {}
             return [
@@ -207,8 +209,6 @@ class BangumiColl(_PluginBase):
 
             # 新增和移除条目
             self.manage_subscriptions(items)
-
-            logger.info("Bangumi收藏订阅执行完成")
         except Exception as e:
             logger.error(f"执行失败: {str(e)}")
 
@@ -249,10 +249,12 @@ class BangumiColl(_PluginBase):
             del_items = {db_sub[i]: i for i in del_sub}
             logger.info("开始移除订阅...")
             self.delete_subscribe(del_items)
+            logger.info("移除完成")
 
         if new_sub:
             logger.info("开始添加订阅...")
             msg = self.add_subscribe({i: items[i] for i in new_sub})
+            logger.info("添加完成")
             if msg:
                 logger.info("\n".ljust(49, ' ').join(list(msg.values())))