X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=blobdiff_plain;f=resources%2Flib%2FNetflixSession.py;h=6755c66694ba40a8045cb08b01bd9bfa107d152a;hp=a96fae6f9b400b310e25120c27b222e3f827a9fd;hb=90f1fed6e5a2422235eb412d202da1f98de16149;hpb=4ec9b5afd40ef050c550ae2e6c97ca153314b6be

diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py
index a96fae6..6755c66 100644
--- a/resources/lib/NetflixSession.py
+++ b/resources/lib/NetflixSession.py
@@ -4,17 +4,17 @@
 # Created on: 13.01.2017
 
 import os
-import base64
-import time
-import urllib
 import json
-import requests
+from requests import session, cookies
+from urllib import quote
+from time import time
+from base64 import urlsafe_b64encode
+from bs4 import BeautifulSoup, SoupStrainer
+from utils import noop
 try:
    import cPickle as pickle
 except:
    import pickle
-from bs4 import BeautifulSoup, SoupStrainer
-from utils import noop
 
 class NetflixSession:
     """Helps with login/session management of Netflix users & API data fetching"""
@@ -25,7 +25,7 @@ class NetflixSession:
     urls = {
         'login': '/login',
         'browse': '/browse',
-        'video_list_ids': '/warmer',
+        'video_list_ids': '/preflight',
         'shakti': '/pathEvaluator',
         'profiles':  '/browse',
         'switch_profiles': '/profiles/switch',
@@ -100,7 +100,7 @@ class NetflixSession:
         self.log = log_fn
 
         # start session, fake chrome on the current platform (so that we get a proper widevine esn) & enable gzip
-        self.session = requests.session()
+        self.session = session()
         self.session.headers.update({
             'User-Agent': self._get_user_agent_for_current_platform(),
             'Accept-Encoding': 'gzip'
@@ -272,7 +272,7 @@ class NetflixSession:
         """
         payload = {
             'switchProfileGuid': profile_id,
-            '_': int(time.time()),
+            '_': int(time()),
             'authURL': self.user_data['authURL']
         }
 
@@ -280,14 +280,9 @@ class NetflixSession:
         if response.status_code != 200:
             return False
 
-        # fetch the index page again, so that we can fetch the corresponding user data
-        browse_response = self._session_get(component='browse')
-        only_script_tags = SoupStrainer('script')
-        browse_soup = BeautifulSoup(browse_response.text, 'html.parser', parse_only=only_script_tags)
         account_hash = self._generate_account_hash(account=account)
         self.user_data['guid'] = profile_id;
-        self._save_data(filename=self.data_path + '_' + account_hash)
-        return True
+        return self._save_data(filename=self.data_path + '_' + account_hash)
 
     def send_adult_pin (self, pin):
         """Send the adult pin to Netflix in case an adult rated video requests it
@@ -1295,7 +1290,7 @@ class NetflixSession:
             'toRow': list_to,
             'opaqueImageExtension': 'jpg',
             'transparentImageExtension': 'png',
-            '_': int(time.time()),
+            '_': int(time()),
             'authURL': self.user_data['authURL']
         }
         response = self._session_get(component='video_list_ids', params=payload, type='api')
@@ -1321,7 +1316,7 @@ class NetflixSession:
             Raw Netflix API call response or api call error
         """
         # properly encode the search string
-        encoded_search_string = urllib.quote(search_str)
+        encoded_search_string = quote(search_str)
 
         paths = [
             ['search', encoded_search_string, 'titles', {'from': list_from, 'to': list_to}, ['summary', 'title']],
@@ -1424,7 +1419,7 @@ class NetflixSession:
         payload = {
             'movieid': id,
             'imageformat': 'jpg',
-            '_': int(time.time())
+            '_': int(time())
         }
         response = self._session_get(component='metadata', params=payload, type='api')
         return self._process_response(response=response, component=self._get_api_url_for(component='metadata'))
@@ -1813,10 +1808,10 @@ class NetflixSession:
             return False
 
         with open(filename) as f:
-            cookies = pickle.load(f)
-            if cookies:
-                jar = requests.cookies.RequestsCookieJar()
-                jar._cookies = cookies
+            _cookies = pickle.load(f)
+            if _cookies:
+                jar = cookies.RequestsCookieJar()
+                jar._cookies = _cookies
                 self.session.cookies = jar
             else:
                 return False
@@ -1849,7 +1844,7 @@ class NetflixSession:
         :obj:`str`
             Account data hash
         """
-        return base64.urlsafe_b64encode(account['email'])
+        return urlsafe_b64encode(account['email'])
 
     def _get_user_agent_for_current_platform (self):
         """Determines the user agent string for the current platform (to retrieve a valid ESN)
@@ -1895,9 +1890,9 @@ class NetflixSession:
                 Contents of the field to match
         """
         url = self._get_document_url_for(component=component) if type == 'document' else self._get_api_url_for(component=component)
-        start = time.time()
+        start = time()
         response = self.session.post(url=url, data=data, params=params, headers=headers, verify=self.verify_ssl)
-        end = time.time()
+        end = time()
         self.log('[POST] Request for "' + url + '" took ' + str(end - start) + ' seconds')
         return response
 
@@ -1921,9 +1916,9 @@ class NetflixSession:
                 Contents of the field to match
         """
         url = self._get_document_url_for(component=component) if type == 'document' else self._get_api_url_for(component=component)
-        start = time.time()
+        start = time()
         response = self.session.get(url=url, verify=self.verify_ssl, params=params)
-        end = time.time()
+        end = time()
         self.log('[GET] Request for "' + url + '" took ' + str(end - start) + ' seconds')
         return response
 
@@ -2296,5 +2291,5 @@ class NetflixSession:
         self.esn = self._parse_esn_data(netflix_page_data=netflix_page_data)
         self.api_data = self._parse_api_base_data(netflix_page_data=netflix_page_data)
         self.profiles = self._parse_profile_data(netflix_page_data=netflix_page_data)
-        self.log('Found ESN "' + self.esn)
+        self.log('Found ESN "' + self.esn + '"')
         return netflix_page_data