Skip to content

Commit

Permalink
Fix deprecated request path
Browse files Browse the repository at this point in the history
  • Loading branch information
Sdahl1234 authored Mar 13, 2024
1 parent d0871f0 commit 7dc4dd9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 25 deletions.
33 changes: 10 additions & 23 deletions custom_components/adano/adano.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def login(self):
"grant_type": "password",
"scope": "server",
},
timeout=5,
timeout=10,
)

response_data = response.json()
Expand All @@ -215,8 +215,6 @@ def login(self):
except Exception as error: # pylint: disable=broad-except
_LOGGER.debug("Login failed")
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

def connect_mqtt(self):
"""Connect mgtt."""
Expand Down Expand Up @@ -367,8 +365,6 @@ def get_device_list(self):

except Exception as error: # pylint: disable=broad-except
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

def get_settings(self, snr):
"""Get settings."""
Expand Down Expand Up @@ -398,8 +394,6 @@ def get_settings(self, snr):

except Exception as error: # pylint: disable=broad-except
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

def update_devices(self, device_sn):
"""Update device."""
Expand Down Expand Up @@ -438,7 +432,7 @@ def update_devices(self, device_sn):
if response_data["code"] != 0:
_LOGGER.debug(response_data)
continue
elif self._dataupdated is not None:
if self._dataupdated is not None:
self._dataupdated(device.devicesn)

except Exception as error: # pylint: disable=broad-except
Expand All @@ -456,8 +450,6 @@ def update_devices(self, device_sn):

_LOGGER.debug(element["url"])
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

def refresh_token(self):
"""Refresh token."""
Expand Down Expand Up @@ -487,8 +479,6 @@ def refresh_token(self):
_LOGGER.debug("Refresh successful")
except Exception as error: # pylint: disable=broad-except
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

def unload(self):
"""Unload."""
Expand All @@ -515,7 +505,7 @@ def pause(self, devicesn):
def border(self, devicesn):
"""Border."""
_LOGGER.debug("Border")
self.set_state_change("mode", 4, devicesn)
self.set_state_change("mode", 7, devicesn)

def refresh(self, devicesn):
"""Refresh data."""
Expand Down Expand Up @@ -633,8 +623,6 @@ def set_schedule(
self.get_device(devicesn).error_text = ""
except Exception as error: # pylint: disable=broad-except
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

def set_zone_status(
self,
Expand Down Expand Up @@ -691,8 +679,6 @@ def set_zone_status(
self.get_device(devicesn).error_text = ""
except Exception as error: # pylint: disable=broad-except
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

def set_rain_status(self, state: bool, delaymin: int, devicesn):
"""Set rain status."""
Expand Down Expand Up @@ -728,16 +714,18 @@ def set_rain_status(self, state: bool, delaymin: int, devicesn):

except Exception as error: # pylint: disable=broad-except
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

def set_state_change(self, command, state, devicesn):
"""Command is "mode" and state is 1 = Start, 0 = Pause, 2 = Home, 4 = Border."""
# device_id = self.DeviceSn # self.devicedata["data"].get("id")
try:
data = {
"appId": self.session["user_id"],
"deviceSn": devicesn,
"mode": state,
}
response = requests.post(
url=f"http://server.sk-robot.com/api/mower/device/setWorkStatus/{devicesn}/"
f"{self.session['user_id']}?{command}={state}",
url="http://server.sk-robot.com/api/app_mower/device/setWorkStatus",
headers={
"Accept-Language": self.language,
"Authorization": "bearer " + self.session["access_token"],
Expand All @@ -746,6 +734,7 @@ def set_state_change(self, command, state, devicesn):
"Connection": "Keep-Alive",
"User-Agent": "okhttp/4.8.1",
},
json=data,
timeout=10,
)
response_data = response.json()
Expand All @@ -758,8 +747,6 @@ def set_state_change(self, command, state, devicesn):

except Exception as error: # pylint: disable=broad-except
_LOGGER.debug(error)
if hasattr(error, "response"):
_LOGGER.debug(json.dumps(error.response.json()))

refresh_timeout = Timer(10, self.update_devices, [devicesn])
refresh_timeout.start()
2 changes: 1 addition & 1 deletion custom_components/adano/button.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def __init__(

async def async_press(self) -> None:
"""Handle the button press."""
if self._valuepair == "dock":
if self._valuepair == "home":
await self.hass.async_add_executor_job(self._data_handler.dock, self._sn)
elif self._valuepair == "start":
await self.hass.async_add_executor_job(
Expand Down
2 changes: 1 addition & 1 deletion custom_components/adano/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"integration_type": "device",
"iot_class": "cloud_push",
"config_flow": true,
"version": "1.0.6"
"version": "1.0.7"
}

0 comments on commit 7dc4dd9

Please sign in to comment.