diff --git a/bazarr/main.py b/bazarr/main.py index 8c6e18520..9a1f987c3 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -690,7 +690,7 @@ def episodes(no): series_details = c.execute("SELECT title, overview, poster, fanart, hearing_impaired, tvdbid, audio_language, languages, path_substitution(path) FROM table_shows WHERE sonarrSeriesId LIKE ?", (str(no),)).fetchone() tvdbid = series_details[5] - episodes = c.execute("SELECT title, path_substitution(path), season, episode, subtitles, sonarrSeriesId, missing_subtitles, sonarrEpisodeId, scene_name, monitored FROM table_episodes WHERE sonarrSeriesId LIKE ? ORDER BY episode ASC", (str(no),)).fetchall() + episodes = c.execute("SELECT title, path_substitution(path), season, episode, subtitles, sonarrSeriesId, missing_subtitles, sonarrEpisodeId, scene_name, monitored, failedAttempts FROM table_episodes WHERE sonarrSeriesId LIKE ? ORDER BY episode ASC", (str(no),)).fetchall() number = len(episodes) languages = c.execute("SELECT code2, name FROM table_settings_languages WHERE enabled = 1").fetchall() c.close() @@ -986,7 +986,7 @@ def wantedseries(): offset = (int(page) - 1) * page_size max_page = int(math.ceil(missing_count / (page_size + 0.0))) - c.execute("SELECT table_shows.title, table_episodes.season || 'x' || table_episodes.episode, table_episodes.title, table_episodes.missing_subtitles, table_episodes.sonarrSeriesId, path_substitution(table_episodes.path), table_shows.hearing_impaired, table_episodes.sonarrEpisodeId, table_episodes.scene_name FROM table_episodes INNER JOIN table_shows on table_shows.sonarrSeriesId = table_episodes.sonarrSeriesId WHERE table_episodes.missing_subtitles != '[]'" + monitored_only_query_string + " ORDER BY table_episodes._rowid_ DESC LIMIT ? OFFSET ?", (page_size, offset,)) + c.execute("SELECT table_shows.title, table_episodes.season || 'x' || table_episodes.episode, table_episodes.title, table_episodes.missing_subtitles, table_episodes.sonarrSeriesId, path_substitution(table_episodes.path), table_shows.hearing_impaired, table_episodes.sonarrEpisodeId, table_episodes.scene_name, table_episodes.failedAttempts FROM table_episodes INNER JOIN table_shows on table_shows.sonarrSeriesId = table_episodes.sonarrSeriesId WHERE table_episodes.missing_subtitles != '[]'" + monitored_only_query_string + " ORDER BY table_episodes._rowid_ DESC LIMIT ? OFFSET ?", (page_size, offset,)) data = c.fetchall() c.close() return template('wantedseries', __file__=__file__, bazarr_version=bazarr_version, rows=data, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, page_size=page_size, current_port=port) diff --git a/views/episodes.tpl b/views/episodes.tpl index 7314e3946..74d9f0947 100644 --- a/views/episodes.tpl +++ b/views/episodes.tpl @@ -51,7 +51,7 @@ padding-left: 2em; padding-right: 2em; padding-bottom: 1em; - overflow-x:auto; + overflow-x: auto; } .ui.basic.button:hover, .ui.basic.buttons .button:hover { background: transparent !important; @@ -165,6 +165,7 @@ Episode + Title Existing
subtitles Missing
subtitles @@ -182,7 +183,12 @@ %end {{episode[3]}} - {{episode[0]}} + + % if episode[8] is not None: + + % end + + {{episode[0]}} %if episode[4] is not None: % actual_languages = ast.literal_eval(episode[4]) @@ -208,7 +214,7 @@ %end - %try: + %try: %if episode[6] is not None: % missing_languages = ast.literal_eval(episode[6]) % missing_languages.sort() @@ -216,15 +222,34 @@ % missing_languages = None %end %if missing_languages is not None: + %from get_subtitle import search_active + %from get_settings import get_general_settings %for language in missing_languages: - - {{language}} - + %if episode[10] is not None and get_general_settings()[25]: + %for lang in ast.literal_eval(episode[10]): + %if language in lang: + %active = search_active(lang[1]) + %if active: + + {{language}} + + %else: + + {{language}} + + %end + %end + %end + %else: + + {{language}} + + %end - %end + %end %end - %except: - %pass + %except: + %pass %end diff --git a/views/wantedseries.tpl b/views/wantedseries.tpl index 8e1977632..53de62342 100644 --- a/views/wantedseries.tpl +++ b/views/wantedseries.tpl @@ -78,11 +78,30 @@ %missing_languages = ast.literal_eval(row[3]) %if missing_languages is not None: + %from get_subtitle import search_active + %from get_settings import get_general_settings %for language in missing_languages: - - {{language}} - - + %if row[9] is not None and get_general_settings()[25]: + %for lang in ast.literal_eval(row[9]): + %if language in lang: + %active = search_active(lang[1]) + %if active: + + {{language}} + + %else: + + {{language}} + + %end + %end + %end + %else: + + {{language}} + + %end + %end %end