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

WIP

Browse Source
pull/884/head
Louis Vézina 5 years ago
parent c96ca8fe16
commit ae46a0fc49
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File

23
bazarr/get_subtitle.py
Unescape View File

@ -35,13 +35,12 @@ from analytics import track_event
from locale import getpreferredencoding from locale import getpreferredencoding
def get_video(path, title, sceneName, use_scenename, providers=None, media_type="movie"): def get_video(path, title, sceneName, providers=None, media_type="movie"):
""" """
Construct `Video` instance Construct `Video` instance
:param path: path to video :param path: path to video
:param title: series/movie title :param title: series/movie title
:param sceneName: sceneName :param sceneName: sceneName
:param use_scenename: use sceneName
:param providers: provider list for selective hashing :param providers: provider list for selective hashing
:param media_type: movie/series :param media_type: movie/series
:return: `Video` instance :return: `Video` instance
@ -51,7 +50,7 @@ def get_video(path, title, sceneName, use_scenename, providers=None, media_type=
original_path = path original_path = path
original_name = os.path.basename(path) original_name = os.path.basename(path)
hash_from = None hash_from = None
if sceneName != "None" and use_scenename: if sceneName != "None":
# use the sceneName but keep the folder structure for better guessing # use the sceneName but keep the folder structure for better guessing
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
@ -138,7 +137,6 @@ def download_subtitle(path, language, hi, forced, providers, providers_auth, sce
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)
use_scenename = settings.general.getboolean('use_scenename')
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')
@ -154,7 +152,7 @@ def download_subtitle(path, language, hi, forced, providers, providers_auth, sce
post_download_hook=None, post_download_hook=None,
language_hook=None language_hook=None
""" """
video = get_video(force_unicode(path), title, sceneName, use_scenename, providers=providers, video = get_video(force_unicode(path), title, sceneName, providers=providers,
media_type=media_type) media_type=media_type)
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),
@ -216,12 +214,9 @@ def download_subtitle(path, language, hi, forced, providers, providers_auth, sce
action = "upgraded" action = "upgraded"
else: else:
action = "downloaded" action = "downloaded"
if video.used_scene_name: 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( downloaded_provider + " with a score of " + str(round(subtitle.score * 100 / max_score, 2))\
round(subtitle.score * 100 / max_score, 2)) + "% using this scene name: " + sceneName + "%."
else:
message = downloaded_language + is_forced_string + " subtitles " + action + " from " + downloaded_provider + " with a score of " + str(
round(subtitle.score * 100 / max_score, 2)) + "% using filename guessing."
if use_postprocessing is True: if use_postprocessing is True:
command = pp_replace(postprocessing_cmd, path, downloaded_path, downloaded_language, command = pp_replace(postprocessing_cmd, path, downloaded_path, downloaded_language,
@ -281,13 +276,12 @@ def manual_search(path, language, hi, forced, providers, providers_auth, sceneNa
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)
use_scenename = settings.general.getboolean('use_scenename')
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
if providers: if providers:
video = get_video(force_unicode(path), title, sceneName, use_scenename, providers=providers, video = get_video(force_unicode(path), title, sceneName, providers=providers,
media_type=media_type) media_type=media_type)
else: else:
logging.info("BAZARR All providers are throttled") logging.info("BAZARR All providers are throttled")
@ -370,11 +364,10 @@ def manual_download_subtitle(path, language, hi, forced, subtitle, provider, pro
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_scenename = settings.general.getboolean('use_scenename')
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')
video = get_video(force_unicode(path), title, sceneName, use_scenename, providers={provider}, video = get_video(force_unicode(path), title, sceneName, providers={provider},
media_type=media_type) media_type=media_type)
if video: if video:
min_score, max_score, scores = get_scores(video, media_type) min_score, max_score, scores = get_scores(video, media_type)

Write Preview
Loading…
Cancel
Save