diff --git a/bazarr/config.py b/bazarr/config.py index 4817cb65f..eaf765dae 100644 --- a/bazarr/config.py +++ b/bazarr/config.py @@ -17,7 +17,6 @@ defaults = { 'single_language': 'False', 'minimum_score': '90', 'use_scenename': 'True', - 'use_mediainfo': 'True', 'use_postprocessing': 'False', 'postprocessing_cmd': '', 'use_sonarr': 'False', diff --git a/bazarr/main.py b/bazarr/main.py index d204e8ff6..acccb2135 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -1255,11 +1255,6 @@ def save_settings(): settings_general_scenename = 'False' else: settings_general_scenename = 'True' - settings_general_mediainfo = request.forms.get('settings_general_mediainfo') - if settings_general_mediainfo is None: - settings_general_mediainfo = 'False' - else: - settings_general_mediainfo = 'True' settings_general_embedded = request.forms.get('settings_general_embedded') if settings_general_embedded is None: settings_general_embedded = 'False' @@ -1342,7 +1337,6 @@ def save_settings(): settings.general.single_language = text_type(settings_general_single_language) settings.general.minimum_score = text_type(settings_general_minimum_score) settings.general.use_scenename = text_type(settings_general_scenename) - settings.general.use_mediainfo = text_type(settings_general_mediainfo) settings.general.use_postprocessing = text_type(settings_general_use_postprocessing) settings.general.postprocessing_cmd = text_type(settings_general_postprocessing_cmd) settings.general.use_sonarr = text_type(settings_general_use_sonarr) diff --git a/bazarr/utils.py b/bazarr/utils.py index b9721921c..868d3b807 100644 --- a/bazarr/utils.py +++ b/bazarr/utils.py @@ -53,19 +53,13 @@ def get_binary(name): binaries_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'bin')) exe = None - if name != 'mediainfo': - installed_exe = which(name) + installed_exe = which(name) - if name != 'mediainfo' and installed_exe and os.path.isfile(installed_exe): + if installed_exe and os.path.isfile(installed_exe): return installed_exe else: if platform.system() == "Windows": # Windows exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "i386", name, "%s.exe" % name)) - if exe and not os.path.isfile(exe): - if sys.maxsize > 2**32: # is 64bits Python - exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "x86_64", name, "%s.dll" % name)) - else: # is 32bits Python - exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "i386", name, "%s.dll" % name)) elif platform.system() == "Darwin": # MacOSX exe = os.path.abspath(os.path.join(binaries_dir, "MacOSX", "i386", name, name)) diff --git a/views/settings_subtitles.tpl b/views/settings_subtitles.tpl index aec1f307f..7899e7458 100644 --- a/views/settings_subtitles.tpl +++ b/views/settings_subtitles.tpl @@ -20,33 +20,6 @@ -