Merge branch 'development'

pull/26/head
Louis Vézina 7 years ago
commit efa97dd6e8

@ -10,6 +10,7 @@ RUN apt-get install -y build-essential python-dev python-pip python-setuptools l
# Get application source from Github
RUN git clone -b master --single-branch https://github.com/morpheus65535/bazarr.git /bazarr
RUN git config --global user.name "Bazarr" && git config --global user.email "bazarr@fake.email"
VOLUME /bazarr/data

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
bazarr_version = '0.1.4'
from bottle import route, run, template, static_file, request, redirect

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
from get_general_settings import *
import os
@ -14,7 +11,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
for remote in repo.remotes:
if remote.name == remote_name:
remote.fetch()
remote_id = repo.lookup_reference('refs/remotes/origin/' + branch).target
remote_id = repo.lookup_reference('refs/remotes/origin/' + str(branch)).target
merge_result, _ = repo.merge_analysis(remote_id)
# Up to date, do nothing
if merge_result & pygit2.GIT_MERGE_ANALYSIS_UP_TO_DATE:

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import os
import sqlite3
import requests

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import sqlite3
import os
import ast

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import sqlite3
import pycountry
import os

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import sqlite3
import os
from subliminal import *

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import os
import sqlite3
import requests

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import sqlite3
import os
import ast

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import os
import sqlite3
import ast

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import os
import sqlite3

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import os
import enzyme
import babelfish

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
from get_general_settings import *
from get_series import *
from get_episodes import *
@ -18,7 +15,7 @@ scheduler.add_job(update_series, 'interval', minutes=1, max_instances=1, coalesc
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(update_all_episodes, 'cron', hour=4, max_instances=1, coalesce=True, id='update_all_episodes', name='Update all episodes from Sonarr')
scheduler.add_job(list_missing_subtitles, 'interval', minutes=5, max_instances=1, coalesce=True, id='list_missing_subtitles', name='Process missing subtitles for all series')
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')
scheduler.add_job(wanted_search_missing_subtitles, 'interval', hours=3, max_instances=1, coalesce=True, id='wanted_search_missing_subtitles', name='Search for wanted subtitles')
scheduler.start()
def execute_now(taskid):

@ -1,9 +0,0 @@
# coding: utf-8
from __future__ import unicode_literals
from get_general_settings import *
import git
g = git.cmd.Git(os.path.dirname(__file__))
print g.pull('--dry-run', 'origin', branch)

@ -1,6 +1,3 @@
# coding: utf-8
from __future__ import unicode_literals
import os
import sqlite3
import time

Loading…
Cancel
Save