mirror of https://github.com/morpheus65535/bazarr
Fixed improper http status code returned that prevented proper cache management on browser side.
This commit is contained in:
parent
8895dd68a8
commit
77283e4063
|
@ -87,7 +87,7 @@ class EpisodesBlacklist(Resource):
|
||||||
@api_ns_episodes_blacklist.response(200, 'Success')
|
@api_ns_episodes_blacklist.response(200, 'Success')
|
||||||
@api_ns_episodes_blacklist.response(401, 'Not Authenticated')
|
@api_ns_episodes_blacklist.response(401, 'Not Authenticated')
|
||||||
@api_ns_episodes_blacklist.response(404, 'Episode not found')
|
@api_ns_episodes_blacklist.response(404, 'Episode not found')
|
||||||
@api_ns_episodes_blacklist.response(410, 'Subtitles file not found or permission issue.')
|
@api_ns_episodes_blacklist.response(500, 'Subtitles file not found or permission issue.')
|
||||||
def post(self):
|
def post(self):
|
||||||
"""Add an episodes subtitles to blacklist"""
|
"""Add an episodes subtitles to blacklist"""
|
||||||
args = self.post_request_parser.parse_args()
|
args = self.post_request_parser.parse_args()
|
||||||
|
@ -125,7 +125,7 @@ class EpisodesBlacklist(Resource):
|
||||||
event_stream(type='episode-history')
|
event_stream(type='episode-history')
|
||||||
return '', 200
|
return '', 200
|
||||||
else:
|
else:
|
||||||
return 'Subtitles file not found or permission issue.', 410
|
return 'Subtitles file not found or permission issue.', 500
|
||||||
|
|
||||||
delete_request_parser = reqparse.RequestParser()
|
delete_request_parser = reqparse.RequestParser()
|
||||||
delete_request_parser.add_argument('all', type=str, required=False, help='Empty episodes subtitles blacklist')
|
delete_request_parser.add_argument('all', type=str, required=False, help='Empty episodes subtitles blacklist')
|
||||||
|
|
|
@ -38,7 +38,7 @@ class EpisodesSubtitles(Resource):
|
||||||
@api_ns_episodes_subtitles.response(401, 'Not Authenticated')
|
@api_ns_episodes_subtitles.response(401, 'Not Authenticated')
|
||||||
@api_ns_episodes_subtitles.response(404, 'Episode not found')
|
@api_ns_episodes_subtitles.response(404, 'Episode not found')
|
||||||
@api_ns_episodes_subtitles.response(409, 'Unable to save subtitles file. Permission or path mapping issue?')
|
@api_ns_episodes_subtitles.response(409, 'Unable to save subtitles file. Permission or path mapping issue?')
|
||||||
@api_ns_episodes_subtitles.response(410, 'Episode file not found. Path mapping issue?')
|
@api_ns_episodes_subtitles.response(500, 'Episode file not found. Path mapping issue?')
|
||||||
def patch(self):
|
def patch(self):
|
||||||
"""Download an episode subtitles"""
|
"""Download an episode subtitles"""
|
||||||
args = self.patch_request_parser.parse_args()
|
args = self.patch_request_parser.parse_args()
|
||||||
|
@ -60,7 +60,7 @@ class EpisodesSubtitles(Resource):
|
||||||
episodePath = path_mappings.path_replace(episodeInfo.path)
|
episodePath = path_mappings.path_replace(episodeInfo.path)
|
||||||
|
|
||||||
if not os.path.exists(episodePath):
|
if not os.path.exists(episodePath):
|
||||||
return 'Episode file not found. Path mapping issue?', 410
|
return 'Episode file not found. Path mapping issue?', 500
|
||||||
|
|
||||||
sceneName = episodeInfo.sceneName or "None"
|
sceneName = episodeInfo.sceneName or "None"
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ class EpisodesSubtitles(Resource):
|
||||||
@api_ns_episodes_subtitles.response(401, 'Not Authenticated')
|
@api_ns_episodes_subtitles.response(401, 'Not Authenticated')
|
||||||
@api_ns_episodes_subtitles.response(404, 'Episode not found')
|
@api_ns_episodes_subtitles.response(404, 'Episode not found')
|
||||||
@api_ns_episodes_subtitles.response(409, 'Unable to save subtitles file. Permission or path mapping issue?')
|
@api_ns_episodes_subtitles.response(409, 'Unable to save subtitles file. Permission or path mapping issue?')
|
||||||
@api_ns_episodes_subtitles.response(410, 'Episode file not found. Path mapping issue?')
|
@api_ns_episodes_subtitles.response(500, 'Episode file not found. Path mapping issue?')
|
||||||
def post(self):
|
def post(self):
|
||||||
"""Upload an episode subtitles"""
|
"""Upload an episode subtitles"""
|
||||||
args = self.post_request_parser.parse_args()
|
args = self.post_request_parser.parse_args()
|
||||||
|
@ -124,7 +124,7 @@ class EpisodesSubtitles(Resource):
|
||||||
episodePath = path_mappings.path_replace(episodeInfo.path)
|
episodePath = path_mappings.path_replace(episodeInfo.path)
|
||||||
|
|
||||||
if not os.path.exists(episodePath):
|
if not os.path.exists(episodePath):
|
||||||
return 'Episode file not found. Path mapping issue?', 410
|
return 'Episode file not found. Path mapping issue?', 500
|
||||||
|
|
||||||
audio_language = get_audio_profile_languages(episodeInfo.audio_language)
|
audio_language = get_audio_profile_languages(episodeInfo.audio_language)
|
||||||
if len(audio_language) and isinstance(audio_language[0], dict):
|
if len(audio_language) and isinstance(audio_language[0], dict):
|
||||||
|
@ -178,7 +178,7 @@ class EpisodesSubtitles(Resource):
|
||||||
@api_ns_episodes_subtitles.response(204, 'Success')
|
@api_ns_episodes_subtitles.response(204, 'Success')
|
||||||
@api_ns_episodes_subtitles.response(401, 'Not Authenticated')
|
@api_ns_episodes_subtitles.response(401, 'Not Authenticated')
|
||||||
@api_ns_episodes_subtitles.response(404, 'Episode not found')
|
@api_ns_episodes_subtitles.response(404, 'Episode not found')
|
||||||
@api_ns_episodes_subtitles.response(410, 'Subtitles file not found or permission issue.')
|
@api_ns_episodes_subtitles.response(500, 'Subtitles file not found or permission issue.')
|
||||||
def delete(self):
|
def delete(self):
|
||||||
"""Delete an episode subtitles"""
|
"""Delete an episode subtitles"""
|
||||||
args = self.delete_request_parser.parse_args()
|
args = self.delete_request_parser.parse_args()
|
||||||
|
@ -211,4 +211,4 @@ class EpisodesSubtitles(Resource):
|
||||||
sonarr_episode_id=sonarrEpisodeId):
|
sonarr_episode_id=sonarrEpisodeId):
|
||||||
return '', 204
|
return '', 204
|
||||||
else:
|
else:
|
||||||
return 'Subtitles file not found or permission issue.', 410
|
return 'Subtitles file not found or permission issue.', 500
|
||||||
|
|
|
@ -80,7 +80,7 @@ class MoviesBlacklist(Resource):
|
||||||
@api_ns_movies_blacklist.response(200, 'Success')
|
@api_ns_movies_blacklist.response(200, 'Success')
|
||||||
@api_ns_movies_blacklist.response(401, 'Not Authenticated')
|
@api_ns_movies_blacklist.response(401, 'Not Authenticated')
|
||||||
@api_ns_movies_blacklist.response(404, 'Movie not found')
|
@api_ns_movies_blacklist.response(404, 'Movie not found')
|
||||||
@api_ns_movies_blacklist.response(410, 'Subtitles file not found or permission issue.')
|
@api_ns_movies_blacklist.response(500, 'Subtitles file not found or permission issue.')
|
||||||
def post(self):
|
def post(self):
|
||||||
"""Add a movies subtitles to blacklist"""
|
"""Add a movies subtitles to blacklist"""
|
||||||
args = self.post_request_parser.parse_args()
|
args = self.post_request_parser.parse_args()
|
||||||
|
@ -118,7 +118,7 @@ class MoviesBlacklist(Resource):
|
||||||
event_stream(type='movie-history')
|
event_stream(type='movie-history')
|
||||||
return '', 200
|
return '', 200
|
||||||
else:
|
else:
|
||||||
return 'Subtitles file not found or permission issue.', 410
|
return 'Subtitles file not found or permission issue.', 500
|
||||||
|
|
||||||
delete_request_parser = reqparse.RequestParser()
|
delete_request_parser = reqparse.RequestParser()
|
||||||
delete_request_parser.add_argument('all', type=str, required=False, help='Empty movies subtitles blacklist')
|
delete_request_parser.add_argument('all', type=str, required=False, help='Empty movies subtitles blacklist')
|
||||||
|
|
|
@ -165,7 +165,7 @@ class Movies(Resource):
|
||||||
@api_ns_movies.response(204, 'Success')
|
@api_ns_movies.response(204, 'Success')
|
||||||
@api_ns_movies.response(400, 'Unknown action')
|
@api_ns_movies.response(400, 'Unknown action')
|
||||||
@api_ns_movies.response(401, 'Not Authenticated')
|
@api_ns_movies.response(401, 'Not Authenticated')
|
||||||
@api_ns_movies.response(410, 'Movie file not found. Path mapping issue?')
|
@api_ns_movies.response(500, 'Movie file not found. Path mapping issue?')
|
||||||
def patch(self):
|
def patch(self):
|
||||||
"""Run actions on specific movies"""
|
"""Run actions on specific movies"""
|
||||||
args = self.patch_request_parser.parse_args()
|
args = self.patch_request_parser.parse_args()
|
||||||
|
@ -178,7 +178,7 @@ class Movies(Resource):
|
||||||
try:
|
try:
|
||||||
movies_download_subtitles(radarrid)
|
movies_download_subtitles(radarrid)
|
||||||
except OSError:
|
except OSError:
|
||||||
return 'Movie file not found. Path mapping issue?', 410
|
return 'Movie file not found. Path mapping issue?', 500
|
||||||
else:
|
else:
|
||||||
return '', 204
|
return '', 204
|
||||||
elif action == "search-wanted":
|
elif action == "search-wanted":
|
||||||
|
|
|
@ -37,7 +37,7 @@ class MoviesSubtitles(Resource):
|
||||||
@api_ns_movies_subtitles.response(401, 'Not Authenticated')
|
@api_ns_movies_subtitles.response(401, 'Not Authenticated')
|
||||||
@api_ns_movies_subtitles.response(404, 'Movie not found')
|
@api_ns_movies_subtitles.response(404, 'Movie not found')
|
||||||
@api_ns_movies_subtitles.response(409, 'Unable to save subtitles file. Permission or path mapping issue?')
|
@api_ns_movies_subtitles.response(409, 'Unable to save subtitles file. Permission or path mapping issue?')
|
||||||
@api_ns_movies_subtitles.response(410, 'Movie file not found. Path mapping issue?')
|
@api_ns_movies_subtitles.response(500, 'Movie file not found. Path mapping issue?')
|
||||||
def patch(self):
|
def patch(self):
|
||||||
"""Download a movie subtitles"""
|
"""Download a movie subtitles"""
|
||||||
args = self.patch_request_parser.parse_args()
|
args = self.patch_request_parser.parse_args()
|
||||||
|
@ -58,7 +58,7 @@ class MoviesSubtitles(Resource):
|
||||||
moviePath = path_mappings.path_replace_movie(movieInfo.path)
|
moviePath = path_mappings.path_replace_movie(movieInfo.path)
|
||||||
|
|
||||||
if not os.path.exists(moviePath):
|
if not os.path.exists(moviePath):
|
||||||
return 'Movie file not found. Path mapping issue?', 410
|
return 'Movie file not found. Path mapping issue?', 500
|
||||||
|
|
||||||
sceneName = movieInfo.sceneName or 'None'
|
sceneName = movieInfo.sceneName or 'None'
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ class MoviesSubtitles(Resource):
|
||||||
@api_ns_movies_subtitles.response(401, 'Not Authenticated')
|
@api_ns_movies_subtitles.response(401, 'Not Authenticated')
|
||||||
@api_ns_movies_subtitles.response(404, 'Movie not found')
|
@api_ns_movies_subtitles.response(404, 'Movie not found')
|
||||||
@api_ns_movies_subtitles.response(409, 'Unable to save subtitles file. Permission or path mapping issue?')
|
@api_ns_movies_subtitles.response(409, 'Unable to save subtitles file. Permission or path mapping issue?')
|
||||||
@api_ns_movies_subtitles.response(410, 'Movie file not found. Path mapping issue?')
|
@api_ns_movies_subtitles.response(500, 'Movie file not found. Path mapping issue?')
|
||||||
def post(self):
|
def post(self):
|
||||||
"""Upload a movie subtitles"""
|
"""Upload a movie subtitles"""
|
||||||
# TODO: Support Multiply Upload
|
# TODO: Support Multiply Upload
|
||||||
|
@ -120,7 +120,7 @@ class MoviesSubtitles(Resource):
|
||||||
moviePath = path_mappings.path_replace_movie(movieInfo.path)
|
moviePath = path_mappings.path_replace_movie(movieInfo.path)
|
||||||
|
|
||||||
if not os.path.exists(moviePath):
|
if not os.path.exists(moviePath):
|
||||||
return 'Movie file not found. Path mapping issue?', 410
|
return 'Movie file not found. Path mapping issue?', 500
|
||||||
|
|
||||||
audio_language = get_audio_profile_languages(movieInfo.audio_language)
|
audio_language = get_audio_profile_languages(movieInfo.audio_language)
|
||||||
if len(audio_language) and isinstance(audio_language[0], dict):
|
if len(audio_language) and isinstance(audio_language[0], dict):
|
||||||
|
@ -174,7 +174,7 @@ class MoviesSubtitles(Resource):
|
||||||
@api_ns_movies_subtitles.response(204, 'Success')
|
@api_ns_movies_subtitles.response(204, 'Success')
|
||||||
@api_ns_movies_subtitles.response(401, 'Not Authenticated')
|
@api_ns_movies_subtitles.response(401, 'Not Authenticated')
|
||||||
@api_ns_movies_subtitles.response(404, 'Movie not found')
|
@api_ns_movies_subtitles.response(404, 'Movie not found')
|
||||||
@api_ns_movies_subtitles.response(410, 'Subtitles file not found or permission issue.')
|
@api_ns_movies_subtitles.response(500, 'Subtitles file not found or permission issue.')
|
||||||
def delete(self):
|
def delete(self):
|
||||||
"""Delete a movie subtitles"""
|
"""Delete a movie subtitles"""
|
||||||
args = self.delete_request_parser.parse_args()
|
args = self.delete_request_parser.parse_args()
|
||||||
|
@ -205,4 +205,4 @@ class MoviesSubtitles(Resource):
|
||||||
radarr_id=radarrId):
|
radarr_id=radarrId):
|
||||||
return '', 204
|
return '', 204
|
||||||
else:
|
else:
|
||||||
return 'Subtitles file not found or permission issue.', 410
|
return 'Subtitles file not found or permission issue.', 500
|
||||||
|
|
|
@ -43,7 +43,7 @@ class ProviderEpisodes(Resource):
|
||||||
@authenticate
|
@authenticate
|
||||||
@api_ns_providers_episodes.response(401, 'Not Authenticated')
|
@api_ns_providers_episodes.response(401, 'Not Authenticated')
|
||||||
@api_ns_providers_episodes.response(404, 'Episode not found')
|
@api_ns_providers_episodes.response(404, 'Episode not found')
|
||||||
@api_ns_providers_episodes.response(410, 'Episode file not found. Path mapping issue?')
|
@api_ns_providers_episodes.response(500, 'Episode file not found. Path mapping issue?')
|
||||||
@api_ns_providers_episodes.doc(parser=get_request_parser)
|
@api_ns_providers_episodes.doc(parser=get_request_parser)
|
||||||
def get(self):
|
def get(self):
|
||||||
"""Search manually for an episode subtitles"""
|
"""Search manually for an episode subtitles"""
|
||||||
|
@ -66,7 +66,7 @@ class ProviderEpisodes(Resource):
|
||||||
episodePath = path_mappings.path_replace(episodeInfo.path)
|
episodePath = path_mappings.path_replace(episodeInfo.path)
|
||||||
|
|
||||||
if not os.path.exists(episodePath):
|
if not os.path.exists(episodePath):
|
||||||
return 'Episode file not found. Path mapping issue?', 410
|
return 'Episode file not found. Path mapping issue?', 500
|
||||||
|
|
||||||
sceneName = episodeInfo.sceneName or "None"
|
sceneName = episodeInfo.sceneName or "None"
|
||||||
profileId = episodeInfo.profileId
|
profileId = episodeInfo.profileId
|
||||||
|
|
|
@ -44,7 +44,7 @@ class ProviderMovies(Resource):
|
||||||
@authenticate
|
@authenticate
|
||||||
@api_ns_providers_movies.response(401, 'Not Authenticated')
|
@api_ns_providers_movies.response(401, 'Not Authenticated')
|
||||||
@api_ns_providers_movies.response(404, 'Movie not found')
|
@api_ns_providers_movies.response(404, 'Movie not found')
|
||||||
@api_ns_providers_movies.response(410, 'Movie file not found. Path mapping issue?')
|
@api_ns_providers_movies.response(500, 'Movie file not found. Path mapping issue?')
|
||||||
@api_ns_providers_movies.doc(parser=get_request_parser)
|
@api_ns_providers_movies.doc(parser=get_request_parser)
|
||||||
def get(self):
|
def get(self):
|
||||||
"""Search manually for a movie subtitles"""
|
"""Search manually for a movie subtitles"""
|
||||||
|
@ -65,7 +65,7 @@ class ProviderMovies(Resource):
|
||||||
moviePath = path_mappings.path_replace_movie(movieInfo.path)
|
moviePath = path_mappings.path_replace_movie(movieInfo.path)
|
||||||
|
|
||||||
if not os.path.exists(moviePath):
|
if not os.path.exists(moviePath):
|
||||||
return 'Movie file not found. Path mapping issue?', 410
|
return 'Movie file not found. Path mapping issue?', 500
|
||||||
|
|
||||||
sceneName = movieInfo.sceneName or "None"
|
sceneName = movieInfo.sceneName or "None"
|
||||||
profileId = movieInfo.profileId
|
profileId = movieInfo.profileId
|
||||||
|
|
|
@ -198,7 +198,7 @@ class Series(Resource):
|
||||||
@api_ns_series.response(204, 'Success')
|
@api_ns_series.response(204, 'Success')
|
||||||
@api_ns_series.response(400, 'Unknown action')
|
@api_ns_series.response(400, 'Unknown action')
|
||||||
@api_ns_series.response(401, 'Not Authenticated')
|
@api_ns_series.response(401, 'Not Authenticated')
|
||||||
@api_ns_series.response(410, 'Series directory not found. Path mapping issue?')
|
@api_ns_series.response(500, 'Series directory not found. Path mapping issue?')
|
||||||
def patch(self):
|
def patch(self):
|
||||||
"""Run actions on specific series"""
|
"""Run actions on specific series"""
|
||||||
args = self.patch_request_parser.parse_args()
|
args = self.patch_request_parser.parse_args()
|
||||||
|
@ -211,7 +211,7 @@ class Series(Resource):
|
||||||
try:
|
try:
|
||||||
series_download_subtitles(seriesid)
|
series_download_subtitles(seriesid)
|
||||||
except OSError:
|
except OSError:
|
||||||
return 'Series directory not found. Path mapping issue?', 410
|
return 'Series directory not found. Path mapping issue?', 500
|
||||||
else:
|
else:
|
||||||
return '', 204
|
return '', 204
|
||||||
elif action == "search-wanted":
|
elif action == "search-wanted":
|
||||||
|
|
|
@ -43,7 +43,7 @@ class Subtitles(Resource):
|
||||||
@api_ns_subtitles.response(401, 'Not Authenticated')
|
@api_ns_subtitles.response(401, 'Not Authenticated')
|
||||||
@api_ns_subtitles.response(404, 'Episode/movie not found')
|
@api_ns_subtitles.response(404, 'Episode/movie not found')
|
||||||
@api_ns_subtitles.response(409, 'Unable to edit subtitles file. Check logs.')
|
@api_ns_subtitles.response(409, 'Unable to edit subtitles file. Check logs.')
|
||||||
@api_ns_subtitles.response(410, 'Subtitles file not found. Path mapping issue?')
|
@api_ns_subtitles.response(500, 'Subtitles file not found. Path mapping issue?')
|
||||||
def patch(self):
|
def patch(self):
|
||||||
"""Apply mods/tools on external subtitles"""
|
"""Apply mods/tools on external subtitles"""
|
||||||
args = self.patch_request_parser.parse_args()
|
args = self.patch_request_parser.parse_args()
|
||||||
|
@ -55,7 +55,7 @@ class Subtitles(Resource):
|
||||||
id = args.get('id')
|
id = args.get('id')
|
||||||
|
|
||||||
if not os.path.exists(subtitles_path):
|
if not os.path.exists(subtitles_path):
|
||||||
return 'Subtitles file not found. Path mapping issue?', 410
|
return 'Subtitles file not found. Path mapping issue?', 500
|
||||||
|
|
||||||
if media_type == 'episode':
|
if media_type == 'episode':
|
||||||
metadata = database.execute(
|
metadata = database.execute(
|
||||||
|
|
Loading…
Reference in New Issue