Version 0.9.10

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.movistarplus"
        name="Movistar+"
-       version="0.9.9"
+       version="0.9.10"
        provider-name="Paco8">
   <requires>
   <!--- <import addon="xbmc.python" version="2.25.0"/> -->

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 ""

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"

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 @@ def get_token(self):
       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 @@ def clear_session(self):
       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 @@ def open_session(self, data, session_token=None, session_id=None):
       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 @@ def delete_session_id(self, session_token, id = '0'):
       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 @@ def get_session_token(self):
       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",
       }

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()
 

resources/settings.xml

@@ -38,6 +38,7 @@
 
     <category label="30006">
         <setting id="reuse_devices" type="bool" label="30023" default="false" visible="true"/>
+        <setting id="enable_key_login" type="bool" label="Activar inicio de sesión con fichero key" default="false" visible="true"/>
         <setting id="open_session" type="bool" label="30022" default="true" visible="false"/>
         <setting id="profile_id" type="text" label="Profile ID" default="Auto" visible="false"/>
     </category>