[Change] Allow station access by id to handle duplicate name #53

Author: philippelt

lnetatmo.py

@@ -292,6 +292,7 @@ def __init__(self, authData, home=None, station=None):
         if not self.rawData : raise NoDevice("No weather station in any homes")
         # Stations are no longer in the Netatmo API, keeping them for compatibility
         self.stations = { d['station_name'] : d for d in self.rawData }
+        self.stationIds = { d['_id'] : d for d in self.rawData }
         self.homes = { d['home_name'] : d["station_name"] for d in self.rawData }
         # Keeping the old behavior for default station name
         if home and home not in self.homes : raise NoHome("No home with name %s" % home)
@@ -331,15 +332,13 @@ def modulesNamesList(self, station=None, home=None):
 
     def stationByName(self, station=None):
         if not station : station = self.default_station
-        for i,s in self.stations.items():
-            if s['station_name'] == station :
-                return self.stations[i]
-        return None
+        if station not in self.stations : return None
+        return self.stations[station]
 
     def stationById(self, sid):
-        for s in self.stations:
-            if sid == self.stations[s]["_id"]: return self.stations[s]
-        return None
+        if not sid : return self.stations[self.default_station]
+        if sid not in self.stationIds : return None
+        return self.stationIds[sid]
 
     def moduleByName(self, module):
         for m in self.modules:

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='lnetatmo',
-    version='3.0.3',
+    version='3.1.0',
     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.3.tar.gz',
+    download_url='https://github.com/philippelt/netatmo-api-python/archive/v3.1.0.tar.gz',
     license='GPL V3',
     description='Simple API to access Netatmo weather station data from any python script.'
 )