jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 19:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring and JSON decode error handling (#5826)

Browse Source 
* Refactoring and JSON decode error handling

* Catch ValueError instead of simplejson.scanner.JSONDecodeError
This commit is contained in:
Philipp Schmitt 2017-02-10 02:57:19 +01:00 committed by Paulus Schoutsen
parent 2e8e5a35b5
commit 4c5e6399e9
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
homeassistant/components/zoneminder.py
View File

@ -5,7 +5,6 @@ For more details about this component, please refer to the documentation at
https://home-assistant.io/components/zoneminder/ https://home-assistant.io/components/zoneminder/
""" """
import logging import logging
import json
from urllib.parse import urljoin from urllib.parse import urljoin
import requests import requests
@ -79,46 +78,44 @@ def login():
ZM['url'] + 'api/host/getVersion.json', cookies=ZM['cookies'], ZM['url'] + 'api/host/getVersion.json', cookies=ZM['cookies'],
timeout=DEFAULT_TIMEOUT) timeout=DEFAULT_TIMEOUT)
if req.status_code != requests.codes.ok: if not req.ok:
_LOGGER.error("Connection error logging into ZoneMinder") _LOGGER.error("Connection error logging into ZoneMinder")
return False return False
return True return True
# pylint: disable=no-member def _zm_request(method, api_url, data=None):
def get_state(api_url): """Perform a Zoneminder request."""
"""Get a state from the ZoneMinder API service."""
# Since the API uses sessions that expire, sometimes we need to re-auth # Since the API uses sessions that expire, sometimes we need to re-auth
# if the call fails. # if the call fails.
for _ in range(LOGIN_RETRIES): for _ in range(LOGIN_RETRIES):
req = requests.get(urljoin(ZM['url'], api_url), cookies=ZM['cookies'], req = requests.request(
timeout=DEFAULT_TIMEOUT) method, urljoin(ZM['url'], api_url), data=data,
cookies=ZM['cookies'], timeout=DEFAULT_TIMEOUT)
if req.status_code != requests.codes.ok: if not req.ok:
login() login()
else: else:
break break
else: else:
_LOGGER.exception("Unable to get API response from ZoneMinder") _LOGGER.exception("Unable to get API response from ZoneMinder")
return json.loads(req.text) try:
return req.json()
except ValueError:
_LOGGER.exception('JSON decode exception caught while attempting to '
'decode "%s"', req.text)
# pylint: disable=no-member
def get_state(api_url):
"""Get a state from the ZoneMinder API service."""
return _zm_request('get', api_url)
# pylint: disable=no-member # pylint: disable=no-member
def change_state(api_url, post_data): def change_state(api_url, post_data):
"""Update a state using the Zoneminder API.""" """Update a state using the Zoneminder API."""
for _ in range(LOGIN_RETRIES): return _zm_request('post', api_url, data=post_data)
req = requests.post(
urljoin(ZM['url'], api_url), data=post_data, cookies=ZM['cookies'],
timeout=DEFAULT_TIMEOUT)
if req.status_code != requests.codes.ok:
login()
else:
break
else:
_LOGGER.exception("Unable to get API response from ZoneMinder")
return json.loads(req.text)