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

Continuing development.

Browse Source
pull/479/head
Louis Vézina 5 years ago
parent 732cc056bb
commit d974f51630
6 changed files with 105 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
bazarr/config.py
Unescape View File

@ -25,9 +25,11 @@ defaults = {
'serie_default_enabled': 'False',
'serie_default_language': '[]',
'serie_default_hi': 'False',
'serie_default_forced': 'False',
'movie_default_enabled': 'False',
'movie_default_language': '[]',
'movie_default_hi': 'False',
'movie_default_forced': 'False',
'page_size': '25',
'minimum_score_movie': '70',
'use_embedded_subs': 'True',

9
bazarr/get_movies.py
Unescape View File

@ -19,6 +19,7 @@ def update_movies():
movie_default_enabled = settings.general.getboolean('movie_default_enabled')
movie_default_language = settings.general.movie_default_language
movie_default_hi = settings.general.movie_default_hi
movie_default_forced = settings.general.movie_default_forced
if apikey_radarr is None:
pass
@ -135,7 +136,7 @@ def update_movies():
profile_id_to_language(movie['qualityProfileId']), sceneName,
unicode(bool(movie['monitored'])), movie['sortTitle'],
movie['year'], alternativeTitles, format, resolution,
videoCodec, audioCodec, imdbId))
videoCodec, audioCodec, imdbId, movie_default_forced))
else:
movies_to_add.append((movie["title"],
movie["path"] + separator + movie['movieFile'][
@ -144,7 +145,7 @@ def update_movies():
profile_id_to_language(movie['qualityProfileId']), sceneName,
unicode(bool(movie['monitored'])), movie['sortTitle'],
movie['year'], alternativeTitles, format, resolution,
videoCodec, audioCodec, imdbId))
videoCodec, audioCodec, imdbId, movie["tmdbId"]))
else:
logging.error(
'BAZARR Radarr returned a movie without a file path: ' + movie["path"] + separator +
@ -161,12 +162,12 @@ def update_movies():
if movie_default_enabled is True:
added_result = c.executemany(
'''INSERT OR IGNORE INTO table_movies(title, path, tmdbId, languages, subtitles,`hearing_impaired`, radarrId, overview, poster, fanart, `audio_language`, sceneName, monitored, sortTitle, year, alternativeTitles, format, resolution, video_codec, audio_codec, imdbId) VALUES (?,?,?,?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''',
'''INSERT OR IGNORE INTO table_movies(title, path, tmdbId, languages, subtitles,`hearing_impaired`, radarrId, overview, poster, fanart, `audio_language`, sceneName, monitored, sortTitle, year, alternativeTitles, format, resolution, video_codec, audio_codec, imdbId, forced) VALUES (?,?,?,?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''',
movies_to_add)
db.commit()
else:
added_result = c.executemany(
'''INSERT OR IGNORE INTO table_movies(title, path, tmdbId, languages, subtitles,`hearing_impaired`, radarrId, overview, poster, fanart, `audio_language`, sceneName, monitored, sortTitle, year, alternativeTitles, format, resolution, video_codec, audio_codec, imdbId) VALUES (?,?,?,(SELECT languages FROM table_movies WHERE tmdbId = ?), '[]',(SELECT `hearing_impaired` FROM table_movies WHERE tmdbId = ?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''',
'''INSERT OR IGNORE INTO table_movies(title, path, tmdbId, languages, subtitles,`hearing_impaired`, radarrId, overview, poster, fanart, `audio_language`, sceneName, monitored, sortTitle, year, alternativeTitles, format, resolution, video_codec, audio_codec, imdbId, forced) VALUES (?,?,?,(SELECT languages FROM table_movies WHERE tmdbId = ?), '[]',(SELECT `hearing_impaired` FROM table_movies WHERE tmdbId = ?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT `forced` FROM table_movies WHERE tmdbId = ?))''',
movies_to_add)
db.commit()

9
bazarr/get_series.py
Unescape View File

@ -18,6 +18,7 @@ def update_series():
serie_default_enabled = settings.general.getboolean('serie_default_enabled')
serie_default_language = settings.general.serie_default_language
serie_default_hi = settings.general.serie_default_hi
serie_default_forced = settings.general.serie_default_forced
if apikey_sonarr is None:
pass
@ -86,12 +87,12 @@ def update_series():
series_to_add.append((show["title"], show["path"], show["tvdbId"], serie_default_language,
serie_default_hi, show["id"], overview, poster, fanart,
profile_id_to_language(show['qualityProfileId']), show['sortTitle'],
show['year'], alternateTitles))
show['year'], alternateTitles, serie_default_forced))
else:
series_to_add.append((show["title"], show["path"], show["tvdbId"], show["tvdbId"],
show["tvdbId"], show["id"], overview, poster, fanart,
profile_id_to_language(show['qualityProfileId']), show['sortTitle'],
show['year'], alternateTitles))
show['year'], alternateTitles, show["id"]))
# Update or insert series in DB
db = sqlite3.connect(os.path.join(args.config_dir, 'db', 'bazarr.db'), timeout=30)
@ -104,12 +105,12 @@ def update_series():
if serie_default_enabled is True:
added_result = c.executemany(
'''INSERT OR IGNORE INTO table_shows(title, path, tvdbId, languages,`hearing_impaired`, sonarrSeriesId, overview, poster, fanart, `audio_language`, sortTitle, year, alternateTitles) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''',
'''INSERT OR IGNORE INTO table_shows(title, path, tvdbId, languages,`hearing_impaired`, sonarrSeriesId, overview, poster, fanart, `audio_language`, sortTitle, year, alternateTitles, forced) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''',
series_to_add)
db.commit()
else:
added_result = c.executemany(
'''INSERT OR IGNORE INTO table_shows(title, path, tvdbId, languages,`hearing_impaired`, sonarrSeriesId, overview, poster, fanart, `audio_language`, sortTitle, year, alternateTitles) VALUES (?,?,?,(SELECT languages FROM table_shows WHERE tvdbId = ?),(SELECT `hearing_impaired` FROM table_shows WHERE tvdbId = ?), ?, ?, ?, ?, ?, ?, ?, ?)''',
'''INSERT OR IGNORE INTO table_shows(title, path, tvdbId, languages,`hearing_impaired`, sonarrSeriesId, overview, poster, fanart, `audio_language`, sortTitle, year, alternateTitles, forced) VALUES (?,?,?,(SELECT languages FROM table_shows WHERE tvdbId = ?),(SELECT `hearing_impaired` FROM table_shows WHERE tvdbId = ?), ?, ?, ?, ?, ?, ?, ?, ?, (SELECT `forced` FROM table_shows WHERE tvdbId = ?))''',
series_to_add)
db.commit()
db.close()

11
bazarr/main.py
Unescape View File

@ -434,7 +434,10 @@ def save_wizard():
else:
settings_movie_default_hi = 'True'
settings.general.movie_default_hi = text_type(settings_movie_default_hi)
settings_movie_default_forced = str(request.forms.getall('settings_movie_default_forced'))
settings.general.movie_default_forced = text_type(settings_movie_default_forced)
with open(os.path.join(args.config_dir, 'config', 'config.ini'), 'w+') as handle:
settings.write(handle)
@ -1527,6 +1530,9 @@ def save_settings():
settings_serie_default_hi = 'True'
settings.general.serie_default_hi = text_type(settings_serie_default_hi)
settings_serie_default_forced = str(request.forms.get('settings_serie_default_forced'))
settings.general.serie_default_forced = text_type(settings_serie_default_forced)
settings_movie_default_enabled = request.forms.get('settings_movie_default_enabled')
if settings_movie_default_enabled is None:
settings_movie_default_enabled = 'False'
@ -1546,6 +1552,9 @@ def save_settings():
settings_movie_default_hi = 'True'
settings.general.movie_default_hi = text_type(settings_movie_default_hi)
settings_movie_default_forced = str(request.forms.get('settings_movie_default_forced'))
settings.general.movie_default_forced = text_type(settings_movie_default_forced)
with open(os.path.join(args.config_dir, 'config', 'config.ini'), 'w+') as handle:
settings.write(handle)

42
views/settings.tpl
Unescape View File

@ -2066,6 +2066,21 @@
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>Forced</label>
</div>
<div class="eleven wide column">
<div class='field'>
<select name="settings_serie_default_forced" id="settings_serie_default_forced" class="ui fluid selection dropdown">
<option value="False">False</option>
<option value="True">True</option>
<option value="Both">Both</option>
</select>
</div>
</div>
</div>
</div>
</div>
@ -2123,6 +2138,21 @@
</div>
</div>
</div>
<div class="middle aligned row">
<div id="movie_default_forced_label" class="right aligned four wide column">
<label>Forced</label>
</div>
<div class="eleven wide column">
<div class='field'>
<select name="settings_movie_default_forced" id="settings_movie_default_forced" class="ui fluid selection dropdown">
<option value="False">False</option>
<option value="True">True</option>
<option value="Both">Both</option>
</select>
</div>
</div>
</div>
</div>
</div>
</div>
@ -2540,19 +2570,23 @@
if ($('#settings_serie_default_enabled_div').data("enabled") === "True") {
$("#settings_serie_default_languages").removeClass('disabled');
$("#settings_serie_default_hi_div").removeClass('disabled');
$("#settings_serie_default_forced_div").removeClass('disabled');
} else {
$("#settings_serie_default_languages").addClass('disabled');
$("#settings_serie_default_hi_div").addClass('disabled');
$("#settings_serie_default_forced_div").addClass('disabled');
}
$('#settings_serie_default_enabled_div').checkbox({
onChecked: function() {
$("#settings_serie_default_languages").parent().removeClass('disabled');
$("#settings_serie_default_hi_div").removeClass('disabled');
$("#settings_serie_default_forced").parent().removeClass('disabled');
},
onUnchecked: function() {
$("#settings_serie_default_languages").parent().addClass('disabled');
$("#settings_serie_default_hi_div").addClass('disabled');
$("#settings_serie_default_forced").parent().addClass('disabled');
}
});
@ -2571,19 +2605,23 @@
if ($('#settings_movie_default_enabled_div').data("enabled") === "True") {
$("#settings_movie_default_languages").removeClass('disabled');
$("#settings_movie_default_hi_div").removeClass('disabled');
$("#settings_movie_default_forced_div").removeClass('disabled');
} else {
$("#settings_movie_default_languages").addClass('disabled');
$("#settings_movie_default_hi_div").addClass('disabled');
$("#settings_movie_default_forced_div").addClass('disabled');
}
$('#settings_movie_default_enabled_div').checkbox({
onChecked: function() {
$("#settings_movie_default_languages").parent().removeClass('disabled');
$("#settings_movie_default_hi_div").removeClass('disabled');
$("#settings_movie_default_forced").parent().removeClass('disabled');
},
onUnchecked: function() {
$("#settings_movie_default_languages").parent().addClass('disabled');
$("#settings_movie_default_hi_div").addClass('disabled');
$("#settings_movie_default_forced").parent().addClass('disabled');
}
});
@ -2671,13 +2709,17 @@
$('#settings_providers').dropdown();
$('#settings_languages').dropdown();
$('#settings_serie_default_languages').dropdown();
$('#settings_serie_default_forced').dropdown();
$('#settings_movie_default_languages').dropdown();
$('#settings_movie_default_forced').dropdown();
%if settings.general.serie_default_language != 'None':
$('#settings_serie_default_languages').dropdown('set selected',{{!settings.general.serie_default_language}});
%end
$('#settings_serie_default_forced').dropdown('set selected','{{settings.general.serie_default_forced}}');
%if settings.general.movie_default_language != 'None':
$('#settings_movie_default_languages').dropdown('set selected',{{!settings.general.movie_default_language}});
%end
$('#settings_movie_default_forced').dropdown('set selected','{{settings.general.movie_default_forced}}');
$('#settings_branch').dropdown();
$('#settings_sonarr_sync').dropdown();
$('#settings_radarr_sync').dropdown();

41
views/wizard.tpl
Unescape View File

@ -1114,6 +1114,21 @@
</div>
</div>
</div>
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>Forced</label>
</div>
<div class="eleven wide column">
<div class='field'>
<select name="settings_serie_default_forced" id="settings_serie_default_forced" class="ui fluid search selection dropdown">
<option value="False">False</option>
<option value="True">True</option>
<option value="Both">Both</option>
</select>
</div>
</div>
</div>
</div>
</div>
@ -1171,6 +1186,21 @@
</div>
</div>
</div>
<div class="middle aligned row">
<div id="movie_default_forced_label" class="right aligned four wide column">
<label>Forced</label>
</div>
<div class="eleven wide column">
<div class='field'>
<select name="settings_movie_default_forced" id="settings_movie_default_forced" class="ui fluid search selection dropdown">
<option value="False">False</option>
<option value="True">True</option>
<option value="Both">Both</option>
</select>
</div>
</div>
</div>
</div>
</div>
</div>
@ -1682,19 +1712,23 @@ $(function() {
if ($('#settings_serie_default_enabled_div').data("enabled") === "True") {
$("#settings_serie_default_languages").removeClass('disabled');
$("#settings_serie_default_hi_div").removeClass('disabled');
$("#settings_serie_default_forced_div").removeClass('disabled');
} else {
$("#settings_serie_default_languages").addClass('disabled');
$("#settings_serie_default_hi_div").addClass('disabled');
$("#settings_serie_default_forced_div").addClass('disabled');
}
$('#settings_serie_default_enabled_div').checkbox({
onChecked: function() {
$("#settings_serie_default_languages").parent().removeClass('disabled');
$("#settings_serie_default_hi_div").removeClass('disabled');
$("#settings_serie_default_forced").parent().removeClass('disabled');
},
onUnchecked: function() {
$("#settings_serie_default_languages").parent().addClass('disabled');
$("#settings_serie_default_hi_div").addClass('disabled');
$("#settings_serie_default_forced").parent().addClass('disabled');
}
});
@ -1713,9 +1747,11 @@ $(function() {
if ($('#settings_movie_default_enabled_div').data("enabled") === "True") {
$("#settings_movie_default_languages").removeClass('disabled');
$("#settings_movie_default_hi_div").removeClass('disabled');
$("#settings_movie_default_forced_div").removeClass('disabled');
} else {
$("#settings_movie_default_languages").addClass('disabled');
$("#settings_movie_default_hi_div").addClass('disabled');
$("#settings_movie_default_forced_div").addClass('disabled');
}
if ($('#settings_only_monitored_sonarr').data("monitored") === "True") {
@ -1734,10 +1770,12 @@ $(function() {
onChecked: function() {
$("#settings_movie_default_languages").parent().removeClass('disabled');
$("#settings_movie_default_hi_div").removeClass('disabled');
$("#settings_movie_default_forced").parent().removeClass('disabled');
},
onUnchecked: function() {
$("#settings_movie_default_languages").parent().addClass('disabled');
$("#settings_movie_default_hi_div").addClass('disabled');
$("#settings_movie_default_forced").parent().addClass('disabled');
}
});
@ -1791,13 +1829,16 @@ $(function() {
$('#settings_providers').dropdown();
$('#settings_languages').dropdown();
$('#settings_serie_default_languages').dropdown();
$('#settings_serie_default_forced').dropdown();
$('#settings_movie_default_languages').dropdown();
%if settings.general.serie_default_language != 'None':
$('#settings_serie_default_languages').dropdown('set selected',{{!settings.general.serie_default_language}});
%end
$('#settings_serie_default_languages').dropdown('set selected',{{!settings.general.serie_default_language}});
%if settings.general.movie_default_language != 'None':
$('#settings_movie_default_languages').dropdown('set selected',{{!settings.general.movie_default_language}});
%end
$('#settings_movie_default_forced').dropdown('set selected',{{!settings.general.movie_default_forced}});
// form validation
$('#wizard_form')

Write Preview
Loading…
Cancel
Save