From 5ed25e7243e8328619855f8a26dea02be93bd7a2 Mon Sep 17 00:00:00 2001 From: Paco8 <5084042+Paco8@users.noreply.github.com> Date: Sun, 22 Sep 2024 13:15:00 +0200 Subject: [PATCH] Version 0.9.10 --- addon.xml | 2 +- .../resource.language.en_gb/strings.po | 4 ++++ .../resource.language.es_es/strings.po | 4 ++++ resources/lib/movistar.py | 22 +++++++++---------- resources/lib/plugin.py | 7 +++--- resources/settings.xml | 1 + 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/addon.xml b/addon.xml index d07af52..06ecf0a 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 08e0797..6274d4b 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -582,6 +582,10 @@ msgctxt "#30324" msgid "IPTV Simple is not found" msgstr "" +msgctxt "#30325" +msgid "Downloading subtitle '{}'" +msgstr "" + msgctxt "#30400" msgid "{} days remaining" msgstr "" diff --git a/resources/language/resource.language.es_es/strings.po b/resources/language/resource.language.es_es/strings.po index 5d70f7c..e25eb20 100644 --- a/resources/language/resource.language.es_es/strings.po +++ b/resources/language/resource.language.es_es/strings.po @@ -545,6 +545,10 @@ msgctxt "#30324" msgid "IPTV Simple is not found" msgstr "No se encuentra IPTV Simple" +msgctxt "#30325" +msgid "Downloading subtitle '{}'" +msgstr "Descargando subtítulo '{}'" + msgctxt "#30400" msgid "{} days remaining" msgstr "quedan {} días" diff --git a/resources/lib/movistar.py b/resources/lib/movistar.py index ac6f6cd..30e1f64 100644 --- a/resources/lib/movistar.py +++ b/resources/lib/movistar.py @@ -38,7 +38,11 @@ class Movistar(object): add_extra_info = True #dplayer = 'webplayer' + #device_code = 'WP_OTT' + #manufacturer = 'Firefox' dplayer = 'android.tv' + device_code = 'SMARTTV_OTT' + manufacturer = 'LG' account_dir = 'account_1' def __init__(self, config_directory, reuse_devices=False): @@ -210,10 +214,8 @@ class Movistar(object): data = {"accountNumber": self.account['id'], "userProfile": self.account['profile_id'], "streamMiscellanea":"HTTPS", - #"deviceType":"WP_OTT", - #"deviceManufacturerProduct":"Firefox", - "deviceType":"SMARTTV_OTT", - "deviceManufacturerProduct":"LG", + "deviceType": self.device_code, + "deviceManufacturerProduct": self.manufacturer, "streamDRM":"Widevine", "streamFormat":"DASH", } @@ -241,7 +243,7 @@ class Movistar(object): headers = self.net.headers.copy() headers['Access-Control-Request-Method'] = 'POST' headers['Access-Control-Request-Headers'] = 'content-type,x-hzid' - url = self.endpoints['setUpStream'].format(PID=self.account['pid'], deviceCode='SMARTTV_OTT', PLAYREADYID=self.account['device_id']) + url = self.endpoints['setUpStream'].format(PID=self.account['pid'], deviceCode=self.device_code, PLAYREADYID=self.account['device_id']) response = self.net.session.options(url, headers=headers) content = response.content.decode('utf-8') return content @@ -252,7 +254,7 @@ class Movistar(object): headers = self.net.headers.copy() headers['Content-Type'] = 'application/json' headers['X-Hzid'] = session_token - url = self.endpoints['setUpStream'].format(PID=self.account['pid'], deviceCode='SMARTTV_OTT', PLAYREADYID=self.account['device_id']) + url = self.endpoints['setUpStream'].format(PID=self.account['pid'], deviceCode=self.device_code, PLAYREADYID=self.account['device_id']) if session_id != None: url += '/' + session_id #LOG('open_session: url: {}'.format(url)) @@ -407,7 +409,7 @@ class Movistar(object): headers = self.net.headers.copy() headers['Content-Type'] = 'text/plain;charset=UTF-8' data = '{"X-HZId":"' + session_token +'","X-Content-Type":"application/json","X-Operation":"DELETE"}' - url = self.endpoints['tearDownStream'].format(PID=self.account['pid'], deviceCode='SMARTTV_OTT', PLAYREADYID=self.account['device_id'], SessionID=id) + url = self.endpoints['tearDownStream'].format(PID=self.account['pid'], deviceCode=self.device_code, PLAYREADYID=self.account['device_id'], SessionID=id) response = self.net.session.post(url, headers=headers, data=data) content = response.content.decode('utf-8') return content @@ -443,10 +445,8 @@ class Movistar(object): data = {"accountNumber": self.account['id'], "sessionUserProfile": self.account['profile_id'], "streamMiscellanea":"HTTPS", - #"deviceType":"WP_OTT", - #"deviceManufacturerProduct":"Firefox", - "deviceType":"SMARTTV_OTT", - "deviceManufacturerProduct":"LG", + "deviceType": self.device_code, + "deviceManufacturerProduct": self.manufacturer, "streamDRM":"Widevine", "streamFormat":"DASH", } diff --git a/resources/lib/plugin.py b/resources/lib/plugin.py index 4a10046..7daed05 100644 --- a/resources/lib/plugin.py +++ b/resources/lib/plugin.py @@ -628,9 +628,10 @@ def select_account(id, name): m.switch_account(id) open_folder(name) add_menu_option(addon.getLocalizedString(30183), get_url(action='login')) # Login with username - #add_menu_option(addon.getLocalizedString(30181), get_url(action='login_with_key')) # Login with key - #if os.path.exists(os.path.join(m.cache.config_directory, 'auth.key')): - # add_menu_option(addon.getLocalizedString(30184), get_url(action='export_key')) # Export key + if addon.getSettingBool('enable_key_login'): + add_menu_option(addon.getLocalizedString(30181), get_url(action='login_with_key')) # Login with key + if os.path.exists(os.path.join(m.cache.config_directory, 'auth.key')): + add_menu_option(addon.getLocalizedString(30184), get_url(action='export_key')) # Export key add_menu_option(addon.getLocalizedString(30150), get_url(action='logout')) # Close session close_folder() diff --git a/resources/settings.xml b/resources/settings.xml index 889942e..7f9645a 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -38,6 +38,7 @@ +