Version 0.8.6

This commit is contained in:
Paco8 committed 2024-01-09 15:44:10 +01:00
1 parent d8d081d29b
commit 2ec9223af2
2 files changed
+15 -8

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.movistarplus" <addon id="plugin.video.movistarplus"
name="Movistar+" name="Movistar+"
version="0.8.5" version="0.8.6"
provider-name="Paco8"> provider-name="Paco8">
<requires> <requires>
<!--- <import addon="xbmc.python" version="2.25.0"/> --> <!--- <import addon="xbmc.python" version="2.25.0"/> -->
+14 -7
View File
@@ -33,6 +33,8 @@ class Movistar(object):
'demarcation': 0} 'demarcation': 0}
add_extra_info = True add_extra_info = True
#dplayer = 'webplayer'
dplayer = 'android.tv'
def __init__(self, config_directory, reuse_devices=False): def __init__(self, config_directory, reuse_devices=False):
self.logged = False self.logged = False
@@ -664,7 +666,7 @@ class Movistar(object):
def get_wishlist_url(self): def get_wishlist_url(self):
url = self.endpoints['favoritos'].format( url = self.endpoints['favoritos'].format(
deviceType='webplayer', DIGITALPLUSUSERIDC=self.account['encoded_user'], PROFILE=self.account['platform'], deviceType=self.dplayer, DIGITALPLUSUSERIDC=self.account['encoded_user'], PROFILE=self.account['platform'],
ACCOUNTNUMBER=self.account['id'], idsOnly='false', start=1, end=30, mdrm='true', demarcation=self.account['demarcation']) ACCOUNTNUMBER=self.account['id'], idsOnly='false', start=1, end=30, mdrm='true', demarcation=self.account['demarcation'])
#url += '&filter=AD-SINX&topic=CN' #url += '&filter=AD-SINX&topic=CN'
if self.quality == 'UHD': url += '&filterQuality=UHD' if self.quality == 'UHD': url += '&filterQuality=UHD'
@@ -686,6 +688,7 @@ class Movistar(object):
texto=search_term, texto=search_term,
distilledTvRights=','.join(self.entitlements['distilledTvRights']), distilledTvRights=','.join(self.entitlements['distilledTvRights']),
mdrm='true', demarcation=self.account['demarcation']) mdrm='true', demarcation=self.account['demarcation'])
url = url.replace('webplayer', self.dplayer)
if self.quality == 'UHD': url += '&filterQuality=UHD' if self.quality == 'UHD': url += '&filterQuality=UHD'
return url return url
@@ -709,10 +712,8 @@ class Movistar(object):
return res return res
def get_ficha_url(self, id, mode='GLOBAL', catalog=''): def get_ficha_url(self, id, mode='GLOBAL', catalog=''):
#url = self.endpoints['ficha'].format(deviceType='webplayer', id=id, profile=self.account['platform'], mediatype='FOTOV', version='7.1', mode=mode, catalog=catalog, channels='', state='', mdrm='true', demarcation=self.account['demarcation'], legacyBoxOffice='') url = self.endpoints['ficha'].format(deviceType='webplayer', id=id, profile=self.account['platform'], mediatype='FOTOV', version='7.1', mode=mode, catalog=catalog, channels='', state='', mdrm='true', demarcation=self.account['demarcation'], legacyBoxOffice='')
#url = url.replace('state=&', '') url = url.replace('state=&', '')
e = 'https://ottcache.dof6.com/movistarplus/webplayer/contents/{id}/details?profile={profile}&mediaType=FOTOV&version=8&mode={mode}&catalog={catalog}&mdrm=true&tlsstream=true&demarcation={demarcation}'
url = e.format(id=id, profile=self.account['platform'], mode=mode, catalog=catalog, demarcation=self.account['demarcation'])
if self.quality == 'UHD': url += '&filterQuality=UHD' if self.quality == 'UHD': url += '&filterQuality=UHD'
#print(url) #print(url)
return url return url
@@ -1135,7 +1136,7 @@ class Movistar(object):
sort = par['@value'] sort = par['@value']
pars = pars.replace('{suscripcion}', self.entitlements['suscripcion']) pars = pars.replace('{suscripcion}', self.entitlements['suscripcion'])
c['url'] = self.endpoints['consultar'].format(deviceType='webplayer', profile=profile, sort=sort, start=1, end=50, mdrm='true', demarcation=self.account['demarcation']) c['url'] = self.endpoints['consultar'].format(deviceType=self.dplayer, profile=profile, sort=sort, start=1, end=50, mdrm='true', demarcation=self.account['demarcation'])
c['url'] += pars c['url'] += pars
if self.quality == 'UHD': c['url'] += '&filterQuality=UHD' if self.quality == 'UHD': c['url'] += '&filterQuality=UHD'
section.append(c) section.append(c)
@@ -1164,7 +1165,13 @@ class Movistar(object):
import shutil import shutil
if sys.version_info[0] > 2: if sys.version_info[0] > 2:
filename = bytes(filename, 'utf-8') filename = bytes(filename, 'utf-8')
shutil.copyfile(self.cache.config_directory + 'auth.key', filename) if self.account['access_token']:
data = {'timestamp': int(time.time()*1000),
'response':{'access_token': self.account['access_token'], 'token_type': 'bearer'}};
with io.open(filename, 'w', encoding='utf-8', newline='') as handle:
handle.write(json.dumps(data, ensure_ascii=False))
else:
shutil.copyfile(self.cache.config_directory + 'auth.key', filename)
def load_key_file(self): def load_key_file(self):
content = self.cache.load_file('auth.key') content = self.cache.load_file('auth.key')