From 7c75ae7615aa010cc3efb3eb6ca3f523e8be4abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 7 Oct 2019 14:50:16 -0400 Subject: [PATCH 1/9] Fix for invalid language code. --- libs/subliminal_patch/core.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/subliminal_patch/core.py b/libs/subliminal_patch/core.py index bcfef632b..a4976efc4 100644 --- a/libs/subliminal_patch/core.py +++ b/libs/subliminal_patch/core.py @@ -614,6 +614,10 @@ def _search_external_subtitles(path, languages=None, only_one=False, scandir_gen # extract the potential language code try: language_code = p_root.rsplit(".", 1)[1].replace('_', '-') + try: + language_code = Language.fromietf(language_code) + except ValueError: + language_code = None except IndexError: language_code = None From eb04192ce5dac1c76a141f1e02b7b72ea50a9aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 7 Oct 2019 14:50:31 -0400 Subject: [PATCH 2/9] Fix typo. --- bazarr/get_series.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazarr/get_series.py b/bazarr/get_series.py index d6113b03f..fc56b5a67 100644 --- a/bazarr/get_series.py +++ b/bazarr/get_series.py @@ -121,7 +121,7 @@ def update_series(): 'audio_language': profile_id_to_language((show['qualityProfileId'] if sonarr_version.startswith('2') else show['languageProfileId']), audio_profiles), 'sort_title': show['sortTitle'], 'year': show['year'], - 'alternate_title': alternateTitles}) + 'alternate_titles': alternateTitles}) # Update existing series in DB series_in_db_list = [] From 99e940f7a81d5c7aca0f46570dbfe19ad3b6cfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:00:26 -0400 Subject: [PATCH 3/9] Drop language on all exception. --- libs/subliminal_patch/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/subliminal_patch/core.py b/libs/subliminal_patch/core.py index a4976efc4..3165ffc7e 100644 --- a/libs/subliminal_patch/core.py +++ b/libs/subliminal_patch/core.py @@ -618,7 +618,7 @@ def _search_external_subtitles(path, languages=None, only_one=False, scandir_gen language_code = Language.fromietf(language_code) except ValueError: language_code = None - except IndexError: + except: language_code = None # remove possible language code for matching From 2a78008ecbd83c3cc458d927b92a28deb59f1e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:18:28 -0400 Subject: [PATCH 4/9] Drop language on all exception. --- libs/subliminal_patch/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/subliminal_patch/core.py b/libs/subliminal_patch/core.py index 3165ffc7e..534d75b54 100644 --- a/libs/subliminal_patch/core.py +++ b/libs/subliminal_patch/core.py @@ -616,9 +616,9 @@ def _search_external_subtitles(path, languages=None, only_one=False, scandir_gen language_code = p_root.rsplit(".", 1)[1].replace('_', '-') try: language_code = Language.fromietf(language_code) - except ValueError: + except: language_code = None - except: + except IndexError: language_code = None # remove possible language code for matching From a4ed73b6fc79e8f8eb087dfef54cd1811a98f25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:28:26 -0400 Subject: [PATCH 5/9] Fix for invalid language in filename. --- bazarr/embedded_subs_reader.py | 2 +- libs/subliminal_patch/core.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bazarr/embedded_subs_reader.py b/bazarr/embedded_subs_reader.py index c808b8f46..3c4d14ceb 100644 --- a/bazarr/embedded_subs_reader.py +++ b/bazarr/embedded_subs_reader.py @@ -33,7 +33,7 @@ class EmbeddedSubsReader: with open(file, 'rb') as f: mkv = enzyme.MKV(f) for subtitle_track in mkv.subtitle_tracks: - subtitles_list.append([subtitle_track.language, subtitle_track.forced]) + subtitles_list.append([subtitle_track.language, subtitle_track.forced, subtitle_track.codec_id]) return subtitles_list diff --git a/libs/subliminal_patch/core.py b/libs/subliminal_patch/core.py index 534d75b54..9fe4f4d35 100644 --- a/libs/subliminal_patch/core.py +++ b/libs/subliminal_patch/core.py @@ -615,7 +615,7 @@ def _search_external_subtitles(path, languages=None, only_one=False, scandir_gen try: language_code = p_root.rsplit(".", 1)[1].replace('_', '-') try: - language_code = Language.fromietf(language_code) + Language.fromietf(language_code) except: language_code = None except IndexError: From 59f36bbe27d8f0d2cd06eb549e2e001c2f828568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:34:55 -0400 Subject: [PATCH 6/9] Fix for enzyme language detection broken. --- bazarr/embedded_subs_reader.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/bazarr/embedded_subs_reader.py b/bazarr/embedded_subs_reader.py index 3c4d14ceb..9ae730391 100644 --- a/bazarr/embedded_subs_reader.py +++ b/bazarr/embedded_subs_reader.py @@ -24,8 +24,6 @@ class EmbeddedSubsReader: parser = VideoFileParser(ffprobe=self.ffprobe, includeMissing=True, rawMode=False) data = parser.parseFfprobe(file) - detected_languages = [] - for detected_language in data['subtitles']: subtitles_list.append([detected_language['language'], detected_language['forced'], detected_language["codec"]]) else: From 7aa3c0bcb4f7b552a3037a1524c2df9f8761e5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:45:35 -0400 Subject: [PATCH 7/9] Added label to manual search for file path and scenename. --- views/episodes.tpl | 4 ++-- views/movie.tpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/views/episodes.tpl b/views/episodes.tpl index 48f699f57..1d3a8b352 100644 --- a/views/episodes.tpl +++ b/views/episodes.tpl @@ -383,8 +383,8 @@
- x - -
-
+
Episode path is:
+
Scenename is:
diff --git a/views/movie.tpl b/views/movie.tpl index 418b3fa1b..8eeb7ec8b 100644 --- a/views/movie.tpl +++ b/views/movie.tpl @@ -340,8 +340,8 @@
-
-
+
Movie path is:
+
Scenename is:
From cdeed59584d48377ffd9251681180d42db6a64d3 Mon Sep 17 00:00:00 2001 From: ngosang Date: Mon, 7 Oct 2019 22:00:27 +0200 Subject: [PATCH 8/9] Update Argenteam provider (https and new domain) --- libs/subliminal_patch/providers/argenteam.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/subliminal_patch/providers/argenteam.py b/libs/subliminal_patch/providers/argenteam.py index 6b872e920..5fe3d28cc 100644 --- a/libs/subliminal_patch/providers/argenteam.py +++ b/libs/subliminal_patch/providers/argenteam.py @@ -136,7 +136,7 @@ class ArgenteamProvider(Provider, ProviderSubtitleArchiveMixin): provider_name = 'argenteam' languages = {Language.fromalpha2(l) for l in ['es']} video_types = (Episode, Movie) - BASE_URL = "http://www.argenteam.net/" + BASE_URL = "https://argenteam.net/" API_URL = BASE_URL + "api/v1/" subtitle_class = ArgenteamSubtitle hearing_impaired_verifiable = False @@ -244,7 +244,9 @@ class ArgenteamProvider(Provider, ProviderSubtitleArchiveMixin): for s in r['subtitles']: movie_kind = "episode" if is_episode else "movie" page_link = self.BASE_URL + movie_kind + "/" + str(aid) - sub = ArgenteamSubtitle(language, page_link, s['uri'], movie_kind, returned_title, + # use https and new domain + download_link = s['uri'].replace('http://www.argenteam.net/', self.BASE_URL) + sub = ArgenteamSubtitle(language, page_link, download_link, movie_kind, returned_title, season, episode, year, r.get('team'), r.get('tags'), r.get('source'), r.get('codec'), content.get("tvdb"), imdb_id, asked_for_release_group=video.release_group, From 460e5bd06bfefa5c8d785477ceae5338a8798a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 7 Oct 2019 16:05:01 -0400 Subject: [PATCH 9/9] Version bump. --- bazarr/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazarr/main.py b/bazarr/main.py index c1a92c67f..e0c949eb7 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -1,6 +1,6 @@ # coding=utf-8 -bazarr_version = '0.8.2.1' +bazarr_version = '0.8.2.2' import gc import sys