gronod/ha_ecovacs_bumper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getting closer, simplify def

Browse Source
This commit is contained in:
bittles
2023-01-02 17:02:05 -05:00
parent d92acfc027
commit 3caa4c1127
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
custom_components/ecovacs/sucksbumper.py
+24 -23
View File
@@ -953,14 +953,14 @@ class EcoVacsXMPP(ClientXMPP):
the_good_part = message.get_payload()[0][0] the_good_part = message.get_payload()[0][0]
_LOGGER.debug("the_good_part in handle_ctl is :") _LOGGER.debug("the_good_part in handle_ctl is :")
_LOGGER.debug(the_good_part) _LOGGER.debug(the_good_part)
the_other_part = None # the_other_part = None
try: # try:
the_other_part = message.get_payload()[0][0][0] # the_other_part = message.get_payload()[0][0][0]
_LOGGER.debug("Other payload found:") # _LOGGER.debug("Other payload found:")
_LOGGER.debug(the_other_part) # _LOGGER.debug(the_other_part)
except IndexError: # except IndexError:
_LOGGER.debug("No extra payload") # _LOGGER.debug("No extra payload")
as_dict = self._ctl_to_dict(the_good_part, the_other_part) as_dict = self._ctl_to_dict(the_good_part)
_LOGGER.debug("handle ctl called with as_dict:") _LOGGER.debug("handle ctl called with as_dict:")
_LOGGER.debug(as_dict) _LOGGER.debug(as_dict)
if as_dict is not None: if as_dict is not None:
@@ -981,16 +981,16 @@ class EcoVacsXMPP(ClientXMPP):
# except IndexError: # except IndexError:
# _LOGGER.debug("No extra payload") # _LOGGER.debug("No extra payload")
def _ctl_to_dict(self, xml, other_xml): def _ctl_to_dict(self, xml):
#Including changes from jasonarends @ 28da7c2 below #Including changes from jasonarends @ 28da7c2 below
result = xml.attrib.copy() result = xml.attrib.copy()
_LOGGER.debug("result is:") _LOGGER.debug("result is:")
_LOGGER.debug(result) _LOGGER.debug(result)
if other_xml is not None: # if other_xml is not None:
other_result = other_xml.attrib.copy() # other_result = other_xml.attrib.copy()
_LOGGER.debug("other result:") # _LOGGER.debug("other result:")
_LOGGER.debug(other_result) # _LOGGER.debug(other_result)
_LOGGER.debug(xml[0]) # _LOGGER.debug(xml[0].tag)
if 'td' not in result: if 'td' not in result:
_LOGGER.debug("td not in result:") _LOGGER.debug("td not in result:")
_LOGGER.debug(result) _LOGGER.debug(result)
@@ -1006,25 +1006,26 @@ class EcoVacsXMPP(ClientXMPP):
_LOGGER.debug(result) _LOGGER.debug(result)
else: else:
if other_xml is not None: # case where there is child element len(xml) > 0:
_LOGGER.debug("other xml is not none, [0] attrib is") # if other_xml is not None: # case where there is child element
_LOGGER.debug(other_result) _LOGGER.debug("child xml detected, [0] tag is")
if 'clean' in other_result: _LOGGER.debug(xml[0].tag)
_LOGGER.debug("clean detected in other_result, result before event handling:") if 'clean' in xml[0].tag:
_LOGGER.debug("clean detected in xml[0].tag, result before event handling:")
_LOGGER.debug(result) _LOGGER.debug(result)
result['event'] = "CleanReport" result['event'] = "CleanReport"
# result['event'] = "clean_report" # result['event'] = "clean_report"
_LOGGER.debug("result after event clean handling:") _LOGGER.debug("result after event clean handling:")
_LOGGER.debug(result) _LOGGER.debug(result)
elif 'charge' in other_result: elif 'charge' in xml[0].tag:
_LOGGER.debug("charge detected in other_result, result before event handling:") _LOGGER.debug("charge detected in xml[0].tag, result before event handling:")
_LOGGER.debug(result) _LOGGER.debug(result)
result['event'] = "ChargeState" result['event'] = "ChargeState"
# result['event'] = "charge_state" # result['event'] = "charge_state"
_LOGGER.debug("result after event charge handling:") _LOGGER.debug("result after event charge handling:")
_LOGGER.debug(result) _LOGGER.debug(result)
elif 'battery' in other_result: elif 'battery' in xml[0].tag:
_LOGGER.debug("battery detected in other_result, result before event handling:") _LOGGER.debug("battery detected in xml[0].tag, result before event handling:")
_LOGGER.debug(result) _LOGGER.debug(result)
result['event'] = "BatteryInfo" result['event'] = "BatteryInfo"
# result['event'] = "battery_info" # result['event'] = "battery_info"