Merge pull request #78 from tchellomello/sseclient_none

Make sure response is valid before creating Thread

pyarlo/base_station.py

@@ -51,6 +51,10 @@ def thread_function(self):
         url = SUBSCRIBE_ENDPOINT + "?token=" + self._session_token
 
         data = self._session.query(url, method='GET', raw=True, stream=True)
+        if not data or not data.ok:
+            _LOGGER.debug("Did not receive a valid response. Aborting..")
+            return None
+
         self.__sseclient = sseclient.SSEClient(data)
 
         for event in (self.__sseclient).events():
@@ -69,6 +73,7 @@ def thread_function(self):
                 elif action == "is" and "subscriptions/" not in resource:
                     self.__events.append(data)
                     self.__event_handle.set()
+        return True
 
     def _get_event_stream(self):
         """Spawn a thread and monitor the Arlo Event Stream."""
@@ -277,13 +282,16 @@ def available_modes_with_ids(self):
             all_modes = FIXED_MODES.copy()
             self._available_mode_ids = all_modes
             modes = self.get_available_modes()
-            if modes:
-                simple_modes = dict(
-                    [(m.get("type", m.get("name")), m.get("id"))
-                     for m in modes]
-                )
-                all_modes.update(simple_modes)
-                self._available_mode_ids = all_modes
+            try:
+                if modes:
+                    simple_modes = dict(
+                        [(m.get("type", m.get("name")), m.get("id"))
+                         for m in modes]
+                    )
+                    all_modes.update(simple_modes)
+                    self._available_mode_ids = all_modes
+            except TypeError:
+                _LOGGER.debug("Did not receive a valid response. Passing..")
         return self._available_mode_ids
 
     @property