Version 0.7.4

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.orange.spain"
        name="Orange TV España"
-       version="0.7.1"
+       version="0.7.4"
        provider-name="Paco8">
   <requires>
   <!--- <import addon="xbmc.python" version="2.25.0"/> -->

resources/lib/orange.py

@@ -42,6 +42,7 @@ def __init__(self, config_directory):
         'Origin': 'https://orangetv.orange.es',
         'Referer': 'https://orangetv.orange.es/',
         'User-Agent': 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:88.0) Gecko/20100101 Firefox/88.0'
+        #'User-Agent': 'okhttp/4.10.0'
       }
       self.net = Network()
       self.net.headers = headers
@@ -86,8 +87,10 @@ def __init__(self, config_directory):
       self.search_list = json.loads(data) if data else []
 
     def load_json(self, url, check_errors = True):
+      #print(url)
       headers = self.net.headers.copy()
       headers['Cookie'] = self.cookie
+      #print_json(headers)
       content = self.net.load_url(url, headers)
       data = json.loads(content)
       if check_errors and ('response' in data) and ('status' in data['response']) and data['response']['status'] == 'FAILURE':
@@ -904,16 +907,34 @@ def get_channels_list(self):
       return res
     """
 
+    def download_bouquet(self):
+      url = endpoints['get-bouquet-list']
+      data = self.load_json(url)
+      self.cache.save_file('bouquet.json', json.dumps(data, ensure_ascii=False))
+      return data
+
+    def download_channels(self, bouquet):
+      url = endpoints['get-channel-list'].format(bouquet_id=bouquet, model_external_id=self.device['type'])
+      headers = self.net.headers.copy()
+      headers['Cookie'] = self.cookie
+      response = self.net.session.get(url, headers=headers)
+      content = response.content.decode('utf-8')
+      data = json.loads(content)
+      self.cache.save_file('channels2.json', json.dumps(data, ensure_ascii=False))
+
+      # Get response cookies
+      cookie_dict = requests.utils.dict_from_cookiejar(response.cookies)
+      response_cookie = '; '.join([key + '=' + value for key, value in cookie_dict.items()])
+      return data, response_cookie
+
     def get_channels_list(self):
       res = []
 
       content = self.cache.load('bouquet.json')
       if content:
         data = json.loads(content)
       else:
-        url = endpoints['get-bouquet-list']
-        data = self.load_json(url)
-        self.cache.save_file('bouquet.json', json.dumps(data, ensure_ascii=False))
+        data = self.download_bouquet()
 
       #LOG(json.dumps(data, indent=4))
       bouquet = data['response'][0]['id']
@@ -922,9 +943,7 @@ def get_channels_list(self):
       if content:
         data = json.loads(content)
       else:
-        url = endpoints['get-channel-list'].format(bouquet_id=bouquet, model_external_id=self.device['type'])
-        data = self.load_json(url)
-        self.cache.save_file('channels2.json', json.dumps(data, ensure_ascii=False))
+        data, _ = self.download_channels(bouquet)
 
       for d in data['response']:
         t = {}
@@ -1187,6 +1206,15 @@ def login(self):
       LOG('new cookie: {}'.format(new_cookie))
       self.cookie = new_cookie
 
+      # Get missing part of the cookie from the channels response header
+      if True:
+        data = self.download_bouquet()
+        bouquet = data['response'][0]['id']
+        _, response_cookie = self.download_channels(bouquet)
+        LOG('response_cookie: {}'.format(response_cookie))
+        if response_cookie:
+          self.cookie = response_cookie +'; '+ self.cookie
+
       self.cache.save_file('cookie.conf', self.cookie)
       return True