From 843f873dfd2785d893cbbf85a96e5f027923865f Mon Sep 17 00:00:00 2001 From: thsrite Date: Mon, 6 May 2024 20:56:21 +0800 Subject: [PATCH] fix icon --- icons/popular.png | Bin 11843 -> 16544 bytes plugins/popularsubscribe/__init__.py | 71 +++++++++++++-------------- 2 files changed, 34 insertions(+), 37 deletions(-) diff --git a/icons/popular.png b/icons/popular.png index 4b3a763cfef079dd68546b445d6c64afe43163bb..cd23eefb0d98e5c3523513cc5884bd9ec3f81b4b 100644 GIT binary patch literal 16544 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

PLX=j=(& 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 literal 11843 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

  • 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 diff --git a/plugins/popularsubscribe/__init__.py b/plugins/popularsubscribe/__init__.py index 2ce3c02..0d6c8e9 100644 --- a/plugins/popularsubscribe/__init__.py +++ b/plugins/popularsubscribe/__init__.py @@ -1,10 +1,5 @@ -import time -from datetime import datetime, timedelta +from datetime import datetime -import pytz - -from app.chain.douban import DoubanChain -from app.chain.tmdb import TmdbChain from app.chain.download import DownloadChain from app.chain.subscribe import SubscribeChain from app.core.config import settings @@ -35,7 +30,7 @@ class PopularSubscribe(_PluginBase): # 插件配置项ID前缀 plugin_config_prefix = "popularsubscribe_" # 加载顺序 - plugin_order = 26 + plugin_order = 25 # 可使用的用户级别 auth_level = 2 @@ -47,7 +42,7 @@ class PopularSubscribe(_PluginBase): _tv_page_cnt: int = 30 # 流行度最低多少 _movie_popular_cnt: int = 0 - _tv_popula_cnt: int = 0 + _tv_popular_cnt: int = 0 _movie_cron: str = "" _tv_cron: str = "" @@ -68,37 +63,37 @@ class PopularSubscribe(_PluginBase): self._movie_page_cnt = config.get("movie_page_cnt") self._tv_page_cnt = config.get("tv_page_cnt") self._movie_popular_cnt = config.get("movie_popular_cnt") - self._tv_popula_cnt = config.get("tv_popula_cnt") + self._tv_popular_cnt = config.get("tv_popular_cnt") - if self._movie_enabled or self._tv_enabled: - # 定时服务 - self._scheduler = BackgroundScheduler(timezone=settings.TZ) + # 定时服务 + self._scheduler = BackgroundScheduler(timezone=settings.TZ) - if self._movie_cron: - try: - self._scheduler.add_job(func=self.__popular_subscribe, - trigger=CronTrigger.from_crontab(self._movie_cron), - name="电影热门订阅", - args=['电影', self._movie_page_cnt, self._movie_popula_cnt]) - except Exception as err: - logger.error(f"电影热门订阅定时任务配置错误:{err}") - # 推送实时消息 - self.systemmessage.put(f"电影热门订阅执行周期配置错误:{err}") + if self._movie_enabled and self._movie_cron: + try: + self._scheduler.add_job(func=self.__popular_subscribe, + trigger=CronTrigger.from_crontab(self._movie_cron), + name="电影热门订阅", + args=['电影', self._movie_page_cnt, self._movie_popular_cnt]) + except Exception as err: + logger.error(f"电影热门订阅定时任务配置错误:{err}") + # 推送实时消息 + self.systemmessage.put(f"电影热门订阅执行周期配置错误:{err}") - if self._tv_cron: - try: - self._scheduler.add_job(func=self.__popular_subscribe, - trigger=CronTrigger.from_crontab(self._tv_cron), - name="电视剧热门订阅", - args=['电视剧', self._tv_page_cnt, self._tv_popula_cnt]) - except Exception as err: - logger.error(f"电视剧热门订阅定时任务配置错误:{err}") - # 推送实时消息 - self.systemmessage.put(f"电视剧热门订阅执行周期配置错误:{err}") - # 启动任务 - if self._scheduler.get_jobs(): - self._scheduler.print_jobs() - self._scheduler.start() + if self._tv_enabled and self._tv_cron: + try: + self._scheduler.add_job(func=self.__popular_subscribe, + trigger=CronTrigger.from_crontab(self._tv_cron), + name="电视剧热门订阅", + args=['电视剧', self._tv_page_cnt, self._tv_popular_cnt]) + except Exception as err: + logger.error(f"电视剧热门订阅定时任务配置错误:{err}") + # 推送实时消息 + self.systemmessage.put(f"电视剧热门订阅执行周期配置错误:{err}") + + # 启动任务 + if self._scheduler.get_jobs(): + self._scheduler.print_jobs() + self._scheduler.start() def __popular_subscribe(self, stype, page_cnt, popular_cnt): """ @@ -113,6 +108,8 @@ class PopularSubscribe(_PluginBase): # 遍历热门订阅检查流行度是否达到要求 for sub in subscribes: + if popular_cnt and sub.get("popularity") and int(popular_cnt) > int(sub.get("popularity")): + continue media = MediaInfo() media.type = MediaType(sub.get("type")) media.title = sub.get("name") @@ -147,7 +144,7 @@ class PopularSubscribe(_PluginBase): doubanid=media.douban_id, exist_ok=True, username=settings.SUPERUSER) - logger.info(f'{media.title_year} 添加订阅') + logger.info(f'{media.title_year} 流行度 {sub.get("popularity")} 添加订阅') # 存储历史记录 history.append({