X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=blobdiff_plain;f=resources%2Flib%2FNetflixHttpSubRessourceHandler.py;h=a4113a49612c37ee7237fb1d71a8e1a61acd3bee;hp=b1bad7a518d5534e8159ef2b9b9135121acb473e;hb=d6b516f25ba5662cc3399edbb96ad18b18e013cb;hpb=8181622bb63419bc0c1da5fb6ab30260b803e19f

diff --git a/resources/lib/NetflixHttpSubRessourceHandler.py b/resources/lib/NetflixHttpSubRessourceHandler.py
index b1bad7a..a4113a4 100644
--- a/resources/lib/NetflixHttpSubRessourceHandler.py
+++ b/resources/lib/NetflixHttpSubRessourceHandler.py
@@ -3,9 +3,6 @@
 # Module: NetflixHttpSubRessourceHandler
 # Created on: 07.03.2017
 
-from urllib2 import urlopen, URLError
-from time import sleep
-
 class NetflixHttpSubRessourceHandler:
     """ Represents the callable internal server routes & translates/executes them to requests for Netflix"""
 
@@ -26,28 +23,23 @@ class NetflixHttpSubRessourceHandler:
         self.netflix_session = netflix_session
         self.credentials = self.kodi_helper.get_credentials()
         self.profiles = []
-        self.prefetch_login()
         self.video_list_cache = {}
-        self.lolomo = None
+        self.prefetch_login()
 
     def prefetch_login (self):
         """Check if we have stored credentials.
         If so, do the login before the user requests it
         If that is done, we cache the profiles
         """
-        if self._network_availble():
-            if self.credentials['email'] != '' and self.credentials['password'] != '':
-                if self.netflix_session.is_logged_in(account=self.credentials):
-                    self.netflix_session.refresh_session_data(account=self.credentials)
-                    self.profiles = self.netflix_session.profiles
-                else:
-                    self.netflix_session.login(account=self.credentials)
-                    self.profiles = self.netflix_session.profiles
+        if self.credentials['email'] != '' and self.credentials['password'] != '':
+            if self.netflix_session.is_logged_in(account=self.credentials):
+                self.netflix_session.refresh_session_data(account=self.credentials)
+                self.profiles = self.netflix_session.profiles
             else:
-                self.profiles = []
+                self.netflix_session.login(account=self.credentials)
+                self.profiles = self.netflix_session.profiles
         else:
-            sleep(1)
-            self.prefetch_login()
+            self.profiles = []
 
     def is_logged_in (self, params):
         """Existing login proxy function
@@ -81,7 +73,6 @@ class NetflixHttpSubRessourceHandler:
         """
         self.profiles = []
         self.credentials = {'email': '', 'password': ''}
-        self.lolomo = None
         return self.netflix_session.logout()
 
     def login (self, params):
@@ -300,7 +291,6 @@ class NetflixHttpSubRessourceHandler:
             Response of the remote call
         """
         profile_id = params.get('profile_id', [''])[0]
-        self.lolomo = None
         return self.netflix_session.switch_profile(profile_id=profile_id, account=self.credentials)
 
     def get_user_data (self, params):
@@ -362,16 +352,3 @@ class NetflixHttpSubRessourceHandler:
         if 'error' in raw_search_contents:
             return raw_search_contents
         return self.netflix_session.parse_video_list(response_data=raw_search_contents)
-
-    def _network_availble(self):
-        """Check if the network is available
-        Returns
-        -------
-        bool
-            Network can be accessed
-        """
-        try:
-            urlopen('http://216.58.192.142', timeout=1)
-            return True
-        except URLError as err:
-            return False