[Change] Allow name or id in station parameters of WeatherStationData or lastData

Author: philippelt

lnetatmo.py

@@ -293,8 +293,17 @@ def __init__(self, authData, home=None, station=None):
         # Keeping the old behavior for default station name
         if home and home not in self.homes : raise NoHome("No home with name %s" % home)
         self.default_home = home or list(self.homes.keys())[0]
-        if station and station not in self.stations: raise NoDevice("No station with name %s" % station)
-        self.default_station = station or [v["station_name"] for k,v in self.stations.items() if v["home_name"] == self.default_home][0]
+        if station:
+            if station not in self.stations:
+                # May be a station_id convert it to corresponding station name
+                s = self.stationById(station)
+                if s :
+                    station = s["station_name"]
+                else:
+                    raise NoDevice("No station with name or id %s" % station)
+            self.default_station = station
+        else:
+            self.default_station =  [v["station_name"] for k,v in self.stations.items() if v["home_name"] == self.default_home][0]
         self.modules = dict()
         self.default_station_data = self.stationByName(self.default_station)
         if 'modules' in self.default_station_data:
@@ -313,6 +322,7 @@ def __init__(self, authData, home=None, station=None):
 
     def modulesNamesList(self, station=None, home=None):
         res = [m['module_name'] for m in self.modules.values()]
+        station = self.stationByName(station) or self.stationById(station)
         res.append(self.stationByName(station)['module_name'])
         return res
 
@@ -324,7 +334,9 @@ def stationByName(self, station=None):
         return None
 
     def stationById(self, sid):
-        return self.stations.get(sid)
+        for s in self.stations:
+            if sid == self.stations[s]["_id"]: return self.stations[s]
+        return None
 
     def moduleByName(self, module):
         for m in self.modules:
@@ -337,7 +349,7 @@ def moduleById(self, mid):
         return self.modules.get(mid)
 
     def lastData(self, station=None, exclude=0):
-        s = self.stationByName(station)
+        s = self.stationByName(station) or self.stationById(station)
         # Breaking change from Netatmo : dashboard_data no longer available if station lost
         if not s or 'dashboard_data' not in s : return None
         lastD = dict()

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='lnetatmo',
-    version='3.0.1',
+    version='3.0.2',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -17,7 +17,7 @@
     scripts=[],
     data_files=[],
     url='https://github.com/philippelt/netatmo-api-python',
-    download_url='https://github.com/philippelt/netatmo-api-python/archive/v3.0.1.tar.gz',
+    download_url='https://github.com/philippelt/netatmo-api-python/archive/v3.0.2.tar.gz',
     license='GPL V3',
     description='Simple API to access Netatmo weather station data from any python script.'
 )

usage.md

@@ -226,7 +226,7 @@ Constructor
 ```
 
 
- * Input : an authorization object (ClientAuth instance), an optional home name, an optional station name
+ * Input : an authorization object (ClientAuth instance), an optional home name, an optional station name or id
 
 Return : a WeatherStationData object. This object contains most administration properties of stations and modules accessible to the user and the last data pushed by the station to the Netatmo servers.