From d32b65e1e029b9c2a997faf4467d58f737f2c706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Tue, 19 Nov 2019 22:01:34 -0500 Subject: [PATCH 1/3] Fix to reduce analytics hits. --- bazarr/analytics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazarr/analytics.py b/bazarr/analytics.py index 30d509baf..264a9c91c 100644 --- a/bazarr/analytics.py +++ b/bazarr/analytics.py @@ -52,7 +52,7 @@ def track_event(category=None, action=None, label=None): try: tracker.track_event(event, session, visitor) - tracker.track_pageview(page, session, visitor) + # tracker.track_pageview(page, session, visitor) ## Commented because we were having too much hits on GA. except: pass else: From 2d5eb867d951c18b6be16cf5e13d746f62f8b8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Tue, 19 Nov 2019 22:02:08 -0500 Subject: [PATCH 2/3] Version bump. --- bazarr/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazarr/main.py b/bazarr/main.py index e66681afa..4837500e0 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -1,6 +1,6 @@ # coding=utf-8 -bazarr_version = '0.8.3.3' +bazarr_version = '0.8.3.4' import os os.environ["SZ_USER_AGENT"] = "Bazarr/1" From a9bf2ee8e4539158b50048e3a2e014b045fe18a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Tue, 19 Nov 2019 22:02:59 -0500 Subject: [PATCH 3/3] Added history modal for episode and tab for movie. --- bazarr/main.py | 86 +++++++++++++++- views/episodes.tpl | 72 +++++++++++++- views/movie.tpl | 238 ++++++++++++++++++++++++++++----------------- 3 files changed, 301 insertions(+), 95 deletions(-) diff --git a/bazarr/main.py b/bazarr/main.py index 4837500e0..8b9f2ed1c 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -42,7 +42,8 @@ from beaker.middleware import SessionMiddleware from cork import Cork from bottle import route, template, static_file, request, redirect, response, HTTPError, app, hook from datetime import timedelta -from get_languages import load_language_in_db, language_from_alpha3 +from get_languages import load_language_in_db, language_from_alpha3, language_from_alpha2, alpha2_from_alpha3 + from get_providers import get_providers, get_providers_auth, list_throttled_providers from get_series import * from get_episodes import * @@ -1729,7 +1730,7 @@ def remove_subtitles(): try: os.remove(subtitlesPath) result = language_from_alpha3(language) + " subtitles deleted from disk." - history_log(0, sonarrSeriesId, sonarrEpisodeId, result) + history_log(0, sonarrSeriesId, sonarrEpisodeId, result, language=alpha2_from_alpha3(language)) except OSError as e: logging.exception('BAZARR cannot delete subtitles file: ' + subtitlesPath) store_subtitles(unicode(episodePath)) @@ -1747,7 +1748,7 @@ def remove_subtitles_movie(): try: os.remove(subtitlesPath) result = language_from_alpha3(language) + " subtitles deleted from disk." - history_log_movie(0, radarrId, result) + history_log_movie(0, radarrId, result, language=alpha2_from_alpha3(language)) except OSError as e: logging.exception('BAZARR cannot delete subtitles file: ' + subtitlesPath) store_subtitles_movie(unicode(moviePath)) @@ -2127,6 +2128,85 @@ def running_tasks_list(): return dict(tasks=running_tasks) +@route(base_url + 'episode_history/') +@custom_auth_basic(check_credentials) +def episode_history(no): + authorize() + episode_history = database.execute("SELECT action, timestamp, language, provider, score FROM table_history " + "WHERE sonarrEpisodeId=? ORDER BY timestamp DESC", (no,)) + for item in episode_history: + if item['action'] == 0: + item['action'] = "
" + elif item['action'] == 1: + item['action'] = "
" + elif item['action'] == 2: + item['action'] = "
" + elif item['action'] == 3: + item['action'] = "
" + elif item['action'] == 4: + item['action'] = "
" + item['timestamp'] = "
" + \ + pretty.date(datetime.fromtimestamp(item['timestamp'])) + "
" + if item['language']: + item['language'] = language_from_alpha2(item['language']) + else: + item['language'] = "undefined" + if item['score']: + item['score'] = str(round((int(item['score']) * 100 / 360), 2)) + "%" + + return dict(data=episode_history) + + +@route(base_url + 'movie_history/') +@custom_auth_basic(check_credentials) +def movie_history(no): + authorize() + movie_history = database.execute("SELECT action, timestamp, language, provider, score FROM table_history_movie " + "WHERE radarrId=? ORDER BY timestamp DESC", (no,)) + for item in movie_history: + if item['action'] == 0: + item['action'] = "
" + elif item['action'] == 1: + item['action'] = "
" + elif item['action'] == 2: + item['action'] = "
" + elif item['action'] == 3: + item['action'] = "
" + elif item['action'] == 4: + item['action'] = "
" + + item['timestamp'] = "
" + \ + pretty.date(datetime.fromtimestamp(item['timestamp'])) + "
" + if item['language']: + item['language'] = language_from_alpha2(item['language']) + else: + item['language'] = "undefined" + if item['score']: + item['score'] = str(round((int(item['score']) * 100 / 120), 2)) + '%' + + return dict(data=movie_history) + + # Mute DeprecationWarning warnings.simplefilter("ignore", DeprecationWarning) server = CherryPyWSGIServer((str(settings.general.ip), (int(args.port) if args.port else int(settings.general.port))), app) diff --git a/views/episodes.tpl b/views/episodes.tpl index 949788a39..9567098d9 100644 --- a/views/episodes.tpl +++ b/views/episodes.tpl @@ -217,7 +217,7 @@ % if episode['scene_name'] is not None: % end - {{episode['title']}} + {{episode['title']}} %if episode['subtitles'] is not None: @@ -379,6 +379,29 @@ +
+ +
+ - x - +
+
+ + + + + + + + + + +
Language.:Provider:Score:Date:
+
+
+ +
+
+
@@ -531,7 +554,7 @@ }); }); - $('a:not(.manual_search, .manual_upload), .menu .item, button:not(#config, .cancel, #search_missing_subtitles)').on('click', function(){ + $('a:not(.manual_search, .manual_upload, .episode_history), .menu .item, button:not(#config, .cancel, #search_missing_subtitles)').on('click', function(){ $('#loader').addClass('active'); }); @@ -564,6 +587,51 @@ .modal('show'); }); + $('.episode_history').on('click', function(){ + $("#series_title_span").html($(this).data("series_title")); + $("#season").html($(this).data("season")); + $("#episode").html($(this).data("episode")); + $("#episode_title").html($(this).data("episode_title")); + + sonarrEpisodeId = $(this).attr("data-sonarrEpisodeId"); + + $('#episode_result').DataTable( { + destroy: true, + language: { + loadingRecords: '

', + zeroRecords: 'No History Records Found For This Episode' + }, + paging: true, + lengthChange: false, + pageLength: 5, + searching: true, + ordering: true, + processing: false, + serverSide: false, + ajax: { + url: '{{base_url}}episode_history/' + sonarrEpisodeId + }, + drawCallback: function(settings) { + $('.inline.dropdown').dropdown(); + $('.ui.accordion').accordion(); + }, + columns: [ + { data: 'action'}, + { data: 'language' }, + { data: 'provider' }, + { data: 'score'}, + { data: 'timestamp' } + ] + } ); + + $('.episode_dialog') + .modal({ + centered: false, + autofocus: false + }) + .modal('show'); + }); + $('.manual_search').on('click', function(){ $("#series_title_span").html($(this).data("series_title")); $("#season").html($(this).data("season")); diff --git a/views/movie.tpl b/views/movie.tpl index 21038aa81..344a47589 100644 --- a/views/movie.tpl +++ b/views/movie.tpl @@ -41,6 +41,7 @@ } #fondblanc { background-color: #ffffff; + color: #000000; opacity: 0.9; border-radius: 1px; box-shadow: 0 0 3px 3px #ffffff; @@ -160,107 +161,130 @@
- - - - - - - - - +
+ Subtitles + History +
+
+
+
Subtitles PathLanguage(s)
+ + + + + + + + + <% + subtitles_files = ast.literal_eval(str(details['subtitles'])) + subtitles_files = sorted(subtitles_files, key=lambda x: (x is None, x)) + if subtitles_files is not None: + for subtitles_file in subtitles_files: + if subtitles_file[0].endswith(':forced'): + forced = True + else: + forced = False + end + %> + + %if subtitles_file[1] is not None: + + %else: + + %end + + + + <% + end + if len(subtitles_files) == 0: + %> + + <% + end + end + %> + +
Subtitles PathLanguage(s)
{{path.basename(path_replace_movie(subtitles_file[1]))}}Video File Subtitles Track
{{language_from_alpha2(subtitles_file[0].split(':')[0])}}{{' forced' if forced else ''}}
 + %if subtitles_file[1] is not None: + + + + %end +
No Subtitles Detected For This Movie.
+ <% + if details['missing_subtitles'] is not None: + missing_subs_languages = ast.literal_eval(details['missing_subtitles']) + else: + missing_subs_languages = [] + end + from get_subtitle import search_active + if missing_subs_languages is not None: + %> + + + + + + +
Missing Subtitles
<% - subtitles_files = ast.literal_eval(str(details['subtitles'])) - subtitles_files = sorted(subtitles_files, key=lambda x: (x is None, x)) - if subtitles_files is not None: - for subtitles_file in subtitles_files: - if subtitles_file[0].endswith(':forced'): - forced = True + for missing_subs_language in missing_subs_languages: + if len(missing_subs_language) > 2: + forced = missing_subs_language[2] + forced_bool = True else: forced = False + forced_bool = False end + + if details['failedAttempts'] is not None and settings.general.getboolean('adaptive_searching') and missing_subs_language in details['failedAttempts']: + for lang in ast.literal_eval(details['failedAttempts']): + if missing_subs_language in lang: + if search_active(lang[1]): %> - - %if subtitles_file[1] is not None: - {{path.basename(path_replace_movie(subtitles_file[1]))}} - %else: - Video File Subtitles Track - %end -
{{language_from_alpha2(subtitles_file[0].split(':')[0])}}{{' forced' if forced else ''}}
- - %if subtitles_file[1] is not None: - - + + {{language_from_alpha2(str(missing_subs_language.split(':')[0]))}}{{' forced' if forced else ''}} + + + %else: + + {{language_from_alpha2(str(missing_subs_language.split(':')[0]))}}{{' forced' if forced else ''}} + - %end - - <% - end - if len(subtitles_files) == 0: + end + end + end + else: %> - No Subtitles Detected For This Movie. + + {{language_from_alpha2(str(missing_subs_language.split(':')[0]))}}{{' forced' if forced else ''}} + + <% + end end end %> - - - <% - if details['missing_subtitles'] is not None: - missing_subs_languages = ast.literal_eval(details['missing_subtitles']) - else: - missing_subs_languages = [] - end - from get_subtitle import search_active - if missing_subs_languages is not None: - %> - - - - - - -
Missing Subtitles
- <% - for missing_subs_language in missing_subs_languages: - if len(missing_subs_language) > 2: - forced = missing_subs_language[2] - forced_bool = True - else: - forced = False - forced_bool = False - end - - if details['failedAttempts'] is not None and settings.general.getboolean('adaptive_searching') and missing_subs_language in details['failedAttempts']: - for lang in ast.literal_eval(details['failedAttempts']): - if missing_subs_language in lang: - if search_active(lang[1]): - %> - - {{language_from_alpha2(str(missing_subs_language.split(':')[0]))}}{{' forced' if forced else ''}} - - - %else: - - {{language_from_alpha2(str(missing_subs_language.split(':')[0]))}}{{' forced' if forced else ''}} - - - <% - end - end - end - else: - %> - - {{language_from_alpha2(str(missing_subs_language.split(':')[0]))}}{{' forced' if forced else ''}} - - - <% - end - end - end - %> +
+
+
+
+ + + + + + + + + + +
Language.:Provider:Score:Date:
+
+
@@ -420,6 +444,9 @@