Skip to content

Commit 0385002

Browse files
committed
fix: hold update overlay until post-update status refresh completes; demote periodic-poll logs to DEBUG
1 parent 46dda2a commit 0385002

3 files changed

Lines changed: 7 additions & 32 deletions

File tree

BlocksScreen/lib/panels/mainWindow.py

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -299,18 +299,8 @@ def show_LoadScreen(self, show: bool = True, msg: str = ""):
299299
if _sender is self.update_page:
300300
self._update_in_progress = show
301301
if not show and self._post_update_reconnect:
302-
_logger.warning(
303-
"show_LoadScreen(False) suppressed: post_update_reconnect=True update_in_progress=%s sender=%s",
304-
self._update_in_progress,
305-
_sender,
306-
)
307302
return
308303
elif not show and self._update_in_progress:
309-
_logger.warning(
310-
"show_LoadScreen(False) suppressed: update_in_progress=True post_update_reconnect=%s sender=%s",
311-
self._post_update_reconnect,
312-
_sender,
313-
)
314304
return
315305

316306
if _sender == self.filamentPanel:
@@ -328,21 +318,8 @@ def show_LoadScreen(self, show: bool = True, msg: str = ""):
328318

329319
self.loadwidget.set_status_message(msg)
330320
if show:
331-
_logger.info(
332-
"show_LoadScreen: showing msg=%r update_in_progress=%s post_update_reconnect=%s sender=%s",
333-
msg,
334-
self._update_in_progress,
335-
self._post_update_reconnect,
336-
_sender,
337-
)
338321
self.loadscreen.show()
339322
else:
340-
_logger.info(
341-
"show_LoadScreen: hiding update_in_progress=%s post_update_reconnect=%s sender=%s",
342-
self._update_in_progress,
343-
self._post_update_reconnect,
344-
_sender,
345-
)
346323
self.loadscreen.hide()
347324

348325
@QtCore.pyqtSlot(bool, name="show-update-page")
@@ -410,12 +387,10 @@ def on_updater_unavailable(self) -> None:
410387
@QtCore.pyqtSlot(name="on-post-update-reconnect")
411388
def _on_post_update_reconnect(self) -> None:
412389
"""Called when an update finishes: hold the loading screen and retry Moonraker until it's up."""
413-
_logger.info(
414-
"_on_post_update_reconnect: ws.connected=%s loadscreen_visible=%s update_in_progress=%s post_update_reconnect=%s",
390+
_logger.debug(
391+
"_on_post_update_reconnect: ws.connected=%s update_in_progress=%s",
415392
self.ws.connected,
416-
self.loadscreen.isVisible(),
417393
self._update_in_progress,
418-
self._post_update_reconnect,
419394
)
420395
if self.ws.connected:
421396
# Moonraker never restarted — overlay will be dismissed by handle_status_ready
@@ -435,7 +410,7 @@ def _on_reconnect_timer(self) -> None:
435410
self._reconnect_timer.stop()
436411
return
437412
if self.ws.connected:
438-
_logger.info("post-update: Moonraker already connected, hiding loadscreen")
413+
_logger.debug("post-update: Moonraker reconnected, hiding loadscreen")
439414
self._post_update_reconnect = False
440415
self._update_in_progress = False
441416
self._reconnect_retries = 0

BlocksScreen/lib/panels/widgets/updatePage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ def _toggle_details(self) -> None:
225225

226226
def handle_status_ready(self, json_str: str) -> None:
227227
"""Update component statuses from a JSON payload and refresh the list."""
228-
_log.info("handle_status_ready: busy=%s", self._busy)
228+
_log.debug("handle_status_ready: busy=%s", self._busy)
229229
try:
230230
data: dict[str, dict] = json.loads(json_str)
231231
self._statuses = {
@@ -244,7 +244,7 @@ def handle_status_ready(self, json_str: str) -> None:
244244
self.call_load_panel.emit(False, "")
245245
self._post_update_status_pending = False
246246
else:
247-
_log.warning("status_ready: skipping loadscreen dismiss (busy=True)")
247+
_log.debug("status_ready: skipping loadscreen dismiss (busy=True)")
248248
self.build_cards()
249249
self.update_available.emit(_update_avail)
250250

BlocksScreen/lib/updater_worker.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def trigger_status(self) -> None:
187187
"""Request a status check; result arrives via status_ready signal."""
188188
if not self._require_proxy():
189189
return
190-
_log.info("trigger_status called")
190+
_log.debug("trigger_status called")
191191
self._submit(self._call_status())
192192

193193
def trigger_recover(self, name: str, hard: bool) -> None: # noqa: FBT001
@@ -265,7 +265,7 @@ async def _call_cancel(self) -> None:
265265

266266
async def _listen_status_ready(self) -> None:
267267
async for json_str in self._proxy.status_ready:
268-
_log.info("status_ready received (%d bytes)", len(json_str))
268+
_log.debug("status_ready received (%d bytes)", len(json_str))
269269
self.status_ready.emit(json_str)
270270

271271
async def _listen_step_complete(self) -> None:

0 commit comments

Comments
 (0)