diff --git a/bazarr/subtitles/download.py b/bazarr/subtitles/download.py index 7b5341bbd..00774c902 100644 --- a/bazarr/subtitles/download.py +++ b/bazarr/subtitles/download.py @@ -24,8 +24,8 @@ @update_pools -def generate_subtitles(path, languages, audio_language, sceneName, title, media_type, forced_minimum_score=None, - is_upgrade=False, profile_id=None, check_if_still_required=False, +def generate_subtitles(path, languages, audio_language, sceneName, title, media_type, profile_id, + forced_minimum_score=None, is_upgrade=False, check_if_still_required=False, previous_subtitles_to_delete=None): if not languages: return None diff --git a/bazarr/subtitles/mass_download/movies.py b/bazarr/subtitles/mass_download/movies.py index 25fa04364..5698db178 100644 --- a/bazarr/subtitles/mass_download/movies.py +++ b/bazarr/subtitles/mass_download/movies.py @@ -30,7 +30,8 @@ def movies_download_subtitles(no): TableMovies.sceneName, TableMovies.title, TableMovies.tags, - TableMovies.monitored) + TableMovies.monitored, + TableMovies.profileId) .where(reduce(operator.and_, conditions))) \ .first() if not movie: @@ -79,6 +80,7 @@ def movies_download_subtitles(no): str(movie.sceneName), movie.title, 'movie', + movie.profileId, check_if_still_required=True): if result: diff --git a/bazarr/subtitles/mass_download/series.py b/bazarr/subtitles/mass_download/series.py index 3a9d998ca..8fafe583a 100644 --- a/bazarr/subtitles/mass_download/series.py +++ b/bazarr/subtitles/mass_download/series.py @@ -43,7 +43,8 @@ def series_download_subtitles(no): TableShows.title, TableEpisodes.season, TableEpisodes.episode, - TableEpisodes.title.label('episodeTitle')) + TableEpisodes.title.label('episodeTitle'), + TableShows.profileId) .select_from(TableEpisodes) .join(TableShows) .where(reduce(operator.and_, conditions))) \ @@ -87,6 +88,7 @@ def series_download_subtitles(no): str(episode.sceneName), episode.title, 'series', + episode.profileId, check_if_still_required=True): if result: if isinstance(result, tuple) and len(result): @@ -117,7 +119,8 @@ def episode_download_subtitles(no, send_progress=False): TableShows.seriesType, TableEpisodes.title.label('episodeTitle'), TableEpisodes.season, - TableEpisodes.episode) + TableEpisodes.episode, + TableShows.profileId) .select_from(TableEpisodes) .join(TableShows) .where(reduce(operator.and_, conditions))) \ @@ -159,6 +162,7 @@ def episode_download_subtitles(no, send_progress=False): str(episode.sceneName), episode.title, 'series', + episode.profileId, check_if_still_required=True): if result: if isinstance(result, tuple) and len(result): diff --git a/bazarr/subtitles/upgrade.py b/bazarr/subtitles/upgrade.py index 1c565bd0d..a78ca950d 100644 --- a/bazarr/subtitles/upgrade.py +++ b/bazarr/subtitles/upgrade.py @@ -107,6 +107,7 @@ def upgrade_subtitles(): str(episode['sceneName']), episode['seriesTitle'], 'series', + episode['profileId'], forced_minimum_score=int(episode['score']), is_upgrade=True, previous_subtitles_to_delete=path_mappings.path_replace( @@ -192,6 +193,7 @@ def upgrade_subtitles(): str(movie['sceneName']), movie['title'], 'movie', + movie['profileId'], forced_minimum_score=int(movie['score']), is_upgrade=True, previous_subtitles_to_delete=path_mappings.path_replace_movie( diff --git a/bazarr/subtitles/wanted/movies.py b/bazarr/subtitles/wanted/movies.py index 16c363386..9d20f5140 100644 --- a/bazarr/subtitles/wanted/movies.py +++ b/bazarr/subtitles/wanted/movies.py @@ -50,6 +50,7 @@ def _wanted_movie(movie): str(movie.sceneName), movie.title, 'movie', + movie.profileId, check_if_still_required=True): if result: @@ -69,7 +70,8 @@ def wanted_download_subtitles_movie(radarr_id): TableMovies.audio_language, TableMovies.sceneName, TableMovies.failedAttempts, - TableMovies.title) + TableMovies.title, + TableMovies.profileId) .where(TableMovies.radarrId == radarr_id)) \ .all() diff --git a/bazarr/subtitles/wanted/series.py b/bazarr/subtitles/wanted/series.py index 4bc687415..dc5d19d8b 100644 --- a/bazarr/subtitles/wanted/series.py +++ b/bazarr/subtitles/wanted/series.py @@ -51,6 +51,7 @@ def _wanted_episode(episode): str(episode.sceneName), episode.title, 'series', + episode.profileId, check_if_still_required=True): if result: if isinstance(result, tuple) and len(result): @@ -71,7 +72,8 @@ def wanted_download_subtitles(sonarr_episode_id): TableEpisodes.audio_language, TableEpisodes.sceneName, TableEpisodes.failedAttempts, - TableShows.title) + TableShows.title, + TableShows.profileId) .select_from(TableEpisodes) .join(TableShows) .where((TableEpisodes.sonarrEpisodeId == sonarr_episode_id))) \