morpheus65535/bazarr
1
1
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2024-09-20 23:46:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into python3

Browse source 
# Conflicts:
#	bazarr/main.py
This commit is contained in:
Louis Vézina 2019-11-12 08:18:43 -05:00
parent f5e6408195 2602a0550d
commit 61ab911747
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bazarr/get_subtitle.py
View file

@ -181,8 +181,6 @@ def download_subtitle(path, language, hi, forced, providers, providers_auth, sce
pre_download_hook=None, # fixme
post_download_hook=None, # fixme
language_hook=None) # fixme
for provider in providers:
track_event(category=provider, action='search', label=language_from_alpha3(language[0]))
else:
downloaded_subtitles = None
logging.info("BAZARR All providers are throttled")
@ -339,8 +337,6 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
provider_configs=providers_auth,
throttle_callback=provider_throttle,
language_hook=None) # fixme
for provider in providers:
track_event(category=provider, action='search', label=language_from_alpha3(lang))
else:
subtitles = []
logging.info("BAZARR All providers are throttled")

2
bazarr/main.py
View file

@ -197,6 +197,7 @@ def shutdown():
else:
stop_file.write('')
stop_file.close()
sys.exit(0)
@route(base_url + 'restart')
@ -215,6 +216,7 @@ def restart():
logging.info('Bazarr is being restarted...')
restart_file.write('')
restart_file.close()
sys.exit(0)
@route(base_url + 'wizard')

8
views/menu.tpl
View file

@ -283,11 +283,11 @@
$('#loader_text').text("Bazarr is restarting. Please Wait...");
$.ajax({
url: "{{base_url}}restart",
async: true
async: true,
error: (function(){
setTimeout(function(){ setInterval(ping, 2000); },8000);
})
})
.done(function(){
setTimeout(function(){ setInterval(ping, 2000); },8000);
});
});
% from config import settings

12
views/system.tpl
View file

@ -419,12 +419,12 @@
$('#restart').on('click', function(){
$('#loader_text').text("Bazarr is restarting, please wait...");
$.ajax({
url: "{{base_url}}restart",
async: true
})
.done(function(){
setTimeout(function(){ setInterval(ping, 2000); },8000);
})
url: "{{base_url}}restart",
async: true,
error: (function () {
setTimeout(function () { setInterval(ping, 2000); }, 8000);
})
});
});
% from config import settings