jarvis/volvo2mqtt
1
0
Fork 0
forked from peter/volvo2mqtt
Code Pull Requests Activity

Catch volvo api exceptions

Browse Source
This commit is contained in:
Linus Dietz
2023-06-24 08:54:44 +02:00
parent 023d8d2096
commit c7a883d781
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.py
+1
View File
@@ -2,6 +2,7 @@ from volvo import authorize
from mqtt import update_loop, connect from mqtt import update_loop, connect
from const import VERSION from const import VERSION
if __name__ == '__main__': if __name__ == '__main__':
print("Starting volvo2mqtt version " + VERSION) print("Starting volvo2mqtt version " + VERSION)
authorize() authorize()
src/volvo.py
+32 -4
View File
@@ -182,6 +182,9 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
recharge_api_last_update, recharge_api_last_update,
url, method, vin, url, method, vin,
force_update) force_update)
if response is None:
# Exception catched while getting data from volvo api, doing nothing
return None
elif url == WINDOWS_STATE_URL: elif url == WINDOWS_STATE_URL:
# Minimize API calls for window state # Minimize API calls for window state
global window_cached_api_response, window_api_last_update global window_cached_api_response, window_api_last_update
@@ -189,6 +192,9 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
window_api_last_update, window_api_last_update,
url, method, vin, url, method, vin,
force_update) force_update)
if response is None:
# Exception catched while getting data from volvo api, doing nothing
return ""
elif url == LOCK_STATE_URL: elif url == LOCK_STATE_URL:
# Minimize API calls for door state # Minimize API calls for door state
global door_cached_api_response, door_api_last_update global door_cached_api_response, door_api_last_update
@@ -196,6 +202,9 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
door_api_last_update, door_api_last_update,
url, method, vin, url, method, vin,
force_update) force_update)
if response is None:
# Exception catched while getting data from volvo api, doing nothing
return ""
elif url == TYRE_STATE_URL: elif url == TYRE_STATE_URL:
# Minimize API calls for tyre state # Minimize API calls for tyre state
global tyre_cached_api_response, tyre_api_last_update global tyre_cached_api_response, tyre_api_last_update
@@ -203,12 +212,23 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
tyre_api_last_update, tyre_api_last_update,
url, method, vin, url, method, vin,
force_update) force_update)
if response is None:
# Exception catched while getting data from volvo api, doing nothing
return ""
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) try:
response = session.get(url.format(vin), timeout=15)
except requests.exceptions.RequestException as e:
print("Error getting data: " + str(e))
return ""
elif method == "POST": elif method == "POST":
print("Starting " + method + " call against " + url) print("Starting " + method + " call against " + url)
response = session.post(url.format(vin), timeout=20) try:
response = session.post(url.format(vin), timeout=20)
except requests.exceptions.RequestException as e:
print("Error getting data: " + str(e))
return ""
else: else:
print("Unkown method posted: " + method + ". Returning nothing") print("Unkown method posted: " + method + ". Returning nothing")
return "" return ""
@@ -233,14 +253,22 @@ def cached_request(response_cache, update_cache, url, method, vin, force_update=
if not vin in response_cache or force_update: if not vin in response_cache or force_update:
# 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) try:
response = session.get(url.format(vin), timeout=15)
except requests.exceptions.RequestException as e:
print("Error getting data: " + str(e))
return None, None, None
response_cache[vin] = response response_cache[vin] = response
update_cache[vin] = datetime.now() update_cache[vin] = datetime.now()
else: else:
if (datetime.now() - update_cache[vin]).total_seconds() >= settings["updateInterval"]: if (datetime.now() - update_cache[vin]).total_seconds() >= settings["updateInterval"]:
# Old Data in Cache, updating # Old Data in Cache, updating
print("Starting " + method + " call against " + url) print("Starting " + method + " call against " + url)
response = session.get(url.format(vin), timeout=15) try:
response = session.get(url.format(vin), timeout=15)
except requests.exceptions.RequestException as e:
print("Error getting data: " + str(e))
return None, None, None
response_cache[vin] = response response_cache[vin] = response
update_cache[vin] = datetime.now() update_cache[vin] = datetime.now()
else: else: