forked from peter/volvo2mqtt
* Catch Volvo API not returning a valid json string #104 * Update changelog
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
## v1.8.8
|
||||
### 🐛 Bug Fixes:
|
||||
|
||||
- Fix json decode error, if volvo API returns a simple string #104
|
||||
|
||||
## v1.8.7
|
||||
### 🚀 Features:
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
from config import settings
|
||||
|
||||
VERSION = "v1.8.7"
|
||||
VERSION = "v1.8.8"
|
||||
|
||||
OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
|
||||
VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"
|
||||
|
||||
+6
-5
@@ -255,11 +255,12 @@ def update_car_data(force_update=False, overwrite={}):
|
||||
else:
|
||||
topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state"
|
||||
|
||||
mqtt_client.publish(
|
||||
topic,
|
||||
json.dumps(state) if isinstance(state, dict) or isinstance(state, list) else state
|
||||
)
|
||||
update_ha_device(entity, vin, state)
|
||||
if state:
|
||||
mqtt_client.publish(
|
||||
topic,
|
||||
json.dumps(state) if isinstance(state, dict) or isinstance(state, list) else state
|
||||
)
|
||||
update_ha_device(entity, vin, state)
|
||||
|
||||
|
||||
def update_ha_device(entity, vin, state):
|
||||
|
||||
+6
-1
@@ -8,6 +8,7 @@ from threading import currentThread
|
||||
from datetime import datetime, timedelta
|
||||
from config import settings
|
||||
from babel.dates import format_datetime
|
||||
from json import JSONDecodeError
|
||||
from const import charging_system_states, charging_connection_states, door_states, window_states, \
|
||||
OAUTH_URL, VEHICLES_URL, VEHICLE_DETAILS_URL, RECHARGE_STATE_URL, CLIMATE_START_URL, \
|
||||
WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL, supported_entities, BATTERY_CHARGE_STATE_URL, \
|
||||
@@ -347,7 +348,11 @@ def api_call(url, method, vin, sensor_id=None, force_update=False, key_change=Fa
|
||||
return None
|
||||
|
||||
logging.debug("Response status code: " + str(response.status_code))
|
||||
data = response.json()
|
||||
try:
|
||||
data = response.json()
|
||||
except JSONDecodeError as e:
|
||||
logging.error("Fetched json decode error, Volvo API seems to return garbage. Skipping update. Error: " + str(e))
|
||||
return None
|
||||
|
||||
if response.status_code == 200:
|
||||
logging.debug(response.text)
|
||||
|
||||
Reference in New Issue
Block a user