From 5c996bba0af43f6579481b5c16ac6f8d9d1f2aea Mon Sep 17 00:00:00 2001
From: Paco8 <5084042+Paco8@users.noreply.github.com>
Date: Wed, 31 Jan 2024 15:06:35 +0100
Subject: [PATCH] Version 0.8.8

---
 addon.xml                 |  2 +-
 resources/lib/movistar.py | 12 +++++++++++-
 resources/lib/plugin.py   |  9 ++++++---
 resources/settings.xml    |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/addon.xml b/addon.xml
index 7379879..d2eefa8 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.movistarplus"
        name="Movistar+"
-       version="0.8.6"
+       version="0.8.8"
        provider-name="Paco8">
   <requires>
   <!--- <import addon="xbmc.python" version="2.25.0"/> -->
diff --git a/resources/lib/movistar.py b/resources/lib/movistar.py
index dbd3be9..2166d40 100644
--- a/resources/lib/movistar.py
+++ b/resources/lib/movistar.py
@@ -565,13 +565,15 @@ class Movistar(object):
 
     def get_channels(self):
       demarcation = self.account['demarcation']
+      profile = self.account['platform']
       cache_filename = 'channels_{}.json'.format(self.quality)
       content = self.cache.load(cache_filename)
       if content:
         data = json.loads(content)
       else:
-        url = self.endpoints['canales'].format(deviceType='webplayer', profile=self.account['platform'], mdrm='true', demarcation=demarcation)
+        url = self.endpoints['canales'].format(deviceType='webplayer', profile=profile, mdrm='true', demarcation=demarcation)
         if self.quality == 'UHD': url += '&filterQuality=UHD'
+        #LOG(url)
         data = self.net.load_data(url)
         if not 'error' in data:
           self.cache.save_file(cache_filename, json.dumps(data, ensure_ascii=False))
@@ -681,6 +683,14 @@ class Movistar(object):
       url += '&_='+ str(int(time.time()*1000))
       return url
 
+    def get_viewings_url(self):
+      url = self.endpoints['ultimasreproducciones'].format(
+              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'])
+      url += '&filter=AD-SINX'
+      url += '&_='+ str(int(time.time()*1000))
+      return url
+
     def get_search_url(self, search_term):
       url = self.endpoints['buscar_best'].format(
                  ACCOUNTNUMBER=self.account['id'],
diff --git a/resources/lib/plugin.py b/resources/lib/plugin.py
index da3637d..f3e1cc2 100644
--- a/resources/lib/plugin.py
+++ b/resources/lib/plugin.py
@@ -682,6 +682,8 @@ def router(paramstring):
     elif params['action'] == 'wishlist':
       # Wishlist
       listing_hz(addon.getLocalizedString(30102), m.get_wishlist_url(), from_wishlist=True)
+    elif params['action'] == 'continue-watching':
+      listing_hz(addon.getLocalizedString(30102), m.get_viewings_url())
     elif params['action'] == 'recordings':
       # Recordings
       listing_hz(addon.getLocalizedString(30103), m.get_recordings_url())
@@ -714,6 +716,7 @@ def router(paramstring):
       add_menu_option(addon.getLocalizedString(30107), get_url(action='epg'), icon='epg.png') # EGP
       add_menu_option(addon.getLocalizedString(30102), get_url(action='wishlist'), icon='mylist.png') # My list
       add_menu_option(addon.getLocalizedString(30103), get_url(action='recordings'), icon='recording.png') # Recordings
+      add_menu_option(addon.getLocalizedString(30122), get_url(action='continue-watching'), icon='continue.png') # Continue
       add_menu_option(addon.getLocalizedString(30111), get_url(action='vod'), icon='vod.png') # VOD
       add_menu_option(addon.getLocalizedString(30112), get_url(action='search'), icon='search.png') # Search
       add_menu_option(addon.getLocalizedString(30180), get_url(action='profiles'), icon='profiles.png') # Profiles
@@ -742,10 +745,10 @@ def run():
   if addon.getSettingBool('uhd'):
     m.quality = 'UHD'
 
-  profile_id = addon.getSetting('profile_id')
+  profile_id = addon.getSetting('profile_id').upper()
   LOG('profile_id: {}'.format(profile_id))
-  if profile_id in ['OTT', 'NODTH']:
-    m.account['platform'] = addon.getSetting('profile_id')
+  if profile_id not in ['', 'AUTO']:
+    m.account['platform'] = profile_id
 
   # Clear cache
   LOG('Cleaning cache. {} files removed.'.format(m.cache.clear_cache()))
diff --git a/resources/settings.xml b/resources/settings.xml
index 8187c9a..c2fe651 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -10,7 +10,7 @@
         <setting label="30019" type="action" id="is_settings" action="Addon.OpenSettings(inputstream.adaptive)" enable="System.HasAddon(inputstream.adaptive)" option="close"/>
         <setting id="reuse_devices" type="bool" label="30023" default="false" visible="true"/>
         <setting id="open_session" type="bool" label="30022" default="true" visible="true"/>
-        <setting id="profile_id" type="labelenum" label="Profile ID" values="Auto|OTT|NODTH" visible="false"/>
+        <setting id="profile_id" type="text" label="Profile ID" default="Auto" visible="false"/>
         <setting type="sep"/>
         <setting label="30450" type="action" id="donation" action="RunPlugin(plugin://plugin.video.movistarplus?action=show_donation_dialog)" option="close"/>
     </category>