Fixed upgrade process for translated subtitles. #2817

bazarr/subtitles/tools/translate.py

@@ -27,6 +27,7 @@ def translate_subtitles_file(video_path, source_srt_file, from_lang, to_lang, fo
         'zt': 'zh-TW',
     }
 
+    orig_to_lang = to_lang
     to_lang = alpha3_from_alpha2(to_lang)
     try:
         lang_obj = Language(to_lang)
@@ -126,7 +127,7 @@ def translate_subtitles_file(video_path, source_srt_file, from_lang, to_lang, fo
 
     result = ProcessSubtitlesResult(message=message,
                                     reversed_path=prr(video_path),
-                                    downloaded_language_code2=to_lang,
+                                    downloaded_language_code2=orig_to_lang,
                                     downloaded_provider=None,
                                     score=None,
                                     forced=forced,

bazarr/subtitles/upgrade.py

@@ -7,7 +7,7 @@ import ast
 
 from datetime import datetime, timedelta
 from functools import reduce
-from sqlalchemy import and_
+from sqlalchemy import and_, or_
 
 from app.config import settings
 from app.database import get_exclusion_clause, get_audio_profile_languages, TableShows, TableEpisodes, TableMovies, \
@@ -118,7 +118,7 @@ def upgrade_subtitles():
                                              episode['seriesTitle'],
                                              'series',
                                              episode['profileId'],
-                                             forced_minimum_score=int(episode['score']),
+                                             forced_minimum_score=int(episode['score'] or 0),
                                              is_upgrade=True,
                                              previous_subtitles_to_delete=path_mappings.path_replace(
                                                  episode['subtitles_path'])))
@@ -221,7 +221,7 @@ def upgrade_subtitles():
                                              movie['title'],
                                              'movie',
                                              movie['profileId'],
-                                             forced_minimum_score=int(movie['score']),
+                                             forced_minimum_score=int(movie['score'] or 0),
                                              is_upgrade=True,
                                              previous_subtitles_to_delete=path_mappings.path_replace_movie(
                                                  movie['subtitles_path'])))
@@ -293,8 +293,8 @@ def get_upgradable_episode_subtitles():
 
     upgradable_episodes_conditions = [(TableHistory.action.in_(query_actions)),
                                       (TableHistory.timestamp > minimum_timestamp),
-                                      TableHistory.score.is_not(None),
+                                      or_(and_(TableHistory.score.is_(None), TableHistory.action == 6),
-                                      (TableHistory.score < 357)]
+                                      (TableHistory.score < 357))]
     upgradable_episodes_conditions += get_exclusion_clause('series')
     subtitles_to_upgrade = database.execute(
         select(TableHistory.id,
@@ -371,8 +371,8 @@ def get_upgradable_movies_subtitles():
 
     upgradable_movies_conditions = [(TableHistoryMovie.action.in_(query_actions)),
                                     (TableHistoryMovie.timestamp > minimum_timestamp),
-                                    TableHistoryMovie.score.is_not(None),
+                                    or_(and_(TableHistoryMovie.score.is_(None), TableHistoryMovie.action == 6),
-                                    (TableHistoryMovie.score < 117)]
+                                    (TableHistoryMovie.score < 117))]
     upgradable_movies_conditions += get_exclusion_clause('movie')
     subtitles_to_upgrade = database.execute(
         select(TableHistoryMovie.id,