diff --git a/we_collector.py b/we_collector.py index f2d6ae4..29b919f 100644 --- a/we_collector.py +++ b/we_collector.py @@ -42,6 +42,7 @@ class WeCollector: self.create_session() self._file_timestamp = None self.fritz = FritzSmartHome(fritz_host) + self._other_data_last = {} def create_session(self): expired_token_for_test = 'eyJraWQiOiI0ODEyODgzZi05Y2FiLTQwMWMtYTI5OC0wZmEyMTA5Y2ViY2EiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMDQyNmRjZC1mYzljLTRkODctODBmYy0yMDIyNzdmYzhkYzIiLCJhdWQiOiJhMjRmYmE2My0zNGIzLTRkNDMtYjE4MS05NDIxMTFlNmJkYThAYXBwc192dy1kaWxhYl9jb20iLCJzY3AiOiJvcGVuaWQgcHJvZmlsZSBiYWRnZSBjYXJzIGRlYWxlcnMgdmluIiwiYWF0IjoiaWRlbnRpdHlraXQiLCJpc3MiOiJodHRwczovL2lkZW50aXR5LnZ3Z3JvdXAuaW8iLCJqdHQiOiJhY2Nlc3NfdG9rZW4iLCJleHAiOjE3Mjg5ODQzMjAsImlhdCI6MTcyODk4MDcyMCwibGVlIjpbIlZPTEtTV0FHRU4iXSwianRpIjoiYWQ0MDhkMDEtYmQxMy00YWZkLWIyMWEtYmZiMTE5NTFhOGE3In0.r78z00BS0Je7mjUcukmrkuSiPO9F8me-bLs3ZZF6BokhPX8uqu_2j7I3Pu-8C1xwFBb-YDs6rr0iiVUeOeiKM4O-jOik8ny57sMKdYJ_FHZNo-GLMA_WPppNaGWkM8HojIxEW4mrO3Zqd9f_vDrTAYukG4WyULbxq_OH6c6yQdmEx4M1PGisVB0DI6DG0Dl4748BCJMA_TyNvKagQHZuRhT0ma7kj_GVSqlGGtW0erwPBwTHY_X_wDitngod2iUw9nRtli-HkJKqgER82jSu2k5b36ePglsRqx6k4ls8Tiz6ykgcjuuW4_zdsfUNuhBElVd1QwCzolQ4e7IzHbVaRZbub8tlisrHZMskGJmNJeAUv9xZMJ8o6YNyAz__WPvP6iubrCIixSKOThv-YLXa0cFkCPmoaLR9eeTy6sWFsFvslTdD-a0zrrdP8ais4g5Cxao6ph3NV1xCgkEldImI3n1hxeMLefe6sqfoZ6Ogz-EDVPBxS9qpazPWN6EQyyYLXQZA0s6p5hcrjVq7pD-5yXjeFhCrymzizaNm0JhVF_L36F3D5a3s8tnQ2kaMfdK6jdHQyauxL-8SHfAgk_py33XOcgGQkp4aOXN3pm7UhutQ8fAS9kMoquqikuxTAu-UlWAYRhDUaypab1F51f50eK84s1jpgWDAQ1aL7PIgwj8' @@ -66,6 +67,7 @@ class WeCollector: self._record_id = 0 self._record_list = [] self._vehicle_data_last = {} + self._other_data_last = {} self._file_timestamp = file_timestamp def request(self, _date, timestamp): @@ -82,7 +84,9 @@ class WeCollector: try: - temperatures = [{"name": "outside", "value": temp_deg_c, "unit": "celsius"}] + other_data = {"temperature" : {"name": "outside", "value": temp_deg_c, "unit": "celsius"}} + other_data_diff = jay_diff_full(self._other_data_last, other_data) + self._other_data_last = other_data print(f"{timestamp}: Retrieve vehicle data for {self._user['username']}") @@ -99,7 +103,7 @@ class WeCollector: 'username': self._user['username'], 'vin': self._user['vin']}, 'data': vehicle_data_diff, - 'temperatures': temperatures}) + 'other_data': other_data_diff}) # Store record list print(f"{timestamp}: Store record #{self._record_id:04d}")