morpheus65535/bazarr
1
1
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-01-06 06:52:07 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed automatic subtitles synchronization that shouldn't be triggered on forced subtitles.

Browse source
This commit is contained in:
morpheus65535 2021-11-28 17:45:54 -05:00
parent d8fffe8e52
commit c2e44b981e
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bazarr/get_subtitle.py
View file

@ -229,6 +229,7 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
series_id = episode_metadata['sonarrSeriesId'] series_id = episode_metadata['sonarrSeriesId']
episode_id = episode_metadata['sonarrEpisodeId'] episode_id = episode_metadata['sonarrEpisodeId']
sync_subtitles(video_path=path, srt_path=downloaded_path, sync_subtitles(video_path=path, srt_path=downloaded_path,
forced=subtitle.language.forced,
srt_lang=downloaded_language_code2, media_type=media_type, srt_lang=downloaded_language_code2, media_type=media_type,
percent_score=percent_score, percent_score=percent_score,
sonarr_series_id=episode_metadata['sonarrSeriesId'], sonarr_series_id=episode_metadata['sonarrSeriesId'],
@ -241,6 +242,7 @@ def download_subtitle(path, language, audio_language, hi, forced, providers, pro
series_id = "" series_id = ""
episode_id = movie_metadata['radarrId'] episode_id = movie_metadata['radarrId']
sync_subtitles(video_path=path, srt_path=downloaded_path, sync_subtitles(video_path=path, srt_path=downloaded_path,
forced=subtitle.language.forced,
srt_lang=downloaded_language_code2, media_type=media_type, srt_lang=downloaded_language_code2, media_type=media_type,
percent_score=percent_score, percent_score=percent_score,
radarr_id=movie_metadata['radarrId']) radarr_id=movie_metadata['radarrId'])
@ -552,6 +554,7 @@ def manual_download_subtitle(path, language, audio_language, hi, forced, subtitl
series_id = episode_metadata['sonarrSeriesId'] series_id = episode_metadata['sonarrSeriesId']
episode_id = episode_metadata['sonarrEpisodeId'] episode_id = episode_metadata['sonarrEpisodeId']
sync_subtitles(video_path=path, srt_path=downloaded_path, sync_subtitles(video_path=path, srt_path=downloaded_path,
forced=subtitle.language.forced,
srt_lang=downloaded_language_code2, media_type=media_type, srt_lang=downloaded_language_code2, media_type=media_type,
percent_score=score, percent_score=score,
sonarr_series_id=episode_metadata['sonarrSeriesId'], sonarr_series_id=episode_metadata['sonarrSeriesId'],
@ -564,6 +567,7 @@ def manual_download_subtitle(path, language, audio_language, hi, forced, subtitl
series_id = "" series_id = ""
episode_id = movie_metadata['radarrId'] episode_id = movie_metadata['radarrId']
sync_subtitles(video_path=path, srt_path=downloaded_path, sync_subtitles(video_path=path, srt_path=downloaded_path,
forced=subtitle.language.forced,
srt_lang=downloaded_language_code2, media_type=media_type, srt_lang=downloaded_language_code2, media_type=media_type,
percent_score=score, radarr_id=movie_metadata['radarrId']) percent_score=score, radarr_id=movie_metadata['radarrId'])
@ -696,7 +700,7 @@ def manual_upload_subtitle(path, language, forced, hi, title, scene_name, media_
series_id = episode_metadata['sonarrSeriesId'] series_id = episode_metadata['sonarrSeriesId']
episode_id = episode_metadata['sonarrEpisodeId'] episode_id = episode_metadata['sonarrEpisodeId']
sync_subtitles(video_path=path, srt_path=subtitle_path, srt_lang=uploaded_language_code2, media_type=media_type, sync_subtitles(video_path=path, srt_path=subtitle_path, srt_lang=uploaded_language_code2, media_type=media_type,
percent_score=100, sonarr_series_id=episode_metadata['sonarrSeriesId'], percent_score=100, sonarr_series_id=episode_metadata['sonarrSeriesId'], forced=forced,
sonarr_episode_id=episode_metadata['sonarrEpisodeId']) sonarr_episode_id=episode_metadata['sonarrEpisodeId'])
else: else:
movie_metadata = TableMovies.select(TableMovies.radarrId)\ movie_metadata = TableMovies.select(TableMovies.radarrId)\
@ -706,7 +710,7 @@ def manual_upload_subtitle(path, language, forced, hi, title, scene_name, media_
series_id = "" series_id = ""
episode_id = movie_metadata['radarrId'] episode_id = movie_metadata['radarrId']
sync_subtitles(video_path=path, srt_path=subtitle_path, srt_lang=uploaded_language_code2, media_type=media_type, sync_subtitles(video_path=path, srt_path=subtitle_path, srt_lang=uploaded_language_code2, media_type=media_type,
percent_score=100, radarr_id=movie_metadata['radarrId']) percent_score=100, radarr_id=movie_metadata['radarrId'], forced=forced)
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,
@ -1660,9 +1664,15 @@ def postprocessing(command, path):
logging.info('BAZARR Post-processing result for file ' + path + ' : ' + out) logging.info('BAZARR Post-processing result for file ' + path + ' : ' + out)
def sync_subtitles(video_path, srt_path, srt_lang, media_type, percent_score, sonarr_series_id=None, def sync_subtitles(video_path, srt_path, srt_lang, forced, media_type, percent_score, sonarr_series_id=None,
sonarr_episode_id=None, radarr_id=None): sonarr_episode_id=None, radarr_id=None):
if settings.subsync.getboolean('use_subsync'): if forced:
logging.debug('BAZARR cannot sync forced subtitles. Skipping sync routine.')
elif not settings.subsync.getboolean('use_subsync'):
logging.debug('BAZARR automatic syncing is disabled in settings. Skipping sync routine.')
else:
logging.debug(f'BAZARR automatic syncing is enabled in settings. We\'ll try to sync this '
f'subtitles: {srt_path}.')
if media_type == 'series': if media_type == 'series':
use_subsync_threshold = settings.subsync.getboolean('use_subsync_threshold') use_subsync_threshold = settings.subsync.getboolean('use_subsync_threshold')
subsync_threshold = settings.subsync.subsync_threshold subsync_threshold = settings.subsync.subsync_threshold