morpheus65535/bazarr
1
1
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-02-23 22:35:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix for subtitles upgrading not taking use_sonarr/use_radarr into account.

Browse source
This commit is contained in:
Louis Vézina 2019-04-20 13:38:26 -04:00
parent 7fc145179c
commit b46e8c7cb8
2 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
bazarr/get_subtitle.py
View file

@ -791,14 +791,16 @@ def upgrade_subtitles():
db.close() db.close()
episodes_to_upgrade = [] episodes_to_upgrade = []
for episode in episodes_list: if settings.general.getboolean('use_sonarr'):
if os.path.exists(path_replace(episode[0])) and int(episode[2]) < 360: for episode in episodes_list:
episodes_to_upgrade.append(episode) if os.path.exists(path_replace(episode[0])) and int(episode[2]) < 360:
episodes_to_upgrade.append(episode)
movies_to_upgrade = [] movies_to_upgrade = []
for movie in movies_list: if settings.general.getboolean('use_radarr'):
if os.path.exists(path_replace_movie(movie[0])) and int(movie[2]) < 120: for movie in movies_list:
movies_to_upgrade.append(movie) if os.path.exists(path_replace_movie(movie[0])) and int(movie[2]) < 120:
movies_to_upgrade.append(movie)
providers_list = get_providers() providers_list = get_providers()
providers_auth = get_providers_auth() providers_auth = get_providers_auth()
@ -806,36 +808,38 @@ def upgrade_subtitles():
count_episode_to_upgrade = len(episodes_to_upgrade) count_episode_to_upgrade = len(episodes_to_upgrade)
count_movie_to_upgrade = len(movies_to_upgrade) count_movie_to_upgrade = len(movies_to_upgrade)
for i, episode in enumerate(episodes_to_upgrade, 1): if settings.general.getboolean('use_sonarr'):
if episode[1] in ast.literal_eval(str(episode[9])): for i, episode in enumerate(episodes_to_upgrade, 1):
notifications.write(msg='Upgrading series subtitles : ' + str(i) + '/' + str(count_episode_to_upgrade), if episode[1] in ast.literal_eval(str(episode[9])):
queue='get_subtitle', duration='long') notifications.write(msg='Upgrading series subtitles : ' + str(i) + '/' + str(count_episode_to_upgrade),
result = download_subtitle(path_replace(episode[0]), str(alpha3_from_alpha2(episode[1])),
episode[3], providers_list, providers_auth, str(episode[4]),
episode[5], 'series', forced_minimum_score=int(episode[2]), is_upgrade=True)
if result is not None:
message = result[0]
path = result[1]
language_code = result[2]
provider = result[3]
score = result[4]
store_subtitles(path_replace(episode[0]))
history_log(3, episode[6], episode[7], message, path, language_code, provider, score)
send_notifications(episode[6], episode[7], message)
for i, movie in enumerate(movies_to_upgrade, 1):
if movie[1] in ast.literal_eval(str(movie[8])):
notifications.write(msg='Upgrading movie subtitles : ' + str(i) + '/' + str(count_movie_to_upgrade),
queue='get_subtitle', duration='long') queue='get_subtitle', duration='long')
result = download_subtitle(path_replace_movie(movie[0]), str(alpha3_from_alpha2(movie[1])), result = download_subtitle(path_replace(episode[0]), str(alpha3_from_alpha2(episode[1])),
movie[3], providers_list, providers_auth, str(movie[4]), episode[3], providers_list, providers_auth, str(episode[4]),
movie[5], 'movie', forced_minimum_score=int(movie[2]), is_upgrade=True) episode[5], 'series', forced_minimum_score=int(episode[2]), is_upgrade=True)
if result is not None: if result is not None:
message = result[0] message = result[0]
path = result[1] path = result[1]
language_code = result[2] language_code = result[2]
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles_movie(path_replace_movie(movie[0])) store_subtitles(path_replace(episode[0]))
history_log_movie(3, movie[6], message, path, language_code, provider, score) history_log(3, episode[6], episode[7], message, path, language_code, provider, score)
send_notifications_movie(movie[6], message) send_notifications(episode[6], episode[7], message)
if settings.general.getboolean('use_radarr'):
for i, movie in enumerate(movies_to_upgrade, 1):
if movie[1] in ast.literal_eval(str(movie[8])):
notifications.write(msg='Upgrading movie subtitles : ' + str(i) + '/' + str(count_movie_to_upgrade),
queue='get_subtitle', duration='long')
result = download_subtitle(path_replace_movie(movie[0]), str(alpha3_from_alpha2(movie[1])),
movie[3], providers_list, providers_auth, str(movie[4]),
movie[5], 'movie', forced_minimum_score=int(movie[2]), is_upgrade=True)
if result is not None:
message = result[0]
path = result[1]
language_code = result[2]
provider = result[3]
score = result[4]
store_subtitles_movie(path_replace_movie(movie[0]))
history_log_movie(3, movie[6], message, path, language_code, provider, score)
send_notifications_movie(movie[6], message)

3
bazarr/scheduler.py
View file

@ -109,7 +109,8 @@ if settings.general.getboolean('use_sonarr') or settings.general.getboolean('use
scheduler.add_job(wanted_search_missing_subtitles, IntervalTrigger(hours=3), max_instances=1, coalesce=True, scheduler.add_job(wanted_search_missing_subtitles, IntervalTrigger(hours=3), max_instances=1, coalesce=True,
misfire_grace_time=15, id='wanted_search_missing_subtitles', name='Search for wanted subtitles') misfire_grace_time=15, id='wanted_search_missing_subtitles', name='Search for wanted subtitles')
if settings.general.getboolean('upgrade_subs'): if settings.general.getboolean('upgrade_subs') and (settings.general.getboolean('use_sonarr') or
settings.general.getboolean('use_radarr')):
scheduler.add_job(upgrade_subtitles, IntervalTrigger(hours=12), max_instances=1, coalesce=True, scheduler.add_job(upgrade_subtitles, IntervalTrigger(hours=12), max_instances=1, coalesce=True,
misfire_grace_time=15, id='upgrade_subtitles', name='Upgrade previously downloaded subtitles') misfire_grace_time=15, id='upgrade_subtitles', name='Upgrade previously downloaded subtitles')