fix(esn): Fixes unicode problems

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

diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py
index 6ffe6104bd0f235a3fae7d65fcf89d21d3f73b89..a75f2e71f6ee3fb234ce7b90d4fa9743a13823c8 100644 (file)
--- a/resources/lib/KodiHelper.py
+++ b/resources/lib/KodiHelper.py
@@ -196,6 +196,8 @@ class KodiHelper:
         """
         Returns the esn from settings
         """
+        self.log(msg='Is FILE: ' + str(isfile(self.msl_data_path + 'msl_data.json')))
+        self.log(msg=self.get_addon().getSetting('esn'))
         return self.get_addon().getSetting('esn')
 
     def set_esn(self, esn):
@@ -203,7 +205,7 @@ class KodiHelper:
         Returns the esn from settings
         """
         stored_esn = self.get_esn()
-        if not stored_esn:
+        if not stored_esn and esn:
             self.set_setting('esn', esn)
             self.delete_manifest_data()            
             return esn
@@ -215,6 +217,7 @@ class KodiHelper:
         if isfile(self.msl_data_path + 'manifest.json'):
             remove(self.msl_data_path + 'manifest.json')
         msl = MSL(kodi_helper=self)
+        msl.perform_key_handshake()
         msl.save_msl_data()
 
     def get_dolby_setting(self):
@@ -671,6 +674,7 @@ class KodiHelper:
         bool
             List could be build
         """
+        self.set_esn(esn)
         addon = self.get_addon()
         inputstream_addon = self.get_inputstream_addon()
         if inputstream_addon == None:
@@ -771,7 +775,9 @@ class KodiHelper:
             if 'mpaa' in entry_keys:
                 infos.update({'mpaa': entry['mpaa']})
             else:
-                infos.update({'mpaa': str(entry['maturity']['board']) + '-' + str(entry['maturity']['value'])})
+                if entry.get('maturity', None) is not None:
+                    if entry['maturity']['board'] is not None and entry['maturity']['value'] is not None:
+                        infos.update({'mpaa': str(entry['maturity']['board'].encode('utf-8')) + '-' + str(entry['maturity']['value'].encode('utf-8'))})
         if 'rating' in entry_keys:
             infos.update({'rating': int(entry['rating']) * 2})
         if 'synopsis' in entry_keys: