From 8321b1575f9941e19d44b37c77225a3470283ecd Mon Sep 17 00:00:00 2001 From: Halali Date: Sat, 23 Feb 2019 21:41:42 +0100 Subject: [PATCH] Another fix for #317 --- bazarr/main.py | 8 ++++---- bazarr/scheduler.py | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bazarr/main.py b/bazarr/main.py index 34137800d..f022083e3 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -877,8 +877,8 @@ def scan_disk_movie(no): def search_missing_subtitles(no): authorize() ref = request.environ['HTTP_REFERER'] - - scheduler.add_job(series_download_subtitles, args=[no], next_run_time=datetime.now()) + + add_job(series_download_subtitles, args=[no], name=('search_missing_subtitles_' + str(no))) redirect(ref) @@ -889,7 +889,7 @@ def search_missing_subtitles_movie(no): authorize() ref = request.environ['HTTP_REFERER'] - scheduler.add_job(movies_download_subtitles, args=[no], next_run_time=datetime.now()) + add_job(movies_download_subtitles, args=[no], name=('movies_download_subtitles_' + str(no))) redirect(ref) @@ -1066,7 +1066,7 @@ def wanted_search_missing_subtitles_list(): authorize() ref = request.environ['HTTP_REFERER'] - scheduler.add_job(wanted_search_missing_subtitles, next_run_time=datetime.now()) + add_job(wanted_search_missing_subtitles, name='manual_wanted_search_missing_subtitles') redirect(ref) diff --git a/bazarr/scheduler.py b/bazarr/scheduler.py index 53f09d371..e3843b1a5 100644 --- a/bazarr/scheduler.py +++ b/bazarr/scheduler.py @@ -14,6 +14,7 @@ else: from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.triggers.interval import IntervalTrigger from apscheduler.triggers.cron import CronTrigger +from apscheduler.triggers.date import DateTrigger from datetime import datetime import pytz from tzlocal import get_localzone @@ -98,5 +99,11 @@ radarr_full_update() scheduler.start() +def add_job(job, name=None, max_instances=1, coalesce=True, args=None): + + scheduler.add_job(job, DateTrigger(run_date=datetime.now()), name=name, id=name, max_instances=max_instances, + coalesce=coalesce, args=args) + + def shutdown_scheduler(): scheduler.shutdown(wait=True)