simplify and add support for get multiple remote sensors from diferent stats.

nkgilley · nkgilley · commit 6a5cce0c662a · 2015-12-02T14:56:31.000-05:00
diff --git a/pyecobee/__init__.py b/pyecobee/__init__.py
@@ -31,8 +31,8 @@ class Ecobee(object):
     ''' Class for storing Ecobee Thermostats and Sensors '''
 
     def __init__(self, config_filename=None, api_key=None):
-        self.sensors = dict()
         self.thermostats = list()
+        self.sensors = list()
         self.pin = None
         if config_filename is None:
             if api_key is None:
@@ -109,13 +109,17 @@ def get_thermostats(self):
         if request.status_code == requests.codes.ok:
             self.thermostats = request.json()['thermostatList']
         else:
+            print("Error connecting to Ecobee.  Refreshing tokens...")
             self.refresh_tokens()
-            self.get_thermostats()
 
     def get_thermostat(self, index):
         ''' Return a single thermostat based on index '''
         return self.thermostats[index]
 
+    def get_remote_sensors(self, index):
+        ''' Get remote sensor data and store in sensors '''
+        return self.thermostats[index]['remoteSensors']
+
     def set_hvac_mode(self, hvac_mode):
         ''' possible hvac modes are auto, auxHeatOnly, cool, heat, off '''
         url = 'https://api.ecobee.com/1/thermostat'
@@ -177,25 +181,6 @@ def resume_program(self, resume_all="false"):
             self.refresh_tokens()
             self.resume_program(resume_all)
 
-    def get_remote_sensors(self):
-        ''' Get remote sensor data and store in sensors '''
-        try:
-            json_sensors = self.thermostats[0]['remoteSensors']
-            sensors = dict()
-            for sensor in json_sensors:
-                sensor_info = dict()
-                for item in sensor['capability']:
-                    if item['type'] == 'temperature':
-                        sensor_info['temp'] = float(item['value']) / 10
-                    elif item['type'] == 'humidity':
-                        sensor_info['humidity'] = item['value']
-                    elif item['type'] == 'occupancy':
-                        sensor_info['occupancy'] = item['value']
-                sensors[sensor['name']] = sensor_info
-            self.sensors = sensors
-        except IOError:
-            print("Error retrieving remote sensor data.")
-
     def write_tokens_to_file(self, write_sensors=False):
         ''' Write api tokens to a file '''
         config = dict()
@@ -210,4 +195,4 @@ def write_tokens_to_file(self, write_sensors=False):
     def update(self):
         ''' Get new thermostat data from ecobee '''
         self.get_thermostats()
-        self.get_remote_sensors()
+
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='python-ecobee',
-      version='0.0.1',
+      version='0.0.2',
       description='Python API for talking to Ecobee thermostats',
       url='https://github.com/nkgilley/python-ecobee-api',
       author='Nolan Gilley',
