From 433a29971f72230e92b7e5c71b483b29123f4f29 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 23 Oct 2024 19:29:53 +0200 Subject: [PATCH] Refactored --- credentials.py | 8 ++++---- eval_records.py | 13 +++++-------- we_collector.py | 15 ++++++++++----- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/credentials.py b/credentials.py index c62c72a..6fa34c2 100644 --- a/credentials.py +++ b/credentials.py @@ -1,14 +1,14 @@ users = [ { - 'nickname': 'alex', - 'username': 'alex.thoni@gmx.de', + 'username': 'alex', 'password': 'Arielle2024!', + 'email': 'alex.thoni@gmx.de', 'vin': 'WVWZZZE1ZMP010760' }, { - 'nickname': 'jens', - 'username': 'jens.ahrensfeld@gmx.de', + 'username': 'jens', 'password': '2SaveMyCar', + 'email': 'jens.ahrensfeld@gmx.de', 'vin': 'WVWZZZE1ZMP010760' } ] diff --git a/eval_records.py b/eval_records.py index 7e313fe..dfd37d4 100644 --- a/eval_records.py +++ b/eval_records.py @@ -5,7 +5,7 @@ from jay_diff import jay_merge_full BASE = "/media/jens/cifs/jens@moon/projects/we_collect/results" VIN = 'WVWZZZE1ZMP010760' -NICK = 'alex' +USER = 'alex' YEAR = 2024 MONTH = 10 DAY = ['20', '21', '22'] @@ -103,7 +103,8 @@ def convert(timestamp_str: str, pattern: str = "%Y-%m-%dT%H:%M:%S.%f%z"): return result -path = os.path.join(BASE, VIN) +path = os.path.join(BASE, USER) +path = os.path.join(path, VIN) path = os.path.join(path, str(YEAR)) path = os.path.join(path, str(MONTH)) @@ -123,12 +124,8 @@ for day in day_list: day_path = os.path.join(month_path, day) # Sort out files with unknown nickname - file_list = [] - for filename in os.listdir(day_path): - if NICK in filename: - file_list.append(filename) - - file_list_sorted = sorted(file_list, key=lambda f: convert(f, pattern=f"{VIN}_{NICK}_%Y-%m-%dT%H-%M-%S.json")) + file_list = os.listdir(day_path) + file_list_sorted = sorted(file_list, key=lambda f: convert(f, pattern=f"records_%Y-%m-%dT%H-%M-%S.json")) print("Files in '", day_path, "' :") # prints all files print(file_list_sorted) diff --git a/we_collector.py b/we_collector.py index 264272e..be94fe0 100644 --- a/we_collector.py +++ b/we_collector.py @@ -38,7 +38,7 @@ class WeCollector: 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' - self._wci = wci.WeConnectId(self._user['username'], self._user['password'], expired_token_for_test) + self._wci = wci.WeConnectId(self._user['email'], self._user['password'], expired_token_for_test) vehicles = self._wci.get('/vehicles')['data'] print('list of vehicles:') pprint.pprint(vehicles) @@ -63,7 +63,7 @@ class WeCollector: def request(self, _date, timestamp): try: - print(f"{timestamp}: Retrieve vehicle data for {self._user['nickname']}") + print(f"{timestamp}: Retrieve vehicle data for {self._user['username']}") # Create data difference vehicle_data = self._wci.get(self._endpoint) @@ -71,12 +71,17 @@ class WeCollector: self._vehicle_data_last = vehicle_data # Put vehicle data difference onto record list - self._record_list.append({'info': {'record_id': self._record_id, 'timestamp': timestamp, 'is_delta': (self._record_id > 0), 'nickname': self._user['nickname']}, 'data': vehicle_data_diff}) + self._record_list.append({ + 'info': {'record_id': self._record_id, + 'timestamp': timestamp, 'is_delta': (self._record_id > 0), + 'username': self._user['username'], + 'vin': self._user['vin']}, + 'data': vehicle_data_diff}) # Store record list print(f"{timestamp}: Store record #{self._record_id:04d}") - folder = self._f_mgr.update(f"results/{self._user['vin']}", _date) - filename = f"{self._user['vin']}_{self._user['nickname']}_{self._file_timestamp}.json" + folder = self._f_mgr.update(f"results/{self._user['username']}/{self._user['vin']}", _date) + filename = f"records_{self._file_timestamp}.json" _path = os.path.join(folder, filename) with open(_path, "w") as fp: json.dump(self._record_list, fp, indent=4)