mirror of https://github.com/morpheus65535/bazarr
Merge remote-tracking branch 'origin/development' into morpheus
# Conflicts: # bazarr/list_subtitles.py
This commit is contained in:
Louis Vézina
commit
1e0980f8fc
|
|
@ -31,26 +31,27 @@ def store_subtitles(file):
|
|||
actual_subtitles = []
|
||||
if os.path.exists(file):
|
||||
notifications.write(msg='Analyzing this file for subtitles: ' + file, queue='list_subtitles')
|
||||
if os.path.splitext(file)[1] == '.mkv':
|
||||
logging.debug("BAZARR is trying to index embedded subtitles.")
|
||||
try:
|
||||
with open(file, 'rb') as f:
|
||||
mkv = enzyme.MKV(f)
|
||||
if settings.general.getboolean('use_embedded_subs'):
|
||||
if os.path.splitext(file)[1] == '.mkv':
|
||||
logging.debug("BAZARR is trying to index embedded subtitles.")
|
||||
try:
|
||||
with open(file, 'rb') as f:
|
||||
mkv = enzyme.MKV(f)
|
||||
|
||||
for subtitle_track in mkv.subtitle_tracks:
|
||||
try:
|
||||
if alpha2_from_alpha3(subtitle_track.language) is not None:
|
||||
lang = str(alpha2_from_alpha3(subtitle_track.language))
|
||||
logging.debug("BAZARR embedded subtitles detected: " + lang)
|
||||
actual_subtitles.append([lang, None, subtitle_track.forced])
|
||||
except:
|
||||
logging.debug("BAZARR unable to index this unrecognized language: " + subtitle_track.language)
|
||||
pass
|
||||
except Exception as e:
|
||||
logging.exception("BAZARR error when trying to analyze this mkv file: " + file)
|
||||
pass
|
||||
else:
|
||||
logging.debug("BAZARR This file isn't an .mkv file.")
|
||||
for subtitle_track in mkv.subtitle_tracks:
|
||||
try:
|
||||
if alpha2_from_alpha3(subtitle_track.language) is not None:
|
||||
lang = str(alpha2_from_alpha3(subtitle_track.language))
|
||||
logging.debug("BAZARR embedded subtitles detected: " + lang)
|
||||
actual_subtitles.append([lang, None])
|
||||
except:
|
||||
logging.debug("BAZARR unable to index this unrecognized language: " + subtitle_track.language)
|
||||
pass
|
||||
except Exception as e:
|
||||
logging.exception("BAZARR error when trying to analyze this mkv file: " + file)
|
||||
pass
|
||||
else:
|
||||
logging.debug("BAZARR This file isn't an .mkv file.")
|
||||
|
||||
brazilian_portuguese = [".pt-br", ".pob", "pb"]
|
||||
brazilian_portuguese_forced = [".pt-br.forced", ".pob.forced", "pb.forced"]
|
||||
|
|
@ -122,26 +123,27 @@ def store_subtitles_movie(file):
|
|||
actual_subtitles = []
|
||||
if os.path.exists(file):
|
||||
notifications.write(msg='Analyzing this file for subtitles: ' + file, queue='list_subtitles')
|
||||
if os.path.splitext(file)[1] == '.mkv':
|
||||
logging.debug("BAZARR is trying to index embedded subtitles.")
|
||||
try:
|
||||
with open(file, 'rb') as f:
|
||||
mkv = enzyme.MKV(f)
|
||||
if settings.general.getboolean('use_embedded_subs'):
|
||||
if os.path.splitext(file)[1] == '.mkv':
|
||||
logging.debug("BAZARR is trying to index embedded subtitles.")
|
||||
try:
|
||||
with open(file, 'rb') as f:
|
||||
mkv = enzyme.MKV(f)
|
||||
|
||||
for subtitle_track in mkv.subtitle_tracks:
|
||||
try:
|
||||
if alpha2_from_alpha3(subtitle_track.language) is not None:
|
||||
lang = str(alpha2_from_alpha3(subtitle_track.language))
|
||||
logging.debug("BAZARR embedded subtitles detected: " + lang)
|
||||
actual_subtitles.append([lang, None, subtitle_track.forced])
|
||||
except:
|
||||
logging.debug("BAZARR unable to index this unrecognized language: " + subtitle_track.language)
|
||||
pass
|
||||
except Exception as e:
|
||||
logging.exception("BAZARR error when trying to analyze this mkv file: " + file)
|
||||
pass
|
||||
else:
|
||||
logging.debug("BAZARR This file isn't an .mkv file.")
|
||||
for subtitle_track in mkv.subtitle_tracks:
|
||||
try:
|
||||
if alpha2_from_alpha3(subtitle_track.language) is not None:
|
||||
lang = str(alpha2_from_alpha3(subtitle_track.language))
|
||||
logging.debug("BAZARR embedded subtitles detected: " + lang)
|
||||
actual_subtitles.append([lang, None])
|
||||
except:
|
||||
logging.debug("BAZARR unable to index this unrecognized language: " + subtitle_track.language)
|
||||
pass
|
||||
except Exception as e:
|
||||
logging.exception("BAZARR error when trying to analyze this mkv file: " + file)
|
||||
pass
|
||||
else:
|
||||
logging.debug("BAZARR This file isn't an .mkv file.")
|
||||
|
||||
dest_folder = get_subtitle_destination_folder()
|
||||
subliminal_patch.core.CUSTOM_PATHS = [dest_folder] if dest_folder else []
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
<td>
|
||||
% upgradable_criteria = (row[5], row[2], row[8])
|
||||
% if upgradable_criteria in upgradable_movies:
|
||||
% if row[7] and row[7] in ast.literal_eval(str(row[6])):
|
||||
% if row[6] and row[7] and row[7] in ast.literal_eval(str(row[6])):
|
||||
<div class="ui inverted basic compact icon" data-tooltip="This subtitles is eligible to an upgrade." data-inverted="" data-position="top left">
|
||||
<i class="ui green recycle icon upgrade"></i>{{row[3]}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -347,11 +347,9 @@
|
|||
<div class="five wide column">
|
||||
<select name="settings_subfolder" id="settings_subfolder"
|
||||
class="ui fluid selection dropdown">
|
||||
<option value="current">Current</option>
|
||||
<option value="sub">sub</option>
|
||||
<option value="subs">subs</option>
|
||||
<option value="subtitle">subtitle</option>
|
||||
<option value="subtitles">subtitles</option>
|
||||
<option value="current">Alongside media file</option>
|
||||
<option value="relative">Relative path to media file</option>
|
||||
<option value="absolute">Absolute path</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
|
@ -364,7 +362,8 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="middle aligned row">
|
||||
<div class="middle aligned row subfolder">
|
||||
<div class="two wide column"></div>
|
||||
<div class="right aligned four wide column">
|
||||
<label>Custom Subtitle folder</label>
|
||||
</div>
|
||||
|
|
@ -379,8 +378,7 @@
|
|||
|
||||
<div class="collapsed center aligned column">
|
||||
<div class="ui basic icon"
|
||||
data-tooltip='Choose your own folder for the subtitles'
|
||||
data-inverted="">
|
||||
data-tooltip='Choose your own folder for the subtitles' data-inverted="">
|
||||
<i class="help circle large icon"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1936,6 +1934,19 @@ $(function() {
|
|||
$('#loader').removeClass('active');
|
||||
});
|
||||
|
||||
if (($('#settings_subfolder').val() !== "relative") && ($('#settings_subfolder').val() !== "absolute")) {
|
||||
$('.subfolder').hide();
|
||||
}
|
||||
|
||||
$('#settings_subfolder').dropdown('setting', 'onChange', function(){
|
||||
if (($('#settings_subfolder').val() !== "relative") && ($('#settings_subfolder').val() !== "absolute")) {
|
||||
$('.subfolder').hide();
|
||||
}
|
||||
else {
|
||||
$('.subfolder').show();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
$('#sonarr_validate').on('click', function() {
|
||||
if ($('#sonarr_ssl_div').checkbox('is checked')) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue