forked from M-Labs/thermostat
Fix?
This commit is contained in:
parent
9af7f728e9
commit
cebac565c4
@ -65,6 +65,7 @@ class MainWindow(QtWidgets.QMainWindow):
|
|||||||
self.thermostat = Thermostat(
|
self.thermostat = Thermostat(
|
||||||
self, self.report_refresh_spin.value()
|
self, self.report_refresh_spin.value()
|
||||||
)
|
)
|
||||||
|
self._connecting_task = None
|
||||||
|
|
||||||
def handle_connection_error():
|
def handle_connection_error():
|
||||||
self.info_box.display_info_box(
|
self.info_box.display_info_box(
|
||||||
@ -245,33 +246,30 @@ class MainWindow(QtWidgets.QMainWindow):
|
|||||||
self.conn_menu.port_set_spin.value(),
|
self.conn_menu.port_set_spin.value(),
|
||||||
)
|
)
|
||||||
|
|
||||||
self._connecting_task = None
|
if (self._connecting_task is None) and (not self.thermostat.connected()):
|
||||||
try:
|
self.status_lbl.setText("Connecting...")
|
||||||
if (self._connecting_task is None) or (not self.thermostat.connected()):
|
self.connect_btn.setText("Stop")
|
||||||
self.status_lbl.setText("Connecting...")
|
self.conn_menu.host_set_line.setEnabled(False)
|
||||||
self.connect_btn.setText("Stop")
|
self.conn_menu.port_set_spin.setEnabled(False)
|
||||||
self.conn_menu.host_set_line.setEnabled(False)
|
|
||||||
self.conn_menu.port_set_spin.setEnabled(False)
|
|
||||||
|
|
||||||
try:
|
|
||||||
self._connecting_task = asyncio.wait_for(
|
|
||||||
self.thermostat.start_session(host=host, port=port), timeout=5
|
|
||||||
)
|
|
||||||
await self._connecting_task
|
|
||||||
except asyncio.TimeoutError:
|
|
||||||
return
|
|
||||||
await self._on_connection_changed(True)
|
|
||||||
else:
|
|
||||||
if self._connecting_task is not None:
|
|
||||||
self._connecting_task.cancel()
|
|
||||||
await self.bail()
|
|
||||||
|
|
||||||
# TODO: Remove asyncio.TimeoutError in Python 3.11
|
|
||||||
except (OSError, asyncio.TimeoutError):
|
|
||||||
try:
|
try:
|
||||||
|
self._connecting_task = asyncio.create_task(
|
||||||
|
asyncio.wait_for(self.thermostat.start_session(host=host, port=port), timeout=5)
|
||||||
|
)
|
||||||
|
await self._connecting_task
|
||||||
|
except (OSError, asyncio.TimeoutError):
|
||||||
await self.bail()
|
await self.bail()
|
||||||
except ConnectionResetError:
|
return
|
||||||
pass
|
except asyncio.CancelledError:
|
||||||
|
return
|
||||||
|
finally:
|
||||||
|
self._connecting_task = None
|
||||||
|
|
||||||
|
await self._on_connection_changed(True)
|
||||||
|
else:
|
||||||
|
if self._connecting_task is not None:
|
||||||
|
self._connecting_task.cancel()
|
||||||
|
await self.bail()
|
||||||
|
|
||||||
@asyncSlot()
|
@asyncSlot()
|
||||||
async def bail(self):
|
async def bail(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user