codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix plugins

Browse Source
This commit is contained in:
thsrite 2023-08-30 12:03:52 +08:00
parent 85477a4bd3
commit 1a026ffb12
2 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/plugins/autosignin/__init__.py
View File

@ -134,20 +134,37 @@ class AutoSignIn(_PluginBase):
self._start_time = int(times[0]) self._start_time = int(times[0])
# 23 # 23
self._end_time = int(times[1]) self._end_time = int(times[1])
if self._start_time and self._end_time: if self._start_time and self._end_time:
self._scheduler.add_job(func=self.sign_in,
trigger="interval",
hours=float(self._cron.strip()),
name=f"站点自动{self._action}")
logger.info(
f"站点自动{self._action}服务启动，执行周期 {self._start_time}点-{self._end_time}点 每{self._cron}小时执行一次")
else:
logger.error(f"站点自动{self._action}服务启动失败，周期格式错误")
# 推送实时消息
self.systemmessage.put(f"执行周期配置错误")
self._cron = ""
self._enabled = False
self.__update_config()
else:
# 默认0-24 按照周期运行
self._start_time = 0
self._end_time = 24
self._scheduler.add_job(func=self.sign_in, self._scheduler.add_job(func=self.sign_in,
trigger="interval", trigger="interval",
hours=float(self._cron.strip()), hours=float(self._cron.strip()),
name=f"站点自动{self._action}") name=f"站点自动{self._action}")
logger.info(f"站点自动{self._action}服务启动，执行周期 {self._cron} {self._start_time}-{self._end_time}") logger.info(
else: f"站点自动{self._action}服务启动，执行周期 {self._start_time}点-{self._end_time}点 每{self._cron}小时执行一次")
logger.error(f"站点自动{self._action}服务启动失败，周期格式错误")
# 推送实时消息
self.systemmessage.put(f"执行周期配置错误")
except Exception as err: except Exception as err:
logger.error(f"定时任务配置错误：{err}") logger.error(f"定时任务配置错误：{err}")
# 推送实时消息 # 推送实时消息
self.systemmessage.put(f"执行周期配置错误：{err}") self.systemmessage.put(f"执行周期配置错误：{err}")
self._cron = ""
self._enabled = False
self.__update_config()
else: else:
# 随机时间 # 随机时间
triggers = TimerUtils.random_scheduler(num_executions=2, triggers = TimerUtils.random_scheduler(num_executions=2,

37
app/plugins/sitestatistic/__init__.py
View File

@ -87,14 +87,31 @@ class SiteStatistic(_PluginBase):
# 加载模块 # 加载模块
self._site_schema = ModuleHelper.load('app.plugins.sitestatistic.siteuserinfo', self._site_schema = ModuleHelper.load('app.plugins.sitestatistic.siteuserinfo',
filter_func=lambda _, obj: hasattr(obj, 'schema')) filter_func=lambda _, obj: hasattr(obj, 'schema'))
# 定时服务
self._scheduler = BackgroundScheduler(timezone=settings.TZ)
self._site_schema.sort(key=lambda x: x.order) self._site_schema.sort(key=lambda x: x.order)
# 站点上一次更新时间 # 站点上一次更新时间
self._last_update_time = None self._last_update_time = None
# 站点数据 # 站点数据
self._sites_data = {} self._sites_data = {}
# 定时服务
self._scheduler = BackgroundScheduler(timezone=settings.TZ) # 立即运行一次
if self._cron: if self._onlyonce:
logger.info(f"站点数据统计服务启动，立即运行一次")
self._scheduler.add_job(self.refresh_all_site_data, 'date',
run_date=datetime.now(
tz=pytz.timezone(settings.TZ)) + timedelta(seconds=3)
)
# 关闭一次性开关
self._onlyonce = False
# 保存配置
self.__update_config()
# 周期运行
if self._enabled and self._cron:
try: try:
self._scheduler.add_job(func=self.refresh_all_site_data, self._scheduler.add_job(func=self.refresh_all_site_data,
trigger=CronTrigger.from_crontab(self._cron), trigger=CronTrigger.from_crontab(self._cron),
@ -113,17 +130,6 @@ class SiteStatistic(_PluginBase):
self._scheduler.add_job(self.refresh_all_site_data, "cron", self._scheduler.add_job(self.refresh_all_site_data, "cron",
hour=trigger.hour, minute=trigger.minute, hour=trigger.hour, minute=trigger.minute,
name="站点数据统计") name="站点数据统计")
if self._onlyonce:
logger.info(f"站点数据统计服务启动，立即运行一次")
self._scheduler.add_job(self.refresh_all_site_data, 'date',
run_date=datetime.now(
tz=pytz.timezone(settings.TZ)) + timedelta(seconds=3)
)
# 关闭一次性开关
self._onlyonce = False
# 保存配置
self.__update_config()
# 启动任务 # 启动任务
if self._scheduler.get_jobs(): if self._scheduler.get_jobs():
@ -1028,6 +1034,9 @@ class SiteStatistic(_PluginBase):
refresh_sites = [site for site in self.sites.get_indexers() if refresh_sites = [site for site in self.sites.get_indexers() if
site.get("id") in self._statistic_sites] site.get("id") in self._statistic_sites]
# 过滤掉已删除的站点
self._statistic_sites = [site.get("id") for site in refresh_sites if site]
self.__update_config()
if not refresh_sites: if not refresh_sites:
return return