Update

Author: fabaff

example.py

@@ -16,15 +16,12 @@ async def main():
     """Sample code to retrieve the data."""
     async with aiohttp.ClientSession() as session:
         data = Luftdaten(SENSOR_ID, loop, session)
+        await data.get_data()
 
-        valid = await data.validate_sensor(SENSOR_ID)
-
-        if not valid:
+        if not await data.validate_sensor():
             print("Station is not available:", data.sensor_id)
             return
 
-        await data.get_data()
-
         if data.values and data.meta:
             # Print the sensor values
             print("Sensor values:", data.values)

luftdaten/__init__.py

@@ -23,6 +23,7 @@ def __init__(self, sensor_id, loop, session):
         self._loop = loop
         self._session = session
         self.sensor_id = sensor_id
+        self.data = None
         self.values = {
                 'humidity': None,
                 'P1': None,
@@ -42,19 +43,19 @@ async def get_data(self):
 
             _LOGGER.debug(
                 "Response from luftdaten.info: %s", response.status)
-            data = await response.json()
-            _LOGGER.debug(data)
+            self.data = await response.json()
+            _LOGGER.debug(self.data)
         except (asyncio.TimeoutError, aiohttp.ClientError):
             _LOGGER.error("Can not load data from luftdaten.info")
             raise exceptions.LuftdatenConnectionError()
 
-        if not data:
+        if not self.data:
             self.values = self.meta = None
             return
 
         try:
             sensor_data = sorted(
-                data, key=lambda timestamp: timestamp['timestamp'],
+                self.data, key=lambda timestamp: timestamp['timestamp'],
                 reverse=True)[0]
 
             for entry in sensor_data['sensordatavalues']:
@@ -69,18 +70,6 @@ async def get_data(self):
         except (TypeError, IndexError):
             raise exceptions.LuftdatenError()
 
-    async def validate_sensor(self, sensor_id):
+    async def validate_sensor(self):
         """Return True if the sensor ID is valid."""
-        try:
-            with async_timeout.timeout(5, loop=self._loop):
-                response = await self._session.get(
-                    '{}/{}/'.format(self.url, sensor_id))
-
-            _LOGGER.debug(
-                "Response from luftdaten.info: %s", response.status)
-            data = await response.json()
-        except (asyncio.TimeoutError, aiohttp.ClientError):
-            _LOGGER.error("Can not load data from luftdaten.info")
-            raise exceptions.LuftdatenConnectionError()
-
-        return True if data else False
+        return True if self.data else False