mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Post-Processing add missing logs

This commit is contained in:
Moravčík, Marian 2020-06-08 08:35:08 +02:00
parent ecff2dcbc6
commit 183fc8f7d3
1 changed files with 117 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
bazarr/get_subtitle.py
View File

@ -54,7 +54,7 @@ def get_video(path, title, sceneName, providers=None, media_type="movie"):
path = os.path.join(os.path.dirname(path), sceneName + os.path.splitext(path)[1]) path = os.path.join(os.path.dirname(path), sceneName + os.path.splitext(path)[1])
used_scene_name = True used_scene_name = True
hash_from = original_path hash_from = original_path
try: try:
video = parse_video(path, hints=hints, providers=providers, dry_run=used_scene_name, video = parse_video(path, hints=hints, providers=providers, dry_run=used_scene_name,
hash_from=hash_from) hash_from=hash_from)
@ -64,10 +64,10 @@ def get_video(path, title, sceneName, providers=None, media_type="movie"):
refine_from_db(original_path, video) refine_from_db(original_path, video)
refine_from_ffprobe(original_path, video) refine_from_ffprobe(original_path, video)
logging.debug('BAZARR is using these video object properties: %s', vars(video)) logging.debug('BAZARR is using these video object properties: %s', vars(video))
return video return video
except Exception as e: except Exception as e:
logging.exception("BAZARR Error trying to get video information for this file: " + path) logging.exception("BAZARR Error trying to get video information for this file: " + path)
@ -92,30 +92,30 @@ def get_scores(video, media_type, min_score_movie_perc=60 * 100 / 120.0, min_sco
scores = list(subliminal_scores.episode_scores.keys()) scores = list(subliminal_scores.episode_scores.keys())
if video.is_special: if video.is_special:
min_score = max_score * min_score_special_ep / 100.0 min_score = max_score * min_score_special_ep / 100.0
return min_score, max_score, set(scores) return min_score, max_score, set(scores)
def download_subtitle(path, language, audio_language, hi, forced, providers, providers_auth, sceneName, title, media_type, def download_subtitle(path, language, audio_language, hi, forced, providers, providers_auth, sceneName, title,
forced_minimum_score=None, is_upgrade=False): media_type, forced_minimum_score=None, is_upgrade=False):
# fixme: supply all missing languages, not only one, to hit providers only once who support multiple languages in # fixme: supply all missing languages, not only one, to hit providers only once who support multiple languages in
# one query # one query
if settings.general.getboolean('utf8_encode'): if settings.general.getboolean('utf8_encode'):
os.environ["SZ_KEEP_ENCODING"] = "" os.environ["SZ_KEEP_ENCODING"] = ""
else: else:
os.environ["SZ_KEEP_ENCODING"] = "True" os.environ["SZ_KEEP_ENCODING"] = "True"
logging.debug('BAZARR Searching subtitles for this file: ' + path) logging.debug('BAZARR Searching subtitles for this file: ' + path)
if hi == "True": if hi == "True":
hi = "force HI" hi = "force HI"
else: else:
hi = "force non-HI" hi = "force non-HI"
language_set = set() language_set = set()
if not isinstance(language, list): if not isinstance(language, list):
language = [language] language = [language]
if forced == "True": if forced == "True":
providers_auth['podnapisi']['only_foreign'] = True ## fixme: This is also in get_providers_auth() providers_auth['podnapisi']['only_foreign'] = True ## fixme: This is also in get_providers_auth()
providers_auth['subscene']['only_foreign'] = True ## fixme: This is also in get_providers_auth() providers_auth['subscene']['only_foreign'] = True ## fixme: This is also in get_providers_auth()
@ -124,7 +124,7 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
providers_auth['podnapisi']['only_foreign'] = False providers_auth['podnapisi']['only_foreign'] = False
providers_auth['subscene']['only_foreign'] = False providers_auth['subscene']['only_foreign'] = False
providers_auth['opensubtitles']['only_foreign'] = False providers_auth['opensubtitles']['only_foreign'] = False
for l in language: for l in language:
if l == 'pob': if l == 'pob':
lang_obj = Language('por', 'BR') lang_obj = Language('por', 'BR')
@ -135,13 +135,13 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
if forced == "True": if forced == "True":
lang_obj = Language.rebuild(lang_obj, forced=True) lang_obj = Language.rebuild(lang_obj, forced=True)
language_set.add(lang_obj) language_set.add(lang_obj)
minimum_score = settings.general.minimum_score minimum_score = settings.general.minimum_score
minimum_score_movie = settings.general.minimum_score_movie minimum_score_movie = settings.general.minimum_score_movie
use_postprocessing = settings.general.getboolean('use_postprocessing') use_postprocessing = settings.general.getboolean('use_postprocessing')
postprocessing_cmd = settings.general.postprocessing_cmd postprocessing_cmd = settings.general.postprocessing_cmd
single = settings.general.getboolean('single_language') single = settings.general.getboolean('single_language')
# todo: # todo:
""" """
AsyncProviderPool: AsyncProviderPool:
@ -156,7 +156,7 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
if video: if video:
min_score, max_score, scores = get_scores(video, media_type, min_score_movie_perc=int(minimum_score_movie), min_score, max_score, scores = get_scores(video, media_type, min_score_movie_perc=int(minimum_score_movie),
min_score_series_perc=int(minimum_score)) min_score_series_perc=int(minimum_score))
if providers: if providers:
if forced_minimum_score: if forced_minimum_score:
min_score = int(forced_minimum_score) + 1 min_score = int(forced_minimum_score) + 1
@ -175,13 +175,13 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
downloaded_subtitles = None downloaded_subtitles = None
logging.info("BAZARR All providers are throttled") logging.info("BAZARR All providers are throttled")
return None return None
saved_any = False saved_any = False
if downloaded_subtitles: if downloaded_subtitles:
for video, subtitles in downloaded_subtitles.items(): for video, subtitles in downloaded_subtitles.items():
if not subtitles: if not subtitles:
continue continue
try: try:
fld = get_target_folder(path) fld = get_target_folder(path)
chmod = int(settings.general.chmod, 8) if not sys.platform.startswith( chmod = int(settings.general.chmod, 8) if not sys.platform.startswith(
@ -194,7 +194,8 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
path_decoder=force_unicode path_decoder=force_unicode
) )
except Exception as e: except Exception as e:
logging.exception('BAZARR Error saving Subtitles file to disk for this file:' + path + ': ' + repr(e)) logging.exception(
'BAZARR Error saving Subtitles file to disk for this file:' + path + ': ' + repr(e))
pass pass
else: else:
saved_any = True saved_any = True
@ -216,14 +217,15 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
else: else:
action = "downloaded" action = "downloaded"
message = downloaded_language + is_forced_string + " subtitles " + action + " from " + \ message = downloaded_language + is_forced_string + " subtitles " + action + " from " + \
downloaded_provider + " with a score of " + str(round(subtitle.score * 100 / max_score, 2))\ downloaded_provider + " with a score of " + str(
+ "%." round(subtitle.score * 100 / max_score, 2)) + "%."
if use_postprocessing is True: if use_postprocessing:
percent_score = round(subtitle.score * 100 / max_score, 2) percent_score = round(subtitle.score * 100 / max_score, 2)
command = pp_replace(postprocessing_cmd, path, downloaded_path, downloaded_language, command = pp_replace(postprocessing_cmd, path, downloaded_path, downloaded_language,
downloaded_language_code2, downloaded_language_code3, audio_language, downloaded_language_code2, downloaded_language_code3, audio_language,
audio_language_code2, audio_language_code3, subtitle.language.forced, percent_score) audio_language_code2, audio_language_code3, subtitle.language.forced,
percent_score)
if media_type == 'series': if media_type == 'series':
use_pp_threshold = settings.general.getboolean('use_postprocessing_threshold') use_pp_threshold = settings.general.getboolean('use_postprocessing_threshold')
@ -233,12 +235,12 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
pp_threshold = int(settings.general.postprocessing_threshold_movie) pp_threshold = int(settings.general.postprocessing_threshold_movie)
if not use_pp_threshold or (use_pp_threshold and percent_score < pp_threshold): if not use_pp_threshold or (use_pp_threshold and percent_score < pp_threshold):
postprocessing(command, path)
logging.debug("BAZARR Using post-processing command: {}".format(command)) logging.debug("BAZARR Using post-processing command: {}".format(command))
postprocessing(command, path)
else: else:
logging.debug("BAZARR post-processing skipped because subtitles score isn't below this " logging.debug("BAZARR post-processing skipped because subtitles score isn't below this "
"threshold value: " + str(pp_threshold) + "%") "threshold value: " + str(pp_threshold) + "%")
# fixme: support multiple languages at once # fixme: support multiple languages at once
if media_type == 'series': if media_type == 'series':
reversed_path = path_mappings.path_replace_reverse(path) reversed_path = path_mappings.path_replace_reverse(path)
@ -248,19 +250,19 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
track_event(category=downloaded_provider, action=action, label=downloaded_language) track_event(category=downloaded_provider, action=action, label=downloaded_language)
return message, reversed_path, downloaded_language_code2, downloaded_provider, subtitle.score, subtitle.language.forced return message, reversed_path, downloaded_language_code2, downloaded_provider, subtitle.score, subtitle.language.forced
if not saved_any: if not saved_any:
logging.debug('BAZARR No Subtitles were found for this file: ' + path) logging.debug('BAZARR No Subtitles were found for this file: ' + path)
return None return None
subliminal.region.backend.sync() subliminal.region.backend.sync()
logging.debug('BAZARR Ended searching Subtitles for file: ' + path) logging.debug('BAZARR Ended searching Subtitles for file: ' + path)
def manual_search(path, language, hi, forced, providers, providers_auth, sceneName, title, media_type): def manual_search(path, language, hi, forced, providers, providers_auth, sceneName, title, media_type):
logging.debug('BAZARR Manually searching subtitles for this file: ' + path) logging.debug('BAZARR Manually searching subtitles for this file: ' + path)
final_subtitles = [] final_subtitles = []
initial_hi = True if hi == "True" else False initial_hi = True if hi == "True" else False
@ -269,7 +271,7 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
else: else:
hi = "force non-HI" hi = "force non-HI"
language_set = set() language_set = set()
if forced == "True": if forced == "True":
providers_auth['podnapisi']['only_foreign'] = True providers_auth['podnapisi']['only_foreign'] = True
providers_auth['subscene']['only_foreign'] = True providers_auth['subscene']['only_foreign'] = True
@ -278,7 +280,7 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
providers_auth['podnapisi']['only_foreign'] = False providers_auth['podnapisi']['only_foreign'] = False
providers_auth['subscene']['only_foreign'] = False providers_auth['subscene']['only_foreign'] = False
providers_auth['opensubtitles']['only_foreign'] = False providers_auth['opensubtitles']['only_foreign'] = False
for lang in ast.literal_eval(language): for lang in ast.literal_eval(language):
lang = alpha3_from_alpha2(lang) lang = alpha3_from_alpha2(lang)
if lang == 'pob': if lang == 'pob':
@ -290,7 +292,7 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
if forced == "True": if forced == "True":
lang_obj = Language.rebuild(lang_obj, forced=True) lang_obj = Language.rebuild(lang_obj, forced=True)
language_set.add(lang_obj) language_set.add(lang_obj)
minimum_score = settings.general.minimum_score minimum_score = settings.general.minimum_score
minimum_score_movie = settings.general.minimum_score_movie minimum_score_movie = settings.general.minimum_score_movie
use_postprocessing = settings.general.getboolean('use_postprocessing') use_postprocessing = settings.general.getboolean('use_postprocessing')
@ -304,7 +306,7 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
if video: if video:
min_score, max_score, scores = get_scores(video, media_type, min_score_movie_perc=int(minimum_score_movie), min_score, max_score, scores = get_scores(video, media_type, min_score_movie_perc=int(minimum_score_movie),
min_score_series_perc=int(minimum_score)) min_score_series_perc=int(minimum_score))
try: try:
if providers: if providers:
subtitles = list_all_subtitles([video], language_set, subtitles = list_all_subtitles([video], language_set,
@ -320,19 +322,19 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
logging.exception("BAZARR Error trying to get Subtitle list from provider for this file: " + path) logging.exception("BAZARR Error trying to get Subtitle list from provider for this file: " + path)
else: else:
subtitles_list = [] subtitles_list = []
for s in subtitles[video]: for s in subtitles[video]:
try: try:
matches = s.get_matches(video) matches = s.get_matches(video)
except AttributeError: except AttributeError:
continue continue
# skip wrong season/episodes # skip wrong season/episodes
if media_type == "series": if media_type == "series":
can_verify_series = True can_verify_series = True
if not s.hash_verifiable and "hash" in matches: if not s.hash_verifiable and "hash" in matches:
can_verify_series = False can_verify_series = False
if can_verify_series and not {"series", "season", "episode"}.issubset(matches): if can_verify_series and not {"series", "season", "episode"}.issubset(matches):
logging.debug(u"BAZARR Skipping %s, because it doesn't match our series/episode", s) logging.debug(u"BAZARR Skipping %s, because it doesn't match our series/episode", s)
continue continue
@ -350,7 +352,7 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
for s_item in s.release_info.split(','): for s_item in s.release_info.split(','):
if s_item.strip(): if s_item.strip():
releases.append(s_item) releases.append(s_item)
if len(releases) == 0: if len(releases) == 0:
releases = ['n/a'] releases = ['n/a']
@ -368,26 +370,26 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
subtitle=codecs.encode(pickle.dumps(s.make_picklable()), "base64").decode(), subtitle=codecs.encode(pickle.dumps(s.make_picklable()), "base64").decode(),
url=s.page_link, matches=list(matches), dont_matches=list(not_matched), url=s.page_link, matches=list(matches), dont_matches=list(not_matched),
release_info=releases, uploader=s_uploader)) release_info=releases, uploader=s_uploader))
final_subtitles = sorted(subtitles_list, key=lambda x: (x['orig_score'], x['score_without_hash']), final_subtitles = sorted(subtitles_list, key=lambda x: (x['orig_score'], x['score_without_hash']),
reverse=True) reverse=True)
logging.debug('BAZARR ' + str(len(final_subtitles)) + " Subtitles have been found for this file: " + path) logging.debug('BAZARR ' + str(len(final_subtitles)) + " Subtitles have been found for this file: " + path)
logging.debug('BAZARR Ended searching Subtitles for this file: ' + path) logging.debug('BAZARR Ended searching Subtitles for this file: ' + path)
subliminal.region.backend.sync() subliminal.region.backend.sync()
return final_subtitles return final_subtitles
def manual_download_subtitle(path, language, audio_language, hi, forced, subtitle, provider, providers_auth, sceneName, title, def manual_download_subtitle(path, language, audio_language, hi, forced, subtitle, provider, providers_auth, sceneName,
media_type): title, media_type):
logging.debug('BAZARR Manually downloading Subtitles for this file: ' + path) logging.debug('BAZARR Manually downloading Subtitles for this file: ' + path)
if settings.general.getboolean('utf8_encode'): if settings.general.getboolean('utf8_encode'):
os.environ["SZ_KEEP_ENCODING"] = "" os.environ["SZ_KEEP_ENCODING"] = ""
else: else:
os.environ["SZ_KEEP_ENCODING"] = "True" os.environ["SZ_KEEP_ENCODING"] = "True"
subtitle = pickle.loads(codecs.decode(subtitle.encode(), "base64")) subtitle = pickle.loads(codecs.decode(subtitle.encode(), "base64"))
use_postprocessing = settings.general.getboolean('use_postprocessing') use_postprocessing = settings.general.getboolean('use_postprocessing')
postprocessing_cmd = settings.general.postprocessing_cmd postprocessing_cmd = settings.general.postprocessing_cmd
@ -422,7 +424,7 @@ def manual_download_subtitle(path, language, audio_language, hi, forced, subtitl
chmod=chmod, chmod=chmod,
# formats=("srt", "vtt") # formats=("srt", "vtt")
path_decoder=force_unicode) path_decoder=force_unicode)
except Exception as e: except Exception as e:
logging.exception('BAZARR Error saving Subtitles file to disk for this file:' + path) logging.exception('BAZARR Error saving Subtitles file to disk for this file:' + path)
return return
@ -443,12 +445,13 @@ def manual_download_subtitle(path, language, audio_language, hi, forced, subtitl
is_forced_string = " forced" if subtitle.language.forced else "" is_forced_string = " forced" if subtitle.language.forced else ""
message = downloaded_language + is_forced_string + " subtitles downloaded from " + downloaded_provider + " with a score of " + str( message = downloaded_language + is_forced_string + " subtitles downloaded from " + downloaded_provider + " with a score of " + str(
score) + "% using manual search." score) + "% using manual search."
if use_postprocessing is True: if use_postprocessing:
percent_score = round(subtitle.score * 100 / max_score, 2) percent_score = round(subtitle.score * 100 / max_score, 2)
command = pp_replace(postprocessing_cmd, path, downloaded_path, downloaded_language, command = pp_replace(postprocessing_cmd, path, downloaded_path, downloaded_language,
downloaded_language_code2, downloaded_language_code3, audio_language, downloaded_language_code2, downloaded_language_code3, audio_language,
audio_language_code2, audio_language_code3, subtitle.language.forced, percent_score) audio_language_code2, audio_language_code3, subtitle.language.forced,
percent_score)
if media_type == 'series': if media_type == 'series':
use_pp_threshold = settings.general.getboolean('use_postprocessing_threshold') use_pp_threshold = settings.general.getboolean('use_postprocessing_threshold')
@ -458,27 +461,29 @@ def manual_download_subtitle(path, language, audio_language, hi, forced, subtitl
pp_threshold = settings.general.postprocessing_threshold_movie pp_threshold = settings.general.postprocessing_threshold_movie
if not use_pp_threshold or (use_pp_threshold and percent_score < float(pp_threshold)): if not use_pp_threshold or (use_pp_threshold and percent_score < float(pp_threshold)):
logging.debug("BAZARR Using post-processing command: {}".format(command))
postprocessing(command, path) postprocessing(command, path)
else: else:
logging.debug("BAZARR post-processing skipped because subtitles score isn't below this " logging.debug("BAZARR post-processing skipped because subtitles score isn't below this "
"threshold value: " + pp_threshold + "%") "threshold value: " + pp_threshold + "%")
if media_type == 'series': if media_type == 'series':
reversed_path = path_mappings.path_replace_reverse(path) reversed_path = path_mappings.path_replace_reverse(path)
else: else:
reversed_path = path_mappings.path_replace_reverse_movie(path) reversed_path = path_mappings.path_replace_reverse_movie(path)
track_event(category=downloaded_provider, action="manually_downloaded", label=downloaded_language) track_event(category=downloaded_provider, action="manually_downloaded",
label=downloaded_language)
return message, reversed_path, downloaded_language_code2, downloaded_provider, subtitle.score, subtitle.language.forced return message, reversed_path, downloaded_language_code2, downloaded_provider, subtitle.score, subtitle.language.forced
else: else:
logging.error( logging.error(
"BAZARR Tried to manually download a Subtitles for file: " + path + " but we weren't able to do (probably throttled by " + str( "BAZARR Tried to manually download a Subtitles for file: " + path + " but we weren't able to do (probably throttled by " + str(
subtitle.provider_name) + ". Please retry later or select a Subtitles from another provider.") subtitle.provider_name) + ". Please retry later or select a Subtitles from another provider.")
return None return None
subliminal.region.backend.sync() subliminal.region.backend.sync()
logging.debug('BAZARR Ended manually downloading Subtitles for file: ' + path) logging.debug('BAZARR Ended manually downloading Subtitles for file: ' + path)
@ -552,21 +557,19 @@ def manual_upload_subtitle(path, language, forced, title, scene_name, media_type
os.chmod(subtitle_path, chmod) os.chmod(subtitle_path, chmod)
message = language_from_alpha3(language) + (" forced" if forced else "") + " Subtitles manually uploaded." message = language_from_alpha3(language) + (" forced" if forced else "") + " Subtitles manually uploaded."
uploaded_language_code3 = language uploaded_language_code3 = language
uploaded_language = language_from_alpha3(uploaded_language_code3) uploaded_language = language_from_alpha3(uploaded_language_code3)
uploaded_language_code2 = alpha2_from_alpha3(uploaded_language_code3) uploaded_language_code2 = alpha2_from_alpha3(uploaded_language_code3)
audio_language_code2 = alpha2_from_language(audio_language) audio_language_code2 = alpha2_from_language(audio_language)
audio_language_code3 = alpha3_from_language(audio_language) audio_language_code3 = alpha3_from_language(audio_language)
if use_postprocessing: if use_postprocessing:
command = pp_replace(postprocessing_cmd, path, subtitle_path, uploaded_language, command = pp_replace(postprocessing_cmd, path, subtitle_path, uploaded_language,
uploaded_language_code2, uploaded_language_code3, audio_language, uploaded_language_code2, uploaded_language_code3, audio_language,
audio_language_code2, audio_language_code3, forced, 100) audio_language_code2, audio_language_code3, forced, 100)
postprocessing(command, path) postprocessing(command, path)
if media_type == 'series': if media_type == 'series':
reversed_path = path_mappings.path_replace_reverse(path) reversed_path = path_mappings.path_replace_reverse(path)
else: else:
@ -580,7 +583,7 @@ def series_download_subtitles(no):
episodes_details_clause = " AND monitored='True'" episodes_details_clause = " AND monitored='True'"
else: else:
episodes_details_clause = '' episodes_details_clause = ''
episodes_details = database.execute("SELECT path, missing_subtitles, sonarrEpisodeId, scene_name " episodes_details = database.execute("SELECT path, missing_subtitles, sonarrEpisodeId, scene_name "
"FROM table_episodes WHERE sonarrSeriesId=? and missing_subtitles!='[]'" + "FROM table_episodes WHERE sonarrSeriesId=? and missing_subtitles!='[]'" +
episodes_details_clause, (no,)) episodes_details_clause, (no,))
@ -588,17 +591,18 @@ def series_download_subtitles(no):
logging.debug("BAZARR no episode for that sonarrSeriesId can be found in database:", str(no)) logging.debug("BAZARR no episode for that sonarrSeriesId can be found in database:", str(no))
return return
series_details = database.execute("SELECT hearing_impaired, audio_language, title, forced FROM table_shows WHERE sonarrSeriesId=?", series_details = database.execute(
(no,), only_one=True) "SELECT hearing_impaired, audio_language, title, forced FROM table_shows WHERE sonarrSeriesId=?",
(no,), only_one=True)
if not series_details: if not series_details:
logging.debug("BAZARR no series with that sonarrSeriesId can be found in database:", str(no)) logging.debug("BAZARR no series with that sonarrSeriesId can be found in database:", str(no))
return return
providers_list = get_providers() providers_list = get_providers()
providers_auth = get_providers_auth() providers_auth = get_providers_auth()
count_episodes_details = len(episodes_details) count_episodes_details = len(episodes_details)
for i, episode in enumerate(episodes_details, 1): for i, episode in enumerate(episodes_details, 1):
if providers_list: if providers_list:
for language in ast.literal_eval(episode['missing_subtitles']): for language in ast.literal_eval(episode['missing_subtitles']):
@ -633,7 +637,7 @@ def episode_download_subtitles(no):
episodes_details_clause = " AND monitored='True'" episodes_details_clause = " AND monitored='True'"
else: else:
episodes_details_clause = '' episodes_details_clause = ''
episodes_details = database.execute("SELECT table_episodes.path, table_episodes.missing_subtitles, " episodes_details = database.execute("SELECT table_episodes.path, table_episodes.missing_subtitles, "
"table_episodes.sonarrEpisodeId, table_episodes.scene_name, " "table_episodes.sonarrEpisodeId, table_episodes.scene_name, "
"table_shows.hearing_impaired, table_shows.title, table_shows.sonarrSeriesId, " "table_shows.hearing_impaired, table_shows.title, table_shows.sonarrSeriesId, "
@ -644,10 +648,10 @@ def episode_download_subtitles(no):
if not episodes_details: if not episodes_details:
logging.debug("BAZARR no episode with that sonarrEpisodeId can be found in database:", str(no)) logging.debug("BAZARR no episode with that sonarrEpisodeId can be found in database:", str(no))
return return
providers_list = get_providers() providers_list = get_providers()
providers_auth = get_providers_auth() providers_auth = get_providers_auth()
for episode in episodes_details: for episode in episodes_details:
if providers_list: if providers_list:
for language in ast.literal_eval(episode['missing_subtitles']): for language in ast.literal_eval(episode['missing_subtitles']):
@ -670,7 +674,8 @@ def episode_download_subtitles(no):
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles(episode['path'], path_mappings.path_replace(episode['path'])) store_subtitles(episode['path'], path_mappings.path_replace(episode['path']))
history_log(1, episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message, path, language_code, provider, score) history_log(1, episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message, path,
language_code, provider, score)
send_notifications(episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message) send_notifications(episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message)
else: else:
logging.info("BAZARR All providers are throttled") logging.info("BAZARR All providers are throttled")
@ -683,13 +688,14 @@ def movies_download_subtitles(no):
else: else:
movie_details_clause = '' movie_details_clause = ''
movie = database.execute("SELECT path, missing_subtitles, audio_language, radarrId, sceneName, hearing_impaired, title, forced " movie = database.execute(
"FROM table_movies WHERE radarrId=?" + movie_details_clause, (no,), only_one=True) "SELECT path, missing_subtitles, audio_language, radarrId, sceneName, hearing_impaired, title, forced "
"FROM table_movies WHERE radarrId=?" + movie_details_clause, (no,), only_one=True)
if not movie: if not movie:
logging.debug("BAZARR no movie with that radarrId can be found in database:", str(no)) logging.debug("BAZARR no movie with that radarrId can be found in database:", str(no))
return return
providers_list = get_providers() providers_list = get_providers()
providers_auth = get_providers_auth() providers_auth = get_providers_auth()
@ -697,7 +703,7 @@ def movies_download_subtitles(no):
count_movie = len(ast.literal_eval(movie['missing_subtitles'])) count_movie = len(ast.literal_eval(movie['missing_subtitles']))
else: else:
count_movie = 0 count_movie = 0
for i, language in enumerate(ast.literal_eval(movie['missing_subtitles']), 1): for i, language in enumerate(ast.literal_eval(movie['missing_subtitles']), 1):
if providers_list: if providers_list:
if language is not None: if language is not None:
@ -735,10 +741,10 @@ def wanted_download_subtitles(path, l, count_episodes):
"table_episodes.sonarrSeriesId = table_shows.sonarrSeriesId " "table_episodes.sonarrSeriesId = table_shows.sonarrSeriesId "
"WHERE table_episodes.path=? and table_episodes.missing_subtitles!='[]'", "WHERE table_episodes.path=? and table_episodes.missing_subtitles!='[]'",
(path_mappings.path_replace_reverse(path),)) (path_mappings.path_replace_reverse(path),))
providers_list = get_providers() providers_list = get_providers()
providers_auth = get_providers_auth() providers_auth = get_providers_auth()
for episode in episodes_details: for episode in episodes_details:
attempt = episode['failedAttempts'] attempt = episode['failedAttempts']
if type(attempt) == str: if type(attempt) == str:
@ -754,7 +760,7 @@ def wanted_download_subtitles(path, l, count_episodes):
database.execute("UPDATE table_episodes SET failedAttempts=? WHERE sonarrEpisodeId=?", database.execute("UPDATE table_episodes SET failedAttempts=? WHERE sonarrEpisodeId=?",
(str(attempt), episode['sonarrEpisodeId'])) (str(attempt), episode['sonarrEpisodeId']))
for i in range(len(attempt)): for i in range(len(attempt)):
if attempt[i][0] == language: if attempt[i][0] == language:
if search_active(attempt[i][1]): if search_active(attempt[i][1]):
@ -776,21 +782,24 @@ def wanted_download_subtitles(path, l, count_episodes):
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles(episode['path'], path_mappings.path_replace(episode['path'])) store_subtitles(episode['path'], path_mappings.path_replace(episode['path']))
history_log(1, episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message, path, language_code, provider, score) history_log(1, episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message, path,
language_code, provider, score)
send_notifications(episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message) send_notifications(episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message)
else: else:
logging.debug( logging.debug(
'BAZARR Search is not active for episode ' + episode['path'] + ' Language: ' + attempt[i][0]) 'BAZARR Search is not active for episode ' + episode['path'] + ' Language: ' + attempt[i][
0])
def wanted_download_subtitles_movie(path, l, count_movies): def wanted_download_subtitles_movie(path, l, count_movies):
movies_details = database.execute("SELECT path, missing_subtitles, radarrId, hearing_impaired, audio_language, sceneName, " movies_details = database.execute(
"failedAttempts, title, forced FROM table_movies WHERE path = ? " "SELECT path, missing_subtitles, radarrId, hearing_impaired, audio_language, sceneName, "
"AND missing_subtitles != '[]'", (path_mappings.path_replace_reverse_movie(path),)) "failedAttempts, title, forced FROM table_movies WHERE path = ? "
"AND missing_subtitles != '[]'", (path_mappings.path_replace_reverse_movie(path),))
providers_list = get_providers() providers_list = get_providers()
providers_auth = get_providers_auth() providers_auth = get_providers_auth()
for movie in movies_details: for movie in movies_details:
attempt = movie['failedAttempts'] attempt = movie['failedAttempts']
if type(attempt) == str: if type(attempt) == str:
@ -803,10 +812,10 @@ def wanted_download_subtitles_movie(path, l, count_movies):
att = list(zip(*attempt))[0] att = list(zip(*attempt))[0]
if language not in att: if language not in att:
attempt.append([language, time.time()]) attempt.append([language, time.time()])
database.execute("UPDATE table_movies SET failedAttempts=? WHERE radarrId=?", database.execute("UPDATE table_movies SET failedAttempts=? WHERE radarrId=?",
(str(attempt), movie['radarrId'])) (str(attempt), movie['radarrId']))
for i in range(len(attempt)): for i in range(len(attempt)):
if attempt[i][0] == language: if attempt[i][0] == language:
if search_active(attempt[i][1]) is True: if search_active(attempt[i][1]) is True:
@ -832,7 +841,8 @@ def wanted_download_subtitles_movie(path, l, count_movies):
send_notifications_movie(movie['radarrId'], message) send_notifications_movie(movie['radarrId'], message)
else: else:
logging.info( logging.info(
'BAZARR Search is not active for this Movie ' + movie['path'] + ' Language: ' + attempt[i][0]) 'BAZARR Search is not active for this Movie ' + movie['path'] + ' Language: ' + attempt[i][
0])
def wanted_search_missing_subtitles_series(): def wanted_search_missing_subtitles_series():
@ -854,7 +864,7 @@ def wanted_search_missing_subtitles_series():
else: else:
logging.info("BAZARR All providers are throttled") logging.info("BAZARR All providers are throttled")
return return
logging.info('BAZARR Finished searching for missing Series Subtitles. Check History for more information.') logging.info('BAZARR Finished searching for missing Series Subtitles. Check History for more information.')
@ -902,13 +912,14 @@ def search_active(timestamp):
def refine_from_db(path, video): def refine_from_db(path, video):
if isinstance(video, Episode): if isinstance(video, Episode):
data = database.execute("SELECT table_shows.title as seriesTitle, table_episodes.season, table_episodes.episode, " data = database.execute(
"table_episodes.title as episodeTitle, table_shows.year, table_shows.tvdbId, " "SELECT table_shows.title as seriesTitle, table_episodes.season, table_episodes.episode, "
"table_shows.alternateTitles, table_episodes.format, table_episodes.resolution, " "table_episodes.title as episodeTitle, table_shows.year, table_shows.tvdbId, "
"table_episodes.video_codec, table_episodes.audio_codec, table_episodes.path " "table_shows.alternateTitles, table_episodes.format, table_episodes.resolution, "
"FROM table_episodes INNER JOIN table_shows on " "table_episodes.video_codec, table_episodes.audio_codec, table_episodes.path "
"table_shows.sonarrSeriesId = table_episodes.sonarrSeriesId " "FROM table_episodes INNER JOIN table_shows on "
"WHERE table_episodes.path = ?", (path_mappings.path_replace_reverse(path),), only_one=True) "table_shows.sonarrSeriesId = table_episodes.sonarrSeriesId "
"WHERE table_episodes.path = ?", (path_mappings.path_replace_reverse(path),), only_one=True)
if data: if data:
video.series = data['seriesTitle'] video.series = data['seriesTitle']
@ -946,7 +957,7 @@ def refine_from_db(path, video):
if data['video_codec']: video.video_codec = data['video_codec'] if data['video_codec']: video.video_codec = data['video_codec']
if not video.audio_codec: if not video.audio_codec:
if data['audio_codec']: video.audio_codec = data['audio_codec'] if data['audio_codec']: video.audio_codec = data['audio_codec']
return video return video
@ -957,7 +968,7 @@ def refine_from_ffprobe(path, video):
return return
else: else:
logging.debug('BAZARR FFprobe used is %s', exe) logging.debug('BAZARR FFprobe used is %s', exe)
api.initialize({'provider': 'ffmpeg', 'ffmpeg': exe}) api.initialize({'provider': 'ffmpeg', 'ffmpeg': exe})
data = api.know(path) data = api.know(path)
@ -1019,7 +1030,7 @@ def upgrade_subtitles():
"table_episodes on table_episodes.sonarrEpisodeId = " "table_episodes on table_episodes.sonarrEpisodeId = "
"table_history.sonarrEpisodeId WHERE action IN " "table_history.sonarrEpisodeId WHERE action IN "
"(" + ','.join(map(str, query_actions)) + ") AND timestamp > ? AND " "(" + ','.join(map(str, query_actions)) + ") AND timestamp > ? AND "
"score is not null" + series_monitored_only_query_string + "score is not null" + series_monitored_only_query_string +
" GROUP BY table_history.video_path, table_history.language", " GROUP BY table_history.video_path, table_history.language",
(minimum_timestamp,)) (minimum_timestamp,))
@ -1071,7 +1082,7 @@ def upgrade_subtitles():
movies_to_upgrade.append(movie) movies_to_upgrade.append(movie)
count_movie_to_upgrade = len(movies_to_upgrade) count_movie_to_upgrade = len(movies_to_upgrade)
providers_list = get_providers() providers_list = get_providers()
providers_auth = get_providers_auth() providers_auth = get_providers_auth()
@ -1091,7 +1102,7 @@ def upgrade_subtitles():
forced_languages = [l + ":forced" for l in desired_languages] + desired_languages forced_languages = [l + ":forced" for l in desired_languages] + desired_languages
else: else:
forced_languages = desired_languages forced_languages = desired_languages
if episode['language'] in forced_languages: if episode['language'] in forced_languages:
if episode['language'].endswith('forced'): if episode['language'].endswith('forced'):
language = episode['language'].split(':')[0] language = episode['language'].split(':')[0]
@ -1099,7 +1110,7 @@ def upgrade_subtitles():
else: else:
language = episode['language'] language = episode['language']
is_forced = "False" is_forced = "False"
result = download_subtitle(path_mappings.path_replace(episode['video_path']), result = download_subtitle(path_mappings.path_replace(episode['video_path']),
str(alpha3_from_alpha2(language)), str(alpha3_from_alpha2(language)),
episode['audio_language'], episode['audio_language'],
@ -1120,9 +1131,10 @@ def upgrade_subtitles():
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles(episode['video_path'], path_mappings.path_replace(episode['video_path'])) store_subtitles(episode['video_path'], path_mappings.path_replace(episode['video_path']))
history_log(3, episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message, path, language_code, provider, score) history_log(3, episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message, path,
language_code, provider, score)
send_notifications(episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message) send_notifications(episode['sonarrSeriesId'], episode['sonarrEpisodeId'], message)
if settings.general.getboolean('use_radarr'): if settings.general.getboolean('use_radarr'):
for i, movie in enumerate(movies_to_upgrade, 1): for i, movie in enumerate(movies_to_upgrade, 1):
if movie['languages'] in [None, 'None', '[]']: if movie['languages'] in [None, 'None', '[]']:
@ -1139,7 +1151,7 @@ def upgrade_subtitles():
forced_languages = [l + ":forced" for l in desired_languages] + desired_languages forced_languages = [l + ":forced" for l in desired_languages] + desired_languages
else: else:
forced_languages = desired_languages forced_languages = desired_languages
if movie['language'] in forced_languages: if movie['language'] in forced_languages:
if movie['language'].endswith('forced'): if movie['language'].endswith('forced'):
language = movie['language'].split(':')[0] language = movie['language'].split(':')[0]
@ -1147,7 +1159,7 @@ def upgrade_subtitles():
else: else:
language = movie['language'] language = movie['language']
is_forced = "False" is_forced = "False"
result = download_subtitle(path_mappings.path_replace_movie(movie['video_path']), result = download_subtitle(path_mappings.path_replace_movie(movie['video_path']),
str(alpha3_from_alpha2(language)), str(alpha3_from_alpha2(language)),
movie['audio_language'], movie['audio_language'],
@ -1167,7 +1179,8 @@ def upgrade_subtitles():
language_code = result[2] + ":forced" if forced else result[2] language_code = result[2] + ":forced" if forced else result[2]
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles_movie(movie['video_path'], path_mappings.path_replace_movie(movie['video_path'])) store_subtitles_movie(movie['video_path'],
path_mappings.path_replace_movie(movie['video_path']))
history_log_movie(3, movie['radarrId'], message, path, language_code, provider, score) history_log_movie(3, movie['radarrId'], message, path, language_code, provider, score)
send_notifications_movie(movie['radarrId'], message) send_notifications_movie(movie['radarrId'], message)