peter/volvo2mqtt
1
0
Fork 1
mirror of https://github.com/Dielee/volvo2mqtt.git synced 2026-08-13 11:19:52 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix recharge caching while using multiple cars

Browse Source
This commit is contained in:
Linus Dietz
2023-06-20 08:56:45 +02:00
parent 2b6a2a4f4c
commit 71f03e505b
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
const.py
+1 -1
View File
@@ -1,4 +1,4 @@
VERSION = "v1.0.4" VERSION = "v1.0.5"
OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2" OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles" VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"
mqtt.py
+1
View File
@@ -74,6 +74,7 @@ def update_loop():
while True: while True:
print("Sending mqtt update...") print("Sending mqtt update...")
update_car_data() update_car_data()
print("Mqtt update done. Next run in " + str(settings["updateInterval"]) + " seconds.")
time.sleep(settings["updateInterval"]) time.sleep(settings["updateInterval"])
volvo.py
+6 -3
View File
@@ -115,18 +115,18 @@ def api_call(url, method, vin, sensor_id=None):
# No API Data cached, get fresh data from API # No API Data cached, get fresh data from API
print("Starting " + method + " call against " + url) print("Starting " + method + " call against " + url)
response = session.get(url.format(vin), timeout=15) response = session.get(url.format(vin), timeout=15)
recharge_response = response recharge_response[vin] = response
recharge_last_update = datetime.now() recharge_last_update = datetime.now()
else: else:
if (datetime.now() - recharge_last_update).total_seconds() >= settings["updateInterval"]: if (datetime.now() - recharge_last_update).total_seconds() >= settings["updateInterval"]:
# Old Data in Cache, updateing # Old Data in Cache, updateing
print("Starting " + method + " call against " + url) print("Starting " + method + " call against " + url)
response = session.get(url.format(vin), timeout=15) response = session.get(url.format(vin), timeout=15)
recharge_response = response recharge_response[vin] = response
recharge_last_update = datetime.now() recharge_last_update = datetime.now()
else: else:
# Data is up do date, returning cached data # Data is up do date, returning cached data
response = recharge_response response = recharge_response[vin]
elif method == "GET": elif method == "GET":
print("Starting " + method + " call against " + url) print("Starting " + method + " call against " + url)
response = session.get(url.format(vin), timeout=15) response = session.get(url.format(vin), timeout=15)
@@ -147,7 +147,10 @@ def api_call(url, method, vin, sensor_id=None):
else: else:
print("API Call failed. Status Code: " + str(response.status_code) + ". Error: " + response.text) print("API Call failed. Status Code: " + str(response.status_code) + ". Error: " + response.text)
return "" return ""
return parse_api_data(url, data, sensor_id)
def parse_api_data(url, data, sensor_id=None):
if url == VEHICLE_DETAILS_URL: if url == VEHICLE_DETAILS_URL:
return data["data"] return data["data"]
elif sensor_id == "battery_charge_level": elif sensor_id == "battery_charge_level":