X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=resources%2Flib%2FMSL.py;h=db9d68b4b94d5dfab0ab35a446f10303d07a04ce;hb=a190d8141ee4d3a09c7fef3334fd6083ff9c354e;hp=7f813d470b33acda3ea7c102751a9f4af4c44cde;hpb=da6c6467a3bbea8f796851b047df9c8f02399426;p=plugin.video.netflix.git diff --git a/resources/lib/MSL.py b/resources/lib/MSL.py index 7f813d4..db9d68b 100644 --- a/resources/lib/MSL.py +++ b/resources/lib/MSL.py @@ -46,13 +46,11 @@ class MSL: 'license': 'http://www.netflix.com/api/msl/NFCDCH-LX/cadmium/license' } - def __init__(self, email, password, kodi_helper): + def __init__(self, kodi_helper): """ The Constructor checks for already existing crypto Keys. If they exist it will load the existing keys """ - self.email = email - self.password = password self.kodi_helper = kodi_helper try: os.mkdir(self.kodi_helper.msl_data_path) @@ -149,8 +147,6 @@ class MSL: # Audio 'heaac-2-dash', - 'ddplus-2.0-dash', - 'ddplus-5.1-dash', 'dfxp-ls-sdh', 'simplesdh', 'nflx-cmisc', @@ -173,6 +169,12 @@ class MSL: 'clientVersion': '4.0004.899.011', 'uiVersion': 'akira' } + + # Check if dolby sound is enabled and add to profles + if self.kodi_helper.get_dolby_setting(): + manifest_request_data['profiles'].append('ddplus-2.0-dash') + manifest_request_data['profiles'].append('ddplus-5.1-dash') + request_data = self.__generate_msl_request_data(manifest_request_data) resp = self.session.post(self.endpoints['manifest'], request_data) @@ -459,12 +461,13 @@ class MSL: if 'usertoken' in self.tokens: pass else: + account = self.kodi_helper.get_credentials() # Auth via email and password header_data['userauthdata'] = { 'scheme': 'EMAIL_PASSWORD', 'authdata': { - 'email': self.email, - 'password': self.password + 'email': account['email'], + 'password': account['password'] } }