From 99308ce594cdbcf424c3bfe311a5d121953274e2 Mon Sep 17 00:00:00 2001 From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com> Date: Sun, 5 Aug 2018 00:32:53 -0400 Subject: [PATCH 1/5] Fix for #69 --- get_general_settings.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/get_general_settings.py b/get_general_settings.py index 3794c6d6f..a21b8f631 100644 --- a/get_general_settings.py +++ b/get_general_settings.py @@ -50,10 +50,10 @@ def get_general_settings(): movie_default_language = general_settings[21] movie_default_hi = general_settings[22] page_size = general_settings[23] - use_embedded_subs = general_settings[24] - minimum_score_movie = general_settings[25] + minimum_score_movie = general_settings[24] + use_embedded_subs = general_settings[25] - return [ip, port, base_url, path_mappings, log_level, branch, automatic, single_language, minimum_score, use_scenename, use_postprocessing, postprocessing_cmd, use_sonarr, use_radarr, path_mappings_movie, serie_default_enabled, serie_default_language, serie_default_hi, movie_default_enabled,movie_default_language, movie_default_hi, page_size, use_embedded_subs, minimum_score_movie] + return [ip, port, base_url, path_mappings, log_level, branch, automatic, single_language, minimum_score, use_scenename, use_postprocessing, postprocessing_cmd, use_sonarr, use_radarr, path_mappings_movie, serie_default_enabled, serie_default_language, serie_default_hi, movie_default_enabled,movie_default_language, movie_default_hi, page_size, minimum_score_movie, use_embedded_subs] def path_replace(path): for path_mapping in path_mappings: @@ -132,5 +132,5 @@ movie_default_enabled = result[18] movie_default_language = result[19] movie_default_hi = result[20] page_size = result[21] -use_embedded_subs = result[22] -minimum_score_movie = result[23] \ No newline at end of file +minimum_score_movie = result[22] +use_embedded_subs = result[23] From fa0ffafbcf462cdc116deeffa6cd5db4e43feb99 Mon Sep 17 00:00:00 2001 From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com> Date: Sun, 5 Aug 2018 00:34:05 -0400 Subject: [PATCH 2/5] Fix for #69 --- views/settings.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/settings.tpl b/views/settings.tpl index e9d706e07..b7f802406 100644 --- a/views/settings.tpl +++ b/views/settings.tpl @@ -837,7 +837,7 @@
- +
@@ -855,7 +855,7 @@
-
+
@@ -1618,4 +1618,4 @@ $('.form').form('validate form'); $('#loader').removeClass('active'); }) - \ No newline at end of file + From e4ed6d247cf981488f79f1327cec8cf0da8282a3 Mon Sep 17 00:00:00 2001 From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com> Date: Sun, 5 Aug 2018 00:44:55 -0400 Subject: [PATCH 3/5] Fix for #69 --- list_subtitles.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/list_subtitles.py b/list_subtitles.py index 6dc6f3766..ca3ab80a7 100644 --- a/list_subtitles.py +++ b/list_subtitles.py @@ -133,7 +133,7 @@ def list_missing_subtitles(*no): c_db.close() missing_subtitles_global = [] - use_embedded_subs = get_general_settings()[22] + use_embedded_subs = get_general_settings()[23] for episode_subtitles in episodes_subtitles: actual_subtitles_temp = [] actual_subtitles = [] @@ -180,7 +180,7 @@ def list_missing_subtitles_movies(*no): c_db.close() missing_subtitles_global = [] - use_embedded_subs = get_general_settings()[22] + use_embedded_subs = get_general_settings()[23] for movie_subtitles in movies_subtitles: actual_subtitles_temp = [] actual_subtitles = [] @@ -257,4 +257,4 @@ def movies_scan_subtitles(no): for movie in movies: store_subtitles_movie(path_replace_movie(movie[0])) - list_missing_subtitles_movies(no) \ No newline at end of file + list_missing_subtitles_movies(no) From 93ffd4b60f2f62008f957b53120ba5a66bf30aaa Mon Sep 17 00:00:00 2001 From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com> Date: Sun, 5 Aug 2018 20:39:10 -0400 Subject: [PATCH 4/5] Fix for #95 --- get_subtitle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get_subtitle.py b/get_subtitle.py index 6bca5a1af..1410ea15f 100644 --- a/get_subtitle.py +++ b/get_subtitle.py @@ -21,7 +21,7 @@ def download_subtitle(path, language, hi, providers, providers_auth, sceneName, minimum_score = float(get_general_settings()[8]) / 100 * type_of_score elif type == 'movies': type_of_score = 119 - minimum_score = float(get_general_settings()[23]) / 100 * type_of_score + minimum_score = float(get_general_settings()[22]) / 100 * type_of_score use_scenename = get_general_settings()[9] use_postprocessing = get_general_settings()[10] postprocessing_cmd = get_general_settings()[11] From 97b8b8257e5ef0659439c3506acfa29a3c967bcc Mon Sep 17 00:00:00 2001 From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com> Date: Sun, 5 Aug 2018 20:41:03 -0400 Subject: [PATCH 5/5] Typo error: replace Sonarr by Radarr --- get_movies.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/get_movies.py b/get_movies.py index 7ebafa5b5..4e36a97d5 100644 --- a/get_movies.py +++ b/get_movies.py @@ -119,11 +119,11 @@ def get_profile_list(): try: profiles_json = requests.get(url_radarr_api_movies, timeout=15) except requests.exceptions.ConnectionError as errc: - logging.exception("Error trying to get profiles from Sonarr. Connection Error.") + logging.exception("Error trying to get profiles from Radarr. Connection Error.") except requests.exceptions.Timeout as errt: - logging.exception("Error trying to get profiles from Sonarr. Timeout Error.") + logging.exception("Error trying to get profiles from Radarr. Timeout Error.") except requests.exceptions.RequestException as err: - logging.exception("Error trying to get profiles from Sonarr.") + logging.exception("Error trying to get profiles from Radarr.") else: # Parsing data returned from radarr for profile in profiles_json.json(): @@ -135,4 +135,4 @@ def profile_id_to_language(id): return profile[1] if __name__ == '__main__': - update_movies() \ No newline at end of file + update_movies()