evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Neato clean up (#27294)

Browse source 
* Replace hass with neato

* Clean up try-except blocks

* Add some new try-except blocks

* Clean up vacuum

* Minor fix

* Another fix
This commit is contained in:
Santobert 2019-10-07 21:49:54 +02:00 • committed by Paulus Schoutsen
parent a3c98440e0
commit 1febb32dd9
3 changed files with 64 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

45
homeassistant/components/neato/camera.py
View file

@ -28,9 +28,11 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
async def async_setup_entry(hass, entry, async_add_entities):
"""Set up Neato camera with config entry."""
dev = []
neato = hass.data.get(NEATO_LOGIN)
mapdata = hass.data.get(NEATO_MAP_DATA)
for robot in hass.data[NEATO_ROBOTS]:
if "maps" in robot.traits:
dev.append(NeatoCleaningMap(hass, robot))
dev.append(NeatoCleaningMap(neato, robot, mapdata))
if not dev:
return
@ -42,11 +44,12 @@ async def async_setup_entry(hass, entry, async_add_entities):
class NeatoCleaningMap(Camera):
"""Neato cleaning map for last clean."""
def __init__(self, hass, robot):
def __init__(self, neato, robot, mapdata):
"""Initialize Neato cleaning map."""
super().__init__()
self.robot = robot
self.neato = hass.data.get(NEATO_LOGIN)
self.neato = neato
self._mapdata = mapdata
self._available = self.neato.logged_in if self.neato is not None else False
self._robot_name = f"{self.robot.name} Cleaning Map"
self._robot_serial = self.robot.serial
@ -71,25 +74,35 @@ class NeatoCleaningMap(Camera):
_LOGGER.debug("Running camera update")
try:
self.neato.update_robots()
image_url = None
map_data = self.hass.data[NEATO_MAP_DATA][self._robot_serial]["maps"][0]
image_url = map_data["url"]
if image_url == self._image_url:
_LOGGER.debug("The map image_url is the same as old")
return
image = self.neato.download_map(image_url)
self._image = image.read()
self._image_url = image_url
self._generated_at = (map_data["generated_at"].strip("Z")).replace("T", " ")
self._available = True
except NeatoRobotException as ex:
if self._available: # Print only once when available
_LOGGER.error("Neato camera connection error: %s", ex)
self._image = None
self._image_url = None
self._available = False
return
image_url = None
map_data = self._mapdata[self._robot_serial]["maps"][0]
image_url = map_data["url"]
if image_url == self._image_url:
_LOGGER.debug("The map image_url is the same as old")
return
try:
image = self.neato.download_map(image_url)
except NeatoRobotException as ex:
if self._available: # Print only once when available
_LOGGER.error("Neato camera connection error: %s", ex)
self._image = None
self._image_url = None
self._available = False
return
self._image = image.read()
self._image_url = image_url
self._generated_at = (map_data["generated_at"].strip("Z")).replace("T", " ")
self._available = True
@property
def name(self):

9
homeassistant/components/neato/switch.py
View file

@ -26,9 +26,10 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
async def async_setup_entry(hass, entry, async_add_entities):
"""Set up Neato switch with config entry."""
dev = []
neato = hass.data.get(NEATO_LOGIN)
for robot in hass.data[NEATO_ROBOTS]:
for type_name in SWITCH_TYPES:
dev.append(NeatoConnectedSwitch(hass, robot, type_name))
dev.append(NeatoConnectedSwitch(neato, robot, type_name))
if not dev:
return
@ -40,11 +41,11 @@ async def async_setup_entry(hass, entry, async_add_entities):
class NeatoConnectedSwitch(ToggleEntity):
"""Neato Connected Switches."""
def __init__(self, hass, robot, switch_type):
def __init__(self, neato, robot, switch_type):
"""Initialize the Neato Connected switches."""
self.type = switch_type
self.robot = robot
self.neato = hass.data.get(NEATO_LOGIN)
self.neato = neato
self._available = self.neato.logged_in if self.neato is not None else False
self._robot_name = f"{self.robot.name} {SWITCH_TYPES[self.type][0]}"
self._state = None
@ -64,7 +65,6 @@ class NeatoConnectedSwitch(ToggleEntity):
try:
self.neato.update_robots()
self._state = self.robot.state
self._available = True
except NeatoRobotException as ex:
if self._available: # Print only once when available
_LOGGER.error("Neato switch connection error: %s", ex)
@ -72,6 +72,7 @@ class NeatoConnectedSwitch(ToggleEntity):
self._available = False
return
self._available = True
_LOGGER.debug("self._state=%s", self._state)
if self.type == SWITCH_TYPE_SCHEDULE:
_LOGGER.debug("State: %s", self._state)

48
homeassistant/components/neato/vacuum.py
View file

@ -95,8 +95,11 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
async def async_setup_entry(hass, entry, async_add_entities):
"""Set up Neato vacuum with config entry."""
dev = []
neato = hass.data.get(NEATO_LOGIN)
mapdata = hass.data.get(NEATO_MAP_DATA)
persistent_maps = hass.data.get(NEATO_PERSISTENT_MAPS)
for robot in hass.data[NEATO_ROBOTS]:
dev.append(NeatoConnectedVacuum(hass, robot))
dev.append(NeatoConnectedVacuum(neato, robot, mapdata, persistent_maps))
if not dev:
return
@ -112,7 +115,10 @@ async def async_setup_entry(hass, entry, async_add_entities):
navigation = call.data.get(ATTR_NAVIGATION)
category = call.data.get(ATTR_CATEGORY)
zone = call.data.get(ATTR_ZONE)
robot.neato_custom_cleaning(mode, navigation, category, zone)
try:
robot.neato_custom_cleaning(mode, navigation, category, zone)
except NeatoRobotException as ex:
_LOGGER.error("Neato vacuum connection error: %s", ex)
def service_to_entities(call):
"""Return the known devices that a service call mentions."""
@ -131,16 +137,19 @@ async def async_setup_entry(hass, entry, async_add_entities):
class NeatoConnectedVacuum(StateVacuumDevice):
"""Representation of a Neato Connected Vacuum."""
def __init__(self, hass, robot):
def __init__(self, neato, robot, mapdata, persistent_maps):
"""Initialize the Neato Connected Vacuum."""
self.robot = robot
self.neato = hass.data.get(NEATO_LOGIN)
self.neato = neato
self._available = self.neato.logged_in if self.neato is not None else False
self._mapdata = mapdata
self._name = f"{self.robot.name}"
self._robot_has_map = self.robot.has_persistent_maps
self._robot_maps = persistent_maps
self._robot_serial = self.robot.serial
self._status_state = None
self._clean_state = None
self._state = None
self._mapdata = hass.data[NEATO_MAP_DATA]
self._clean_time_start = None
self._clean_time_stop = None
self._clean_area = None
@ -152,10 +161,7 @@ class NeatoConnectedVacuum(StateVacuumDevice):
self._clean_error_time = None
self._launched_from = None
self._battery_level = None
self._robot_serial = self.robot.serial
self._robot_maps = hass.data[NEATO_PERSISTENT_MAPS]
self._robot_boundaries = {}
self._robot_has_map = self.robot.has_persistent_maps
self._robot_stats = None
def update(self):
@ -166,13 +172,12 @@ class NeatoConnectedVacuum(StateVacuumDevice):
self._available = False
return
_LOGGER.debug("Running Neato Vacuums update")
try:
_LOGGER.debug("Running Neato Vacuums update")
if self._robot_stats is None:
self._robot_stats = self.robot.get_robot_info().json()
self.neato.update_robots()
self._state = self.robot.state
self._available = True
except NeatoRobotException as ex:
if self._available: # print only once when available
_LOGGER.error("Neato vacuum connection error: %s", ex)
@ -180,6 +185,7 @@ class NeatoConnectedVacuum(StateVacuumDevice):
self._available = False
return
self._available = True
_LOGGER.debug("self._state=%s", self._state)
if "alert" in self._state:
robot_alert = ALERTS.get(self._state["alert"])
@ -235,14 +241,20 @@ class NeatoConnectedVacuum(StateVacuumDevice):
self._clean_battery_end = mapdata["run_charge_at_end"]
self._launched_from = mapdata["launched_from"]
if self._robot_has_map:
if self._state["availableServices"]["maps"] != "basic-1":
if self._robot_maps[self._robot_serial]:
allmaps = self._robot_maps[self._robot_serial]
for maps in allmaps:
self._robot_boundaries = self.robot.get_map_boundaries(
maps["id"]
).json()
if (
self._robot_has_map
and self._state["availableServices"]["maps"] != "basic-1"
and self._robot_maps[self._robot_serial]
):
allmaps = self._robot_maps[self._robot_serial]
for maps in allmaps:
try:
self._robot_boundaries = self.robot.get_map_boundaries(
maps["id"]
).json()
except NeatoRobotException as ex:
_LOGGER.error("Could not fetch map boundaries: %s", ex)
self._robot_boundaries = {}
@property
def name(self):