From d0ca6db2f7315944b1adcdff3f1a50d4e7173d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Tue, 7 Nov 2017 00:11:42 -0500 Subject: [PATCH] Functionnal update --- bazarr.py | 2 +- check_update.py | 10 ++++++---- requirements.txt | 1 - scheduler.py | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bazarr.py b/bazarr.py index d7b374da7..b31e6cd35 100644 --- a/bazarr.py +++ b/bazarr.py @@ -19,7 +19,7 @@ from fdsend import send_file import urllib from init_db import * -#from check_update import * +from check_update import * from get_languages import * from get_providers import * diff --git a/check_update.py b/check_update.py index 671ade4eb..32615be07 100644 --- a/check_update.py +++ b/check_update.py @@ -2,8 +2,10 @@ from get_general_settings import * import os import subprocess -result = subprocess.check_output(["git", "pull", '--dry-run', 'origin', branch], stderr=subprocess.STDOUT).split('\n') -if len(result) > 2: - subprocess.check_output(["git", "pull", 'origin', branch]) - os.execlp('python', os.path.join(os.path.dirname(__file__), 'bazarr.py')) +def check_and_apply_update: + result = subprocess.check_output(["git", "pull", '--dry-run', 'origin', branch], stderr=subprocess.STDOUT).split('\n') + + if result[2] is not '': + subprocess.check_output(["git", "pull", 'origin', branch]) + os.execlp('python', 'python ' + os.path.join(os.path.dirname(__file__), 'bazarr.py')) diff --git a/requirements.txt b/requirements.txt index dc15cd1e0..ac2749d18 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ bottle bottle-fdsend dogpile.cache enzyme -gitpython Pillow py-pretty pycountry diff --git a/scheduler.py b/scheduler.py index 1b806c590..82e93bbb5 100644 --- a/scheduler.py +++ b/scheduler.py @@ -5,6 +5,7 @@ from get_subtitle import * from apscheduler.schedulers.background import BackgroundScheduler scheduler = BackgroundScheduler() +scheduler.add_job(update_bazarr, 'interval', hours=6, max_instances=1, coalesce=True, id='update_bazarr', name='Update bazarr from source on Github') scheduler.add_job(update_series, 'interval', minutes=1, max_instances=1, coalesce=True, id='update_series', name='Update series list from Sonarr') scheduler.add_job(add_new_episodes, 'interval', minutes=1, max_instances=1, coalesce=True, id='add_new_episodes', name='Add new episodes from Sonarr') scheduler.add_job(wanted_search_missing_subtitles, 'interval', minutes=15, max_instances=1, coalesce=True, id='wanted_search_missing_subtitles', name='Search for wanted subtitles')