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

Improvements to historize translation and make them candidate to upgrade.

This commit is contained in:
morpheus65535 2021-02-03 16:01:43 -05:00
parent 4094149240
commit e3fe3fab4e
8 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bazarr/api.py
View File

@ -18,7 +18,7 @@ import logging
from database import database, get_exclusion_clause, get_profiles_list, get_desired_languages, get_profile_id_name, \
get_audio_profile_languages, update_profile_id_list
from helper import path_mappings
from get_languages import language_from_alpha2, alpha3_from_alpha2
from get_languages import language_from_alpha2, language_from_alpha3, alpha2_from_alpha3, alpha3_from_alpha2
from get_subtitle import download_subtitle, series_download_subtitles, manual_search, manual_download_subtitle, \
manual_upload_subtitle, wanted_search_missing_subtitles_series, wanted_search_missing_subtitles_movies, \
episode_download_subtitles, movies_download_subtitles
@ -1375,7 +1375,7 @@ class HistorySeries(Resource):
datetime.datetime(1970, 1, 1)).total_seconds()
if settings.general.getboolean('upgrade_manual'):
query_actions = [1, 2, 3]
query_actions = [1, 2, 3, 6]
else:
query_actions = [1, 3]
@ -1481,7 +1481,7 @@ class HistoryMovies(Resource):
datetime.datetime(1970, 1, 1)).total_seconds()
if settings.general.getboolean('upgrade_manual'):
query_actions = [1, 2, 3]
query_actions = [1, 2, 3, 6]
else:
query_actions = [1, 3]
@ -1947,10 +1947,37 @@ class SubTranslate(Resource):
forced=forced, hi=hi)
if result:
message = 'Subtitles translated to {}'.format(language_from_alpha3(dest_language))
if media_type == 'series':
episode_metadata = database.execute("SELECT sonarrSeriesId, sonarrEpisodeId FROM table_episodes"
" WHERE path = ?",
(path_mappings.path_replace_reverse(video_path),), only_one=True)
store_subtitles(path_mappings.path_replace_reverse(video_path), video_path)
history_log(action=6,
sonarr_series_id=episode_metadata['sonarrSeriesId'],
sonarr_episode_id=episode_metadata['sonarrEpisodeId'],
description=message,
video_path=path_mappings.path_replace_reverse(video_path),
language=alpha2_from_alpha3(dest_language),
provider=None,
score=0,
subs_id=None,
subtitles_path=path_mappings.path_replace_reverse(result))
else:
movie_metadata = database.execute("SELECT radarrId FROM table_movies WHERE path = ?",
(path_mappings.path_replace_reverse_movie(video_path),),
only_one=True)
store_subtitles_movie(path_mappings.path_replace_reverse_movie(video_path), video_path)
history_log_movie(action=6,
radarr_id=movie_metadata['radarrId'],
description=message,
video_path=path_mappings.path_replace_reverse_movie(video_path),
language=alpha2_from_alpha3(dest_language),
provider=None,
score=0,
subs_id=None,
subtitles_path=path_mappings.path_replace_reverse_movie(result))
return '', 200
else:
return '', 500

2
bazarr/get_subtitle.py
View File

@ -1195,7 +1195,7 @@ def upgrade_subtitles():
datetime(1970, 1, 1)).total_seconds()
if settings.general.getboolean('upgrade_manual'):
query_actions = [1, 2, 3]
query_actions = [1, 2, 3, 6]
else:
query_actions = [1, 3]

2
bazarr/utils.py
View File

@ -334,4 +334,4 @@ def translate_subtitles_file(video_path, source_srt_file, to_lang, forced, hi):
line.plaintext = translated_lines_list[i]
subs.save(dest_srt_file)
return True
return dest_srt_file

2
views/episodes.html
View File

@ -1502,6 +1502,8 @@
return "<i class='fas fa-cloud-upload-alt' title='Subtitle file has been manually uploaded.' data-toggle='tooltip' data-placement='right'></i>";
} else if (data === 5) {
return "<i class='fas fa-clock' title='Subtitle file has been synced.' data-toggle='tooltip' data-placement='right'></i>";
} else if (data === 6) {
return "<i class='fas fa-language' title='Subtitle file has been translated.' data-toggle='tooltip' data-placement='right'></i>";
}
}
},

2
views/historymovies.html
View File

@ -56,6 +56,8 @@
return "<i class='fas fa-cloud-upload-alt' title='Subtitle file has been manually uploaded.' data-toggle='tooltip' data-placement='right'></i>";
} else if (data === 5) {
return "<i class='fas fa-clock' title='Subtitle file has been synced.' data-toggle='tooltip' data-placement='right'></i>";
} else if (data === 6) {
return "<i class='fas fa-language' title='Subtitle file has been translated.' data-toggle='tooltip' data-placement='right'></i>";
}
}
},

2
views/historyseries.html
View File

@ -58,6 +58,8 @@
return "<i class='fas fa-cloud-upload-alt' title='Subtitle file has been manually uploaded.' data-toggle='tooltip' data-placement='right'></i>";
} else if (data === 5) {
return "<i class='fas fa-clock' title='Subtitle file has been synced.' data-toggle='tooltip' data-placement='right'></i>";
} else if (data === 6) {
return "<i class='fas fa-language' title='Subtitle file has been translated.' data-toggle='tooltip' data-placement='right'></i>";
}
}
},

1
views/movie.html
View File

@ -904,6 +904,7 @@
else if (data === 3) {return "<i class='fas fa-recycle' title='Subtitle file has been upgraded.' data-toggle='tooltip' data-placement='right'></i>";}
else if (data === 4) {return "<i class='fas fa-cloud-upload-alt' title='Subtitle file has been manually uploaded.' data-toggle='tooltip' data-placement='right'></i>";}
else if (data === 5) {return "<i class='fas fa-clock' title='Subtitle file has been synced.' data-toggle='tooltip' data-placement='right'></i>";}
else if (data === 6) {return "<i class='fas fa-language' title='Subtitle file has been translated.' data-toggle='tooltip' data-placement='right'></i>";}
}
},
{

4
views/settingssubtitles.html
View File

@ -85,7 +85,7 @@
<br>
<div class="row">
<div class="col-sm-4 text-right">
<b>Upgrade Manually Downloaded Subtitles</b>
<b>Upgrade Manually Downloaded or Translated Subtitles</b>
</div>
<div class="form-group col-sm-8">
<label class="custom-control custom-checkbox">
@ -93,7 +93,7 @@
name="settings-general-upgrade_manual">
<span class="custom-control-label" for="settings-general-upgrade_manual"></span>
</label>
<label>Enable or disable upgrade of manually searched and downloaded Subtitles.</label>
<label>Enable or disable upgrade of manually downloaded or translated Subtitles.</label>
</div>
</div>
<br>