From 1a6c7ba6eade9a4e7e77f15aa71af7274b058cda Mon Sep 17 00:00:00 2001 From: newt-sc <47229722+newt-sc@users.noreply.github.com> Date: Fri, 8 Apr 2022 21:01:53 +0300 Subject: [PATCH] release: v3.2.0 --- CHANGELOG.md | 3 +++ a4kSubtitles/download.py | 22 ++++++++++++------- a4kSubtitles/lib/video.py | 1 - a4kSubtitles/search.py | 2 +- addon.xml | 5 ++++- packages/addons.xml | 5 ++++- packages/addons.xml.crc | 2 +- .../resource.language.en_gb/strings.po | 4 ++++ resources/settings.xml | 1 + 9 files changed, 32 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ff4112..924d407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +* [v3.2.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.2.0): + * Option to disable subs encoding detection + * [v3.1.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.1.0): * Force proper embedded subs selection based on preferred language overriding KODI * Subs encoding fallback to predefined list in case auto detection fails diff --git a/a4kSubtitles/download.py b/a4kSubtitles/download.py index f4f7f1b..46b1525 100644 --- a/a4kSubtitles/download.py +++ b/a4kSubtitles/download.py @@ -77,14 +77,20 @@ def __postprocess(core, filepath, lang_code): text_bytes = f.read() encoding = '' - if core.utils.py3: - detection = core.utils.chardet.detect(text_bytes) - detected_lang_code = core.kodi.xbmc.convertLanguage(detection['language'], core.kodi.xbmc.ISO_639_2) - if detection['confidence'] == 1.0 or detected_lang_code == lang_code: - encoding = detection['encoding'] - - if not encoding: - encoding = core.utils.code_pages.get(lang_code, core.utils.default_encoding) + if core.kodi.get_bool_setting('general.use_chardet'): + if core.utils.py3: + detection = core.utils.chardet.detect(text_bytes) + detected_lang_code = core.kodi.xbmc.convertLanguage(detection['language'], core.kodi.xbmc.ISO_639_2) + if detection['confidence'] == 1.0 or detected_lang_code == lang_code: + encoding = detection['encoding'] + + if not encoding: + encoding = core.utils.code_pages.get(lang_code, core.utils.default_encoding) + else: + if core.utils.py3: + encoding = core.utils.chardet.detect(text_bytes)['encoding'] + else: + encoding = core.utils.default_encoding text = text_bytes.decode(encoding) diff --git a/a4kSubtitles/lib/video.py b/a4kSubtitles/lib/video.py index afcc5da..a9678d2 100644 --- a/a4kSubtitles/lib/video.py +++ b/a4kSubtitles/lib/video.py @@ -53,7 +53,6 @@ def __set_size_and_hash(core, meta, filepath): __sum_64k_bytes(f, result) meta.filehash = "%016x" % result.filehash - logger.notice(meta.filehash) finally: f.close() diff --git a/a4kSubtitles/search.py b/a4kSubtitles/search.py index 913a0fe..d9c2336 100644 --- a/a4kSubtitles/search.py +++ b/a4kSubtitles/search.py @@ -21,7 +21,7 @@ def __query_service(core, service_name, meta, request, results): core.logger.debug(lambda: core.json.dumps({ 'url': request['url'], 'count': len(service_results), - 'status_code': response.status_code + 'status_code': response.status_code if response else 'N/A' }, indent=2)) finally: core.progress_text = core.progress_text.replace(service.display_name, '') diff --git a/addon.xml b/addon.xml index 8c39dc7..6379871 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ @@ -27,6 +27,9 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, Subscene, Addic7ed screenshot-03.png +[v3.2.0]: + * Option to disable subs encoding detection + [v3.1.0]: * Force proper embedded subs selection based on preferred language overriding KODI * Subs encoding fallback to predefined list in case auto detection fails diff --git a/packages/addons.xml b/packages/addons.xml index 3b9e50a..9a8bb04 100644 --- a/packages/addons.xml +++ b/packages/addons.xml @@ -4,7 +4,7 @@ @@ -30,6 +30,9 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, Subscene, Addic7ed screenshot-03.png +[v3.2.0]: + * Option to disable subs encoding detection + [v3.1.0]: * Force proper embedded subs selection based on preferred language overriding KODI * Subs encoding fallback to predefined list in case auto detection fails diff --git a/packages/addons.xml.crc b/packages/addons.xml.crc index 419a6d1..8ca9d9f 100644 --- a/packages/addons.xml.crc +++ b/packages/addons.xml.crc @@ -1 +1 @@ -fb5e52c161a624e3a552853ba87732e2a74f1939 \ No newline at end of file +6baf7dad65ef3a17be84eac6b4e44116e6c36dd4 \ No newline at end of file diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index e9651ee..8223bf9 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -36,6 +36,10 @@ msgctxt "#33104" msgid "Auto download first subtitle silently" msgstr "" +msgctxt "#33105" +msgid "Auto detect subs encoding" +msgstr "" + # Services msgctxt "#33201" msgid "OpenSubtitles" diff --git a/resources/settings.xml b/resources/settings.xml index 512835c..ed4dbc2 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -6,6 +6,7 @@ +