Merge pull request #29 from joaosagrath/patch-1

[plugin.video.netflix.git] / resources / lib / MSL.py

diff --git a/resources/lib/MSL.py b/resources/lib/MSL.py
index 409411322adeb342fb32fb2a09432144617ff31e..ef7e93be5a6c20ba6ab7ce85881eb09bfa009dc3 100644 (file)
--- a/resources/lib/MSL.py
+++ b/resources/lib/MSL.py
@@ -10,6 +10,8 @@ import os
 import pprint
 import random
 from StringIO import StringIO
+
+from datetime import datetime
 import requests
 import zlib
 
@@ -353,27 +355,22 @@ class MSL:
                 segment_base = ET.SubElement(rep, 'SegmentBase', indexRange="0-"+str(init_length), indexRangeExact="true")
                 ET.SubElement(segment_base, 'Initialization', range='0-'+str(init_length))
 
-        # Multiple Adaption Set for subtiles
+        # Multiple Adaption Sets for subtiles
         for text_track in manifest['textTracks']:
-            print text_track
             if 'downloadables' not in text_track or text_track['downloadables'] is None:
                 continue
             subtiles_adaption_set = ET.SubElement(period, 'AdaptationSet',
                                                   lang=text_track['bcp47'],
+                                                  codecs='stpp',
                                                   contentType='text',
-                                                  mimeType='text/vtt')
+                                                  mimeType='application/ttml+xml')
             for downloadable in text_track['downloadables']:
                 rep = ET.SubElement(subtiles_adaption_set, 'Representation',
-                                    bandwidth='0',
                                     nflxProfile=downloadable['contentProfile']
                                     )
-                print downloadable['urls']
                 ET.SubElement(rep, 'BaseURL').text = self.__get_base_url(downloadable['urls'])
 
 
-
-
-
         xml = ET.tostring(root, encoding='utf-8', method='xml')
         xml = xml.replace('\n', '').replace('\r', '')
         return xml
@@ -583,6 +580,18 @@ class MSL:
 
     def __load_msl_data(self):
         msl_data = json.JSONDecoder().decode(self.load_file(self.kodi_helper.msl_data_path, 'msl_data.json'))
+        #Check expire date of the token
+        master_token = json.JSONDecoder().decode(base64.standard_b64decode(msl_data['tokens']['mastertoken']['tokendata']))
+        valid_until = datetime.utcfromtimestamp(int(master_token['expiration']))
+        present = datetime.now()
+        difference = valid_until - present
+        difference = difference.total_seconds() / 60 / 60
+        # If token expires in less then 10 hours or is expires renew it
+        if difference < 10:
+            self.__load_rsa_keys()
+            self.__perform_key_handshake()
+            return
+
         self.__set_master_token(msl_data['tokens']['mastertoken'])
         self.encryption_key = base64.standard_b64decode(msl_data['encryption_key'])
         self.sign_key = base64.standard_b64decode(msl_data['sign_key'])