From a8e6b2c0b0814a69975666a5c59b5afcaa389550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Thu, 9 Jan 2020 19:54:00 -0500 Subject: [PATCH] WIP --- bazarr/api.py | 14 ++- views/_main.html | 4 + views/episodes.html | 291 +++++++++++++++++++++++++++++++++++++++++--- views/movies.html | 4 - views/series.html | 4 - 5 files changed, 291 insertions(+), 26 deletions(-) diff --git a/bazarr/api.py b/bazarr/api.py index 043581849..cdffa9706 100644 --- a/bazarr/api.py +++ b/bazarr/api.py @@ -108,6 +108,10 @@ class Episodes(Resource): if seriesId: result = database.execute("SELECT * FROM table_episodes WHERE sonarrSeriesId=? ORDER BY season DESC, " "episode DESC", (seriesId,)) + desired_languages = database.execute("SELECT languages FROM table_shows WHERE sonarrSeriesId=?", + (seriesId,), only_one=True)['languages'] + if desired_languages == "None": + desired_languages = '[]' else: return "Series ID not provided", 400 for item in result: @@ -137,6 +141,9 @@ class Episodes(Resource): # Confirm if path exist item.update({"exist": os.path.isfile(mapped_path)}) + + # Add the series desired subtitles language code2 + item.update({"desired_languages": desired_languages}) return jsonify(draw=draw, recordsTotal=row_count, recordsFiltered=row_count, data=result) class EpisodesSubtitlesDelete(Resource): @@ -151,11 +158,14 @@ class EpisodesSubtitlesDelete(Resource): os.remove(path_replace(subtitlesPath)) result = language_from_alpha3(language) + " subtitles deleted from disk." history_log(0, sonarrSeriesId, sonarrEpisodeId, result, language=alpha2_from_alpha3(language)) + store_subtitles(path_replace_reverse(episodePath), episodePath) + return result, 202 except OSError as e: logging.exception('BAZARR cannot delete subtitles file: ' + subtitlesPath) - store_subtitles(path_replace_reverse(episodePath), episodePath) - return '', 202 + store_subtitles(path_replace_reverse(episodePath), episodePath) + return '', 204 + class EpisodesSubtitlesDownload(Resource): def post(self): diff --git a/views/_main.html b/views/_main.html index a99e843d4..6e292114b 100644 --- a/views/_main.html +++ b/views/_main.html @@ -280,6 +280,10 @@ $(function () { $('[data-toggle="tooltip"]').tooltip({html: true}) }) + + $('.table').on('draw.dt', function () { + $('[data-toggle="tooltip"]').tooltip(); + }); {% endblock tail_js %} {% block tail %} diff --git a/views/episodes.html b/views/episodes.html index 5ba32364f..3a0d40a2c 100644 --- a/views/episodes.html +++ b/views/episodes.html @@ -98,16 +98,112 @@ + + + + {% endblock body %} {% block tail %} {% endblock tail %} diff --git a/views/movies.html b/views/movies.html index a7ecf6f4a..f54ffbb45 100644 --- a/views/movies.html +++ b/views/movies.html @@ -121,10 +121,6 @@ } ] }); - - $('#movies').on('draw.dt', function () { - $('[data-toggle="tooltip"]').tooltip(); - }); }); {% endblock tail %} diff --git a/views/series.html b/views/series.html index 531ce18e1..380c44c6b 100644 --- a/views/series.html +++ b/views/series.html @@ -123,10 +123,6 @@ } ] }); - - $('#series').on('draw.dt', function () { - $('[data-toggle="tooltip"]').tooltip(); - }); }); {% endblock tail %}