From 1d5766b29e51ef472dd64e0cfc7bc7d982c4f432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Sun, 16 Jun 2019 19:29:28 -0400 Subject: [PATCH] Fix for movies history logging. --- bazarr/get_subtitle.py | 6 +++--- bazarr/main.py | 4 ++-- bazarr/utils.py | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/bazarr/get_subtitle.py b/bazarr/get_subtitle.py index 1305e89df..6aa73f0d1 100644 --- a/bazarr/get_subtitle.py +++ b/bazarr/get_subtitle.py @@ -579,7 +579,7 @@ def movies_download_subtitles(no): message = result[0] path = result[1] forced = result[5] - language_code = result[2] + ":forced" if forced else "" + language_code = result[2] + ":forced" if forced else result[2] provider = result[3] score = result[4] store_subtitles_movie(path_replace_movie(movie[0])) @@ -691,7 +691,7 @@ def wanted_download_subtitles_movie(path, l, count_movies): message = result[0] path = result[1] forced = result[5] - language_code = result[2] + ":forced" if forced else "" + language_code = result[2] + ":forced" if forced else result[2] provider = result[3] score = result[4] store_subtitles_movie(path_replace_movie(movie[0])) @@ -941,7 +941,7 @@ def upgrade_subtitles(): message = result[0] path = result[1] forced = result[5] - language_code = result[2] + ":forced" if forced else "" + language_code = result[2] + ":forced" if forced else result[2] provider = result[3] score = result[4] store_subtitles_movie(path_replace_movie(movie[0])) diff --git a/bazarr/main.py b/bazarr/main.py index 37c249f6d..63883b6bd 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -1929,7 +1929,7 @@ def get_subtitle_movie(): message = result[0] path = result[1] forced = result[5] - language_code = result[2] + ":forced" if forced else "" + language_code = result[2] + ":forced" if forced else result[2] provider = result[3] score = result[4] history_log_movie(1, radarrId, message, path, language_code, provider, score) @@ -1985,7 +1985,7 @@ def manual_get_subtitle_movie(): message = result[0] path = result[1] forced = result[5] - language_code = result[2] + ":forced" if forced else "" + language_code = result[2] + ":forced" if forced else result[2] provider = result[3] score = result[4] history_log_movie(2, radarrId, message, path, language_code, provider, score) diff --git a/bazarr/utils.py b/bazarr/utils.py index 5e8fe4cdd..f92726454 100644 --- a/bazarr/utils.py +++ b/bazarr/utils.py @@ -32,9 +32,6 @@ def history_log_movie(action, radarrId, description, video_path=None, language=N db = sqlite3.connect(os.path.join(args.config_dir, 'db', 'bazarr.db'), timeout=30) c = db.cursor() - if forced: - language = language + ":forced" - history = c.execute( '''INSERT INTO table_history_movie(action, radarrId, timestamp, description, video_path, language, provider, score) VALUES (?, ?, ?, ?, ?, ?, ?, ?)''', (action, radarrId, time.time(), description, video_path, language, provider, score))