From 08209c89556c7fad1147048ad821126c234c963b Mon Sep 17 00:00:00 2001 From: Paco8 <5084042+Paco8@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:28:49 +0200 Subject: [PATCH] Version 0.9.7 --- addon.xml | 2 +- .../language/resource.language.en_gb/strings.po | 10 ++++++++-- .../language/resource.language.es_es/strings.po | 9 ++++++++- resources/lib/proxy.py | 15 ++++++++------- resources/settings.xml | 6 ++++++ 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/addon.xml b/addon.xml index be59efe..628f7b8 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index 39b90e4..08e0797 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -37,6 +37,10 @@ msgctxt "#30005" msgid "Playback" msgstr "" +msgctxt "#30006" +msgid "Advanced" +msgstr "" + # For Orange and Movistar only msgctxt "#30010" msgid "DRM type" @@ -135,7 +139,6 @@ msgctxt "#30033" msgid "Enable 4K" msgstr "" -# For SkyOTT only msgctxt "#30034" msgid "Fix audio and subtitle language names" msgstr "" @@ -175,11 +178,14 @@ msgctxt "#30041" msgid "Subscription country (two letter code):" msgstr "" -# For SkyOTT only msgctxt "#30050" msgid "Remember username and password" msgstr "" +msgctxt "#30051" +msgid "Process subtitles" +msgstr "" + msgctxt "#30101" msgid "Menu" msgstr "" diff --git a/resources/language/resource.language.es_es/strings.po b/resources/language/resource.language.es_es/strings.po index 7668ac5..5d70f7c 100644 --- a/resources/language/resource.language.es_es/strings.po +++ b/resources/language/resource.language.es_es/strings.po @@ -37,6 +37,10 @@ msgctxt "#30005" msgid "Playback" msgstr "Reproducción" +msgctxt "#30006" +msgid "Advanced" +msgstr "Avanzado" + msgctxt "#30010" msgid "DRM type" msgstr "Tipo de DRM" @@ -158,11 +162,14 @@ msgctxt "#30041" msgid "Subscription country (two letter code):" msgstr "País de la suscripción (código de dos letras):" -# For SkyOTT only msgctxt "#30050" msgid "Remember username and password" msgstr "Recordar usuario y clave" +msgctxt "#30051" +msgid "Process subtitles" +msgstr "Procesar subtítulos" + msgctxt "#30101" msgid "Menu" msgstr "Menú" diff --git a/resources/lib/proxy.py b/resources/lib/proxy.py index 9ccc4f5..650dbb2 100644 --- a/resources/lib/proxy.py +++ b/resources/lib/proxy.py @@ -39,11 +39,10 @@ import requests import threading import socket from contextlib import closing -import xbmcaddon from .b64 import encode_base64 from .log import LOG -from .addon import profile_dir +from .addon import profile_dir, addon from .useragent import useragent from ttml2ssa import Ttml2SsaAddon @@ -72,7 +71,7 @@ def mvs(): global mvs_o if not mvs_o: from .movistar import Movistar - reuse_devices = xbmcaddon.Addon().getSettingBool('reuse_devices') + reuse_devices = addon.getSettingBool('reuse_devices') mvs_o = Movistar(profile_dir, reuse_devices) return mvs_o @@ -99,17 +98,19 @@ class RequestHandler(BaseHTTPRequestHandler): baseurl = os.path.dirname(response.url) LOG('baseurl: {}'.format(baseurl)) content = response.content.decode('utf-8') - if not xbmcaddon.Addon().getSettingBool('use_ttml2ssa'): + + if addon.getSettingBool('proxy_process_subs'): LOG(self.headers.get('Host')) my_address = 'http://' + self.headers.get('Host') LOG('my_address: {}'.format(my_address)) content = content.replace('mimeType="application/ttml+xml"', 'mimeType="text/vtt"') content = re.sub(r'(.*?)\.ttml<\/BaseURL>', r'{}/?subtitle={}/\1.ttml'.format(my_address, baseurl), content) + pos = content.find(' -1: content = content[:pos] + '' + baseurl + '/' + content[pos:] - if xbmcaddon.Addon().getSettingBool('fix_languages'): + if addon.getSettingBool('fix_languages'): replacements = {'qaa': 'eng', 'srd': 'es-[CC]', 'ads': 'es-[ADS]'} for key, value in replacements.items(): content = content.replace('lang="{}"'.format(key), 'lang="{}"'.format(value)) @@ -179,7 +180,7 @@ class RequestHandler(BaseHTTPRequestHandler): # Discard previous mvs_o, it may have expired tokens global mvs_o mvs_o = None - if reregister_needed and xbmcaddon.Addon().getSettingBool('reregister'): + if reregister_needed and addon.getSettingBool('reregister'): mvs().unregister_device() mvs().register_device() @@ -214,7 +215,7 @@ class RequestHandler(BaseHTTPRequestHandler): d = try_load_json(license_data) if d and 'errorCode' in d: if d['errorCode'] == 4027: - if not reregister_needed and xbmcaddon.Addon().getSettingBool('reregister'): + if not reregister_needed and addon.getSettingBool('reregister'): reregister_needed = True continue from .gui import show_notification diff --git a/resources/settings.xml b/resources/settings.xml index 7619e4a..5f03df5 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -19,6 +19,7 @@ + @@ -37,6 +38,11 @@ --> + + + + +