open-source-mirrors
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into development

Browse Source
pull/292/head
Halali 6 years ago
parent 6a53ee784a 2006f7be31
commit 94b967282d
3 changed files with 436 additions and 59 deletions
Show Stats Download Patch File Download Diff File

5
bazarr/main.py
Unescape View File

@ -1295,7 +1295,10 @@ def save_settings():
# reschedule full update task according to settings # reschedule full update task according to settings
sonarr_full_update() sonarr_full_update()
redirect(ref) if ref.find('saved=true') > 0:
redirect(ref)
else:
redirect(ref + "?saved=true")
@route(base_url + 'check_update') @route(base_url + 'check_update')

256
views/settings.tpl
Unescape View File

@ -40,7 +40,7 @@
</head> </head>
<body> <body>
<div id='loader' class="ui page dimmer"> <div id='loader' class="ui page dimmer">
<div id="loader_text" class="ui indeterminate text loader">Loading...</div> <div id="loader_text" class="ui indeterminate text loader">Saving settings...</div>
</div> </div>
% include('menu.tpl') % include('menu.tpl')
@ -1083,86 +1083,196 @@
<div class="ui grid"> <div class="ui grid">
<div class="middle aligned row"> <div class="middle aligned row">
<div class="right aligned four wide column"> <div class="right aligned four wide column">
<label>Enabled providers</label> <label>Addic7ed</label>
</div> </div>
<div class="eleven wide column"> <div class="one wide column">
<div class='field'> <div id="addic7ed" class="ui toggle checkbox provider">
<select name="settings_subliminal_providers" id="settings_providers" multiple="" class="ui fluid search selection dropdown"> <input type="checkbox">
<option value="">Providers</option> <label></label>
%enabled_providers = []
%providers = settings.general.enabled_providers.lower().split(',')
%for provider in settings_providers:
<option value="{{provider}}">{{provider}}</option>
%end
%for provider in providers:
%enabled_providers.append(str(provider))
%end
</select>
</div> </div>
</div> </div>
</div> </div>
</div> <div id="addic7ed_option" class="ui grid container">
</div> <div class="middle aligned row">
<div class="ui dividing header">Providers authentication (optional)</div> <div class="right aligned six wide column">
<div class="twelve wide column"> <label>Username</label>
<div class="ui grid"> </div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_addic7ed_username" type="text" value="{{settings.addic7ed.username if settings.addic7ed.username != None else ''}}">
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Password</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_addic7ed_password" type="password" value="{{settings.addic7ed.password if settings.addic7ed.password != None else ''}}">
</div>
</div>
</div>
</div>
<div class="middle aligned row"> <div class="middle aligned row">
<div class="right aligned four wide column"> <div class="right aligned four wide column">
<label>LegendasTV</label>
</div>
<div class="one wide column">
<div id="legendastv" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="legendastv_option" class="ui grid container">
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Username</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_legendastv_username" type="text" value="{{settings.legendastv.username if settings.legendastv.username != None else ''}}">
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Password</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_legendastv_password" type="password" value="{{settings.legendastv.password if settings.legendastv.password != None else ''}}">
</div>
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>OpenSubtitles</label>
</div> </div>
<div class="five wide column"> <div class="one wide column">
<div class="ui fluid input"> <div id="opensubtitles" class="ui toggle checkbox provider">
<h4 class="ui header">Username</h4> <input type="checkbox">
<label></label>
</div> </div>
</div> </div>
<div class="five wide column"> </div>
<div class="ui fluid input"> <div id="opensubtitles_option" class="ui grid container">
<h4 class="ui header">Password (stored in clear text)</h4> <div class="middle aligned row">
<div class="right aligned six wide column">
<label>Username</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_opensubtitles_username" type="text" value="{{settings.opensubtitles.username if settings.opensubtitles.username != None else ''}}">
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Password</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_opensubtitles_password" type="password" value="{{settings.opensubtitles.password if settings.opensubtitles.password != None else ''}}">
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="middle aligned row"> <div class="middle aligned row">
<div class="right aligned four wide column"> <div class="right aligned four wide column">
<label>addic7ed</label> <label>Podnapisi</label>
</div> </div>
<div class="five wide column"> <div class="one wide column">
<div class="ui fluid input"> <div id="podnapisi" class="ui toggle checkbox provider">
<input name="settings_addic7ed_username" type="text" value="{{settings.addic7ed.username if settings.addic7ed.username != None else ''}}"> <input type="checkbox">
<label></label>
</div> </div>
</div> </div>
<div class="five wide column"> </div>
<div class="ui fluid input"> <div id="podnapisi_option" class="ui grid container">
<input name="settings_addic7ed_password" type="password" value="{{settings.addic7ed.password if settings.addic7ed.password != None else ''}}">
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>Shooter</label>
</div>
<div class="one wide column">
<div id="shooter" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div> </div>
</div> </div>
</div> </div>
<div id="shooter_option" class="ui grid container">
</div>
<div class="middle aligned row"> <div class="middle aligned row">
<div class="right aligned four wide column"> <div class="right aligned four wide column">
<label>legendastv</label> <label>Subscenter</label>
</div> </div>
<div class="five wide column"> <div class="one wide column">
<div class="ui fluid input"> <div id="subscenter" class="ui toggle checkbox provider">
<input name="settings_legendastv_username" type="text" value="{{settings.legendastv.username if settings.legendastv.username != None else ''}}"> <input type="checkbox">
<label></label>
</div> </div>
</div> </div>
<div class="five wide column"> </div>
<div class="ui fluid input"> <div id="subcenter_option" class="ui grid container">
<input name="settings_legendastv_password" type="password" value="{{settings.legendastv.password if settings.legendastv.password != None else ''}}">
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>TheSubDB</label>
</div>
<div class="one wide column">
<div id="thesubdb" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div> </div>
</div> </div>
</div> </div>
<div id="thesubdb_option" class="ui grid container">
</div>
<div class="middle aligned row"> <div class="middle aligned row">
<div class="right aligned four wide column"> <div class="right aligned four wide column">
<label>opensubtitles</label> <label>TVSubtitles</label>
</div> </div>
<div class="five wide column"> <div class="one wide column">
<div class="ui fluid input"> <div id="tvsubtitles" class="ui toggle checkbox provider">
<input name="settings_opensubtitles_username" type="text" value="{{settings.opensubtitles.username if settings.opensubtitles.username != None else ''}}"> <input type="checkbox">
<label></label>
</div> </div>
</div> </div>
<div class="five wide column"> </div>
<div class="ui fluid input"> <div id="tvsubtitles_option" class="ui grid container">
<input name="settings_opensubtitles_password" type="password" value="{{settings.opensubtitles.password if settings.opensubtitles.password != None else ''}}">
</div>
<div class="middle aligned row">
<div class="eleven wide column">
<div class='field' hidden>
<select name="settings_subliminal_providers" id="settings_providers" multiple="" class="ui fluid search selection dropdown">
<option value="">Providers</option>
%enabled_providers = []
%providers = settings.general.enabled_providers.lower().split(',')
%for provider in settings_providers:
<option value="{{provider}}">{{provider}}</option>
%end
%for provider in providers:
%enabled_providers.append(str(provider))
%end
</select>
</div> </div>
</div> </div>
</div> </div>
@ -1369,6 +1479,33 @@
<script> <script>
function getQueryVariable(variable)
{
var query = window.location.search.substring(1);
var vars = query.split("&");
for (var i=0;i<vars.length;i++) {
var pair = vars[i].split("=");
if(pair[0] == variable){return pair[1];}
}
return(false);
}
if (getQueryVariable("saved") == 'true') {
new Noty({
text: 'Settings saved.',
timeout: 5000,
progressBar: false,
animation: {
open: null,
close: null
},
killer: true,
type: 'info',
layout: 'bottomRight',
theme: 'semanticui'
}).show();
}
$('.test_notification').on('click', function() { $('.test_notification').on('click', function() {
const url_field = $(this).prev().val(); const url_field = $(this).prev().val();
const url_protocol = url_field.split(':')[0]; const url_protocol = url_field.split(':')[0];
@ -1887,12 +2024,29 @@
$('#settings_providers').dropdown('setting', 'onChange', function(){ $('#settings_providers').dropdown('setting', 'onChange', function(){
$('.form').form('validate field', 'settings_subliminal_providers'); $('.form').form('validate field', 'settings_subliminal_providers');
}); });
$('#settings_languages').dropdown('setting', 'onChange', function(){
$('.form').form('validate field', 'settings_subliminal_languages'); $("#settings_providers > option").each(function() {
$('#'+$(this).val()+'_option').hide();
});
$("#settings_providers > option:selected").each(function() {
$('[id='+this.value+']').checkbox('check');
$('#'+$(this).val()+'_option').show();
}); });
$('.submit').on('click', function() { $('.provider').checkbox({
alert('Settings saved.'); onChecked: function() {
$('#settings_providers').dropdown('set selected', $(this).parent().attr('id'));
$('#'+$(this).parent().attr('id')+'_option').show();
},
onUnchecked: function() {
$('#settings_providers').dropdown('remove selected', $(this).parent().attr('id'));
$('#'+$(this).parent().attr('id')+'_option').hide();
}
});
$('#settings_languages').dropdown('setting', 'onChange', function(){
$('.form').form('validate field', 'settings_subliminal_languages');
}); });
$(function() { $(function() {

234
views/wizard.tpl
Unescape View File

@ -48,7 +48,7 @@
</head> </head>
<body> <body>
<div id='loader' class="ui page dimmer"> <div id='loader' class="ui page dimmer">
<div class="ui indeterminate text loader">Loading...</div> <div class="ui indeterminate text loader">Saving settings...</div>
</div> </div>
<div class="ui modal" id="browsemodal"> <div class="ui modal" id="browsemodal">
@ -340,18 +340,194 @@
<div class="ui grid"> <div class="ui grid">
<div class="middle aligned row"> <div class="middle aligned row">
<div class="right aligned four wide column"> <div class="right aligned four wide column">
<label>Enabled providers</label> <label>Addic7ed</label>
</div> </div>
<div class="one wide column">
<div id="addic7ed" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="addic7ed_option" class="ui grid container">
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Username</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_addic7ed_username" type="text" value="{{settings.addic7ed.username if settings.addic7ed.username != None else ''}}">
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Password</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_addic7ed_password" type="password" value="{{settings.addic7ed.password if settings.addic7ed.password != None else ''}}">
</div>
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>LegendasTV</label>
</div>
<div class="one wide column">
<div id="legendastv" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="legendastv_option" class="ui grid container">
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Username</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_legendastv_username" type="text" value="{{settings.legendastv.username if settings.legendastv.username != None else ''}}">
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Password</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_legendastv_password" type="password" value="{{settings.legendastv.password if settings.legendastv.password != None else ''}}">
</div>
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>OpenSubtitles</label>
</div>
<div class="one wide column">
<div id="opensubtitles" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="opensubtitles_option" class="ui grid container">
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Username</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_opensubtitles_username" type="text" value="{{settings.opensubtitles.username if settings.opensubtitles.username != None else ''}}">
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned six wide column">
<label>Password</label>
</div>
<div class="six wide column">
<div class="ui fluid input">
<input name="settings_opensubtitles_password" type="password" value="{{settings.opensubtitles.password if settings.opensubtitles.password != None else ''}}">
</div>
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>Podnapisi</label>
</div>
<div class="one wide column">
<div id="podnapisi" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="podnapisi_option" class="ui grid container">
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>Shooter</label>
</div>
<div class="one wide column">
<div id="shooter" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="shooter_option" class="ui grid container">
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>Subscenter</label>
</div>
<div class="one wide column">
<div id="subscenter" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="subcenter_option" class="ui grid container">
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>TheSubDB</label>
</div>
<div class="one wide column">
<div id="thesubdb" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="thesubdb_option" class="ui grid container">
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>TVSubtitles</label>
</div>
<div class="one wide column">
<div id="tvsubtitles" class="ui toggle checkbox provider">
<input type="checkbox">
<label></label>
</div>
</div>
</div>
<div id="tvsubtitles_option" class="ui grid container">
</div>
<div class="middle aligned row">
<div class="eleven wide column"> <div class="eleven wide column">
<div class='field'> <div class='field' hidden>
<select name="settings_subliminal_providers" id="settings_providers" multiple="" class="ui fluid search selection dropdown"> <select name="settings_subliminal_providers" id="settings_providers" multiple="" class="ui fluid search selection dropdown">
<option value="">Providers</option> <option value="">Providers</option>
%enabled_providers = [] %enabled_providers = []
%providers = settings.general.enabled_providers.lower().split(',')
%for provider in settings_providers: %for provider in settings_providers:
<option value="{{provider}}">{{provider}}</option> <option value="{{provider}}">{{provider}}</option>
%if provider[1] == True:
% enabled_providers.append(str(provider[0]))
%end %end
%for provider in providers:
%enabled_providers.append(str(provider))
%end %end
</select> </select>
</div> </div>
@ -829,6 +1005,33 @@
</html> </html>
<script> <script>
function getQueryVariable(variable)
{
var query = window.location.search.substring(1);
var vars = query.split("&");
for (var i=0;i<vars.length;i++) {
var pair = vars[i].split("=");
if(pair[0] == variable){return pair[1];}
}
return(false);
}
if (getQueryVariable("saved") == 'true') {
new Noty({
text: 'Settings saved.',
timeout: 5000,
progressBar: false,
animation: {
open: null,
close: null
},
killer: true,
type: 'info',
layout: 'bottomRight',
theme: 'semanticui'
}).show();
}
$(function() { $(function() {
$('.next1').on('click', function(e) { $('.next1').on('click', function(e) {
@ -1229,9 +1432,26 @@ $(function() {
}) })
; ;
$('#settings_providers').dropdown('setting', 'onChange', function(){ $("#settings_providers > option").each(function() {
$('.form').form('validate field', 'settings_subliminal_providers'); $('#'+$(this).val()+'_option').hide();
});
$("#settings_providers > option:selected").each(function() {
$('[id='+this.value+']').checkbox('check');
$('#'+$(this).val()+'_option').show();
});
$('.provider').checkbox({
onChecked: function() {
$('#settings_providers').dropdown('set selected', $(this).parent().attr('id'));
$('#'+$(this).parent().attr('id')+'_option').show();
},
onUnchecked: function() {
$('#settings_providers').dropdown('remove selected', $(this).parent().attr('id'));
$('#'+$(this).parent().attr('id')+'_option').hide();
}
}); });
$('#settings_languages').dropdown('setting', 'onChange', function(){ $('#settings_languages').dropdown('setting', 'onChange', function(){
$('.form').form('validate field', 'settings_subliminal_languages'); $('.form').form('validate field', 'settings_subliminal_languages');
}); });

Write Preview
Loading…
Cancel
Save