Merge development into master

Author: github-actions[bot]

README.md

@@ -73,7 +73,6 @@ If you need something that is not already part of Bazarr, feel free to create a
 - Podnapisi
 - RegieLive
 - Sous-Titres.eu
-- Subdivx
 - subf2m.co
 - Subs.sab.bz
 - Subs4Free
@@ -87,6 +86,7 @@ If you need something that is not already part of Bazarr, feel free to create a
 - Subtitrari-noi.ro
 - subtitri.id.lv
 - Subtitulamos.tv
+- SubX
 - Supersubtitles
 - Titlovi
 - Titrari.ro

bazarr/api/episodes/episodes_subtitles.py

@@ -1,8 +1,8 @@
 # coding=utf-8
 
 import os
-import time
 
+from io import BytesIO
 from flask_restx import Resource, Namespace, reqparse
 from subliminal_patch.core import SUBTITLE_EXTENSIONS
 from werkzeug.datastructures import FileStorage
@@ -42,16 +42,12 @@ def patch(self):
         """Download an episode subtitles"""
         args = self.patch_request_parser.parse_args()
 
-        job_id = episode_download_specific_subtitles(sonarr_series_id=args.get('seriesid'),
-                                                     sonarr_episode_id=args.get('episodeid'),
-                                                     language=args.get('language'), hi=args.get('hi').capitalize(),
-                                                     forced=args.get('forced').capitalize(), job_id=None)
+        episode_download_specific_subtitles(sonarr_series_id=args.get('seriesid'),
+                                            sonarr_episode_id=args.get('episodeid'),
+                                            language=args.get('language'), hi=args.get('hi').capitalize(),
+                                            forced=args.get('forced').capitalize(), job_id=None)
 
-        # Wait for the job to complete or fail
-        while jobs_queue.get_job_status(job_id=job_id) in ['pending', 'running']:
-            time.sleep(1)
-
-        return jobs_queue.get_job_returned_value(job_id=job_id)
+        return '', 204
 
     post_request_parser = reqparse.RequestParser()
     post_request_parser.add_argument('seriesid', type=int, required=True, help='Series ID')
@@ -73,7 +69,8 @@ def post(self):
         """Upload an episode subtitles"""
         args = self.post_request_parser.parse_args()
 
-        _, ext = os.path.splitext(args.get('file').filename)
+        uploaded_file = args.get('file')
+        _, ext = os.path.splitext(uploaded_file.filename)
 
         if not isinstance(ext, str) or ext.lower() not in SUBTITLE_EXTENSIONS:
             raise ValueError('A subtitle of an invalid format was uploaded.')
@@ -94,21 +91,20 @@ def post(self):
         if not os.path.exists(episodePath):
             return 'Episode file not found. Path mapping issue?', 500
 
-        job_id = manual_upload_subtitle(path=episodePath,
-                                        language=args.get('language'),
-                                        forced=True if args.get('forced') == 'true' else False,
-                                        hi=True if args.get('hi') == 'true' else False,
-                                        media_type='series',
-                                        subtitle=args.get('file'),
-                                        audio_language=episodeInfo.audio_language,
-                                        sonarrSeriesId=sonarrSeriesId,
-                                        sonarrEpisodeId=sonarrEpisodeId)
-
-        # Wait for the job to complete or fail
-        while jobs_queue.get_job_status(job_id=job_id) in ['pending', 'running']:
-            time.sleep(1)
-
-        return jobs_queue.get_job_returned_value(job_id=job_id)
+        subtitle_content = BytesIO(uploaded_file.read())
+
+        manual_upload_subtitle(path=episodePath,
+                               language=args.get('language'),
+                               forced=True if args.get('forced') == 'true' else False,
+                               hi=True if args.get('hi') == 'true' else False,
+                               media_type='series',
+                               subtitle=subtitle_content,
+                               filename=uploaded_file.filename,
+                               audio_language=episodeInfo.audio_language,
+                               sonarrSeriesId=sonarrSeriesId,
+                               sonarrEpisodeId=sonarrEpisodeId)
+
+        return '', 204
 
     delete_request_parser = reqparse.RequestParser()
     delete_request_parser.add_argument('seriesid', type=int, required=True, help='Series ID')

bazarr/api/episodes/history.py

@@ -62,8 +62,6 @@ def get(self):
         length = args.get('length')
         episodeid = args.get('episodeid')
 
-        upgradable_episodes_not_perfect = get_upgradable_episode_subtitles()
-
         blacklisted_subtitles = select(TableBlacklist.provider,
                                        TableBlacklist.subs_id) \
             .subquery()
@@ -131,6 +129,9 @@ def get(self):
             'blacklisted': bool(x.blacklisted),
         } for x in database.execute(stmt).all()]
 
+        upgradable_episodes_not_perfect = get_upgradable_episode_subtitles(history_id_list=[x['id'] for x in
+                                                                                            episode_history])
+
         for item in episode_history:
             # is this language still desired or should we simply skip this subtitles from upgrade logic?
             still_desired = _language_still_desired(item['language'], item['profileId'])
@@ -139,7 +140,7 @@ def get(self):
 
             # Mark upgradable and get original_id
             item.update({'original_id': upgradable_episodes_not_perfect.get(item['id'])})
-            item.update({'upgradable': bool(item['original_id'])})
+            item.update({'upgradable': item['id'] in upgradable_episodes_not_perfect.keys()})
 
             # Mark not upgradable if video/subtitles file doesn't exist anymore or if language isn't desired anymore
             if item['upgradable']:

bazarr/api/movies/history.py

@@ -61,8 +61,6 @@ def get(self):
         length = args.get('length')
         radarrid = args.get('radarrid')
 
-        upgradable_movies_not_perfect = get_upgradable_movies_subtitles()
-
         blacklisted_subtitles = select(TableBlacklistMovie.provider,
                                        TableBlacklistMovie.subs_id) \
             .subquery()
@@ -122,6 +120,9 @@ def get(self):
             'blacklisted': bool(x.blacklisted),
         } for x in database.execute(stmt).all()]
 
+        upgradable_movies_not_perfect = get_upgradable_movies_subtitles(history_id_list=[x['id'] for x in
+                                                                                         movie_history])
+
         for item in movie_history:
             # is this language still desired or should we simply skip this subtitles from upgrade logic?
             still_desired = _language_still_desired(item['language'], item['profileId'])
@@ -130,7 +131,7 @@ def get(self):
 
             # Mark upgradable and get original_id
             item.update({'original_id': upgradable_movies_not_perfect.get(item['id'])})
-            item.update({'upgradable': bool(item['original_id'])})
+            item.update({'upgradable': item['id'] in upgradable_movies_not_perfect.keys()})
 
             # Mark not upgradable if video/subtitles file doesn't exist anymore or if language isn't desired anymore
             if item['upgradable']:

bazarr/api/movies/movies_subtitles.py

@@ -1,8 +1,8 @@
 # coding=utf-8
 
 import os
-import time
 
+from io import BytesIO
 from flask_restx import Resource, Namespace, reqparse
 from subliminal_patch.core import SUBTITLE_EXTENSIONS
 from werkzeug.datastructures import FileStorage
@@ -41,15 +41,11 @@ def patch(self):
         """Download a movie subtitles"""
         args = self.patch_request_parser.parse_args()
 
-        job_id = movie_download_specific_subtitles(radarr_id=args.get('radarrid'), language=args.get('language'),
-                                                   hi=args.get('hi').capitalize(),
-                                                   forced=args.get('forced').capitalize(), job_id=None)
+        movie_download_specific_subtitles(radarr_id=args.get('radarrid'), language=args.get('language'),
+                                          hi=args.get('hi').capitalize(),
+                                          forced=args.get('forced').capitalize(), job_id=None)
 
-        # Wait for the job to complete or fail
-        while jobs_queue.get_job_status(job_id=job_id) in ['pending', 'running']:
-            time.sleep(1)
-
-        return jobs_queue.get_job_returned_value(job_id=job_id)
+        return '', 204
 
     # POST: Upload Subtitles
     post_request_parser = reqparse.RequestParser()
@@ -72,7 +68,8 @@ def post(self):
         # TODO: Support Multiply Upload
         args = self.post_request_parser.parse_args()
 
-        _, ext = os.path.splitext(args.get('file').filename)
+        uploaded_file = args.get('file')
+        _, ext = os.path.splitext(uploaded_file.filename)
 
         if not isinstance(ext, str) or ext.lower() not in SUBTITLE_EXTENSIONS:
             raise ValueError('A subtitle of an invalid format was uploaded.')
@@ -91,20 +88,19 @@ def post(self):
         if not os.path.exists(moviePath):
             return 'Movie file not found. Path mapping issue?', 500
 
-        job_id = manual_upload_subtitle(path=moviePath,
-                                        language=args.get('language'),
-                                        forced=True if args.get('forced') == 'true' else False,
-                                        hi=True if args.get('hi') == 'true' else False,
-                                        media_type='movie',
-                                        subtitle=args.get('file'),
-                                        audio_language=movieInfo.audio_language,
-                                        radarrId=radarrId)
+        subtitle_content = BytesIO(uploaded_file.read())
 
-        # Wait for the job to complete or fail
-        while jobs_queue.get_job_status(job_id=job_id) in ['pending', 'running']:
-            time.sleep(1)
+        manual_upload_subtitle(path=moviePath,
+                               language=args.get('language'),
+                               forced=True if args.get('forced') == 'true' else False,
+                               hi=True if args.get('hi') == 'true' else False,
+                               media_type='movie',
+                               subtitle=subtitle_content,
+                               filename=uploaded_file.filename,
+                               audio_language=movieInfo.audio_language,
+                               radarrId=radarrId)
 
-        return jobs_queue.get_job_returned_value(job_id=job_id)
+        return '', 204
 
     # DELETE: Delete Subtitles
     delete_request_parser = reqparse.RequestParser()

bazarr/api/plex/oauth.py

@@ -954,7 +954,16 @@ def post(self):
             instance_param = quote_plus(instance_name)
 
             scheme = 'https' if request.is_secure else 'http'
-            host = request.host
+
+            host = settings.general.get('hostname', None)
+            if not host:
+                logger.error("Hostname must be configured in General Settings before creating webhooks. This prevents "
+                             "host header poisoning attacks.")
+                return {
+                    'error': 'Hostname must be configured in General Settings before creating webhooks. '
+                             'This prevents host header poisoning attacks.'
+                }, 400
+
             if configured_base_url:
                 webhook_url = f"{scheme}://{host}{configured_base_url}/api/webhooks/plex?apikey={apikey}&instance={instance_param}"
                 logger.info(f"Using configured base URL for webhook: {scheme}://{host}{configured_base_url}/api/webhooks/plex (instance: {instance_name})")

bazarr/api/providers/providers_episodes.py

@@ -1,7 +1,6 @@
 # coding=utf-8
 
 import os
-import time
 
 from flask_restx import Resource, Namespace, reqparse, fields, marshal
 
@@ -107,17 +106,13 @@ def post(self):
         """Manually download an episode subtitles"""
         args = self.post_request_parser.parse_args()
 
-        job_id = episode_manually_download_specific_subtitle(sonarr_series_id=args.get('seriesid'),
-                                                             sonarr_episode_id=args.get('episodeid'),
-                                                             hi=args.get('hi').capitalize(),
-                                                             forced=args.get('forced').capitalize(),
-                                                             use_original_format=args.get('original_format').capitalize(),
-                                                             selected_provider=args.get('provider'),
-                                                             subtitle=args.get('subtitle'),
-                                                             job_id=None)
+        episode_manually_download_specific_subtitle(sonarr_series_id=args.get('seriesid'),
+                                                    sonarr_episode_id=args.get('episodeid'),
+                                                    hi=args.get('hi').capitalize(),
+                                                    forced=args.get('forced').capitalize(),
+                                                    use_original_format=args.get('original_format').capitalize(),
+                                                    selected_provider=args.get('provider'),
+                                                    subtitle=args.get('subtitle'),
+                                                    job_id=None)
 
-        # Wait for the job to complete or fail
-        while jobs_queue.get_job_status(job_id=job_id) in ['pending', 'running']:
-            time.sleep(1)
-
-        return jobs_queue.get_job_returned_value(job_id=job_id)
+        return '', 204

bazarr/api/providers/providers_movies.py

@@ -1,7 +1,6 @@
 # coding=utf-8
 
 import os
-import time
 
 from flask_restx import Resource, Namespace, reqparse, fields, marshal
 
@@ -105,16 +104,12 @@ def post(self):
         """Manually download a movie subtitles"""
         args = self.post_request_parser.parse_args()
 
-        job_id = movie_manually_download_specific_subtitle(radarr_id=args.get('radarrid'),
-                                                           hi=args.get('hi').capitalize(),
-                                                           forced=args.get('forced').capitalize(),
-                                                           use_original_format=args.get('original_format').capitalize(),
-                                                           selected_provider=args.get('provider'),
-                                                           subtitle=args.get('subtitle'),
-                                                           job_id=None)
+        movie_manually_download_specific_subtitle(radarr_id=args.get('radarrid'),
+                                                  hi=args.get('hi').capitalize(),
+                                                  forced=args.get('forced').capitalize(),
+                                                  use_original_format=args.get('original_format').capitalize(),
+                                                  selected_provider=args.get('provider'),
+                                                  subtitle=args.get('subtitle'),
+                                                  job_id=None)
 
-        # Wait for the job to complete or fail
-        while jobs_queue.get_job_status(job_id=job_id) in ['pending', 'running']:
-            time.sleep(1)
-
-        return jobs_queue.get_job_returned_value(job_id=job_id)
+        return '', 204

bazarr/api/subtitles/subtitles.py

@@ -2,11 +2,10 @@
 
 import os
 import sys
-import gc
 
 from flask_restx import Resource, Namespace, reqparse, fields, marshal
 
-from app.database import TableEpisodes, TableMovies, database, select
+from app.database import TableShows, TableEpisodes, TableMovies, database, select
 from languages.get_languages import alpha3_from_alpha2
 from utilities.path_mappings import path_mappings
 from utilities.video_analyzer import subtitles_sync_references
@@ -18,6 +17,8 @@
 from subtitles.sync import sync_subtitles
 from app.config import settings, empty_values, get_array_from
 from app.event_handler import event_stream
+from plex.operations import plex_refresh_item
+
 
 from ..utils import authenticate
 
@@ -122,7 +123,9 @@ def patch(self):
 
         if media_type == 'episode':
             metadata = database.execute(
-                select(TableEpisodes.path, TableEpisodes.sonarrSeriesId, TableEpisodes.subtitles)
+                select(TableEpisodes.path, TableEpisodes.sonarrSeriesId, TableEpisodes.subtitles, TableEpisodes.season,
+                       TableEpisodes.episode, TableShows.imdbId)
+                .join(TableShows)
                 .where(TableEpisodes.sonarrEpisodeId == id)) \
                 .first()
 
@@ -132,7 +135,7 @@ def patch(self):
             video_path = path_mappings.path_replace(metadata.path)
         else:
             metadata = database.execute(
-                select(TableMovies.path, TableMovies.subtitles)
+                select(TableMovies.path, TableMovies.subtitles, TableMovies.imdbId)
                 .where(TableMovies.radarrId == id))\
                 .first()
 
@@ -190,7 +193,6 @@ def patch(self):
                 except OSError:
                     return 'Unable to edit subtitles file. Check logs.', 409
         else:
-            use_original_format = True if args.get('original_format') == 'true' else False
             try:
                 subtitles_apply_mods(language=language, subtitle_path=subtitles_path, mods=[action],
                                      video_path=video_path)
@@ -207,10 +209,17 @@ def patch(self):
             store_subtitles(path_mappings.path_replace_reverse(video_path), video_path)
             event_stream(type='series', payload=metadata.sonarrSeriesId)
             event_stream(type='episode', payload=id)
+
+            if settings.general.use_plex and settings.plex.update_series_library:
+                plex_refresh_item(metadata.imdbId, is_movie=False, season=metadata.season,
+                                  episode=metadata.episode)
         else:
             store_subtitles_movie(path_mappings.path_replace_reverse_movie(video_path), video_path)
             event_stream(type='movie', payload=id)
 
+            if settings.general.use_plex and settings.plex.update_movie_library:
+                plex_refresh_item(metadata.imdbId, is_movie=True)
+
         return '', 204
 
 

bazarr/api/system/account.py

@@ -28,7 +28,7 @@ class SystemAccount(Resource):
     def post(self):
         """Login or logout from Bazarr UI when using form login"""
         args = self.post_request_parser.parse_args()
-        if settings.auth.type != 'form':
+        if settings.auth.type not in ['form', 'basic']:
             return 'Unknown authentication type define in config', 500
 
         action = args.get('action')