fix(updater): improve robustness and UI consistency (v3.3.1)

Author: Binity Bot

release_helper.py

@@ -12,6 +12,27 @@
 BUILD_CMD = 'pyinstaller --noconsole --onefile --icon=icons/bin_full.ico --add-data "icons;icons" --add-data "sounds;sounds" --name "Binity" main.py'
 
 RELEASES = [
+    {
+        "tag": "v3.3.1",
+        "prev": "v3.3.0",
+        "name": "Binity v3.3.1",
+        "body": """## 🛠️ Updater Stability & UI Polish (v3.3.1)
+Update focused on making the auto-updater rock solid and improving visual consistency.
+
+### 🔄 Updater Improvements
+- **Robustness**: Updater script now has fallback mechanisms. If replacing the EXE fails (e.g. locked file), it runs from a staging area to ensure the app still launches.
+- **Fail-Safe**: New handshake system ensures the new version started successfully; otherwise, it reverts or retries.
+- **Visibility**: Added a progress bar dialog during download so you know what's happening.
+- **Logs**: Updater now writes to `update.log` in the local app data folder for easier troubleshooting.
+
+### 🎨 UI & Polish
+- **Icons**: Fixed missing icons in dialogs (e.g. "Already running", "Confirm Delete") to ensure no empty window headers.
+- **Release Notes**: Cleaned up the "What's New" text in the update dialog to remove raw Markdown symbols (###, **) for a cleaner look.
+
+### 📝 Notes
+- This release ensures seamless updates for future versions.
+"""
+    },
     {
         "tag": "v3.3.0",
         "prev": "v3.2.1",

src/core/updater.py

@@ -348,7 +348,7 @@ def _cleanup_runtime_leftovers(self) -> None:
         try:
             update_dir = self._update_dir()
             if update_dir.exists():
-                for pattern in ("next-*.exe", "*.tmp", "*.old"):
+                for pattern in ("next-*.exe", "ready-*.flag", "*.tmp", "*.old"):
                     for path in update_dir.glob(pattern):
                         try:
                             path.unlink()
@@ -380,6 +380,8 @@ def apply_update(self, downloaded_exe: Path) -> bool:
 
             script_path = update_dir / "_binity-update.cmd"
             flag_file = update_dir / "applied.flag"
+            log_file = update_dir / "update.log"
+            ready_file = update_dir / f"ready-{int(current_pid)}.flag"
 
             script_template = """@echo off
 setlocal enableextensions
@@ -388,6 +390,9 @@ def apply_update(self, downloaded_exe: Path) -> bool:
 set "DOWNLOADED=@@DOWNLOADED_EXE@@"
 set "FINAL=@@FINAL_EXE@@"
 set "FLAG=@@FLAG_FILE@@"
+set "LOG=@@LOG_FILE@@"
+set "READY=@@READY_FILE@@"
+set "RUN_TARGET="
 
 set "PYINSTALLER_RESET_ENVIRONMENT=1"
 set "_MEIPASS2="
@@ -396,6 +401,8 @@ def apply_update(self, downloaded_exe: Path) -> bool:
 set "_PYI_PARENT_PROCESS_LEVEL="
 set "_PYI_SPLASH_IPC="
 
+call :log Updater started
+
 for /L %%A in (1,1,25) do (
   tasklist /FI "PID eq %PID%" 2>NUL | find "%PID%" >NUL
   if errorlevel 1 goto wait_done
@@ -405,24 +412,79 @@ def apply_update(self, downloaded_exe: Path) -> bool:
 timeout /t 1 /nobreak >NUL
 
 :wait_done
-if not exist "%DOWNLOADED%" goto cleanup
+if not exist "%DOWNLOADED%" (
+  call :log Downloaded file not found
+  goto cleanup
+)
+
+set "RUN_TARGET=%DOWNLOADED%"
 
 if /I not "%DOWNLOADED%"=="%FINAL%" (
   copy /Y /B "%DOWNLOADED%" "%FINAL%" >NUL
-  if errorlevel 1 goto cleanup
+  if errorlevel 1 (
+    call :log Copy to final location failed, fallback to staged executable
+  ) else (
+    set "RUN_TARGET=%FINAL%"
+  )
+) else (
+  set "RUN_TARGET=%FINAL%"
 )
 
-start "" "%FINAL%" --show-after-update
-echo 1>"%FLAG%"
+if "%RUN_TARGET%"=="" (
+  call :log Empty run target
+  goto cleanup
+)
 
-if /I not "%DOWNLOADED%"=="%FINAL%" (
+if not exist "%RUN_TARGET%" (
+  call :log Run target does not exist: %RUN_TARGET%
+  goto cleanup
+)
+
+call :start_target "%RUN_TARGET%"
+if errorlevel 1 (
+  call :log First launch attempt failed
+  if /I not "%RUN_TARGET%"=="%DOWNLOADED%" if exist "%DOWNLOADED%" (
+    call :log Trying fallback launch from staged executable
+    set "RUN_TARGET=%DOWNLOADED%"
+    call :start_target "%DOWNLOADED%"
+  )
+)
+
+if exist "%READY%" (
+  echo 1>"%FLAG%"
+) else (
+  call :log Ready flag was not received
+)
+
+if /I "%RUN_TARGET%"=="%FINAL%" if /I not "%DOWNLOADED%"=="%FINAL%" (
   del /F /Q "%DOWNLOADED%" >NUL 2>&1
 )
 
+call :log Updater finished
+
 :cleanup
 (goto) 2>NUL & del "%~f0"
 endlocal
 exit /b 0
+
+:log
+set "MSG=%*"
+>>"%LOG%" echo [%date% %time%] %MSG%
+exit /b 0
+
+:start_target
+set "TARGET=%~1"
+if "%TARGET%"=="" exit /b 1
+if not exist "%TARGET%" exit /b 1
+if exist "%READY%" del /F /Q "%READY%" >NUL 2>&1
+
+call :log Starting: %TARGET%
+start "" "%TARGET%" --show-after-update --update-ready-flag "%READY%"
+for /L %%R in (1,1,20) do (
+  if exist "%READY%" exit /b 0
+  timeout /t 1 /nobreak >NUL
+)
+exit /b 1
 """
 
             script = (
@@ -432,6 +494,8 @@ def apply_update(self, downloaded_exe: Path) -> bool:
                 .replace("@@DOWNLOADED_EXE@@", str(downloaded_exe))
                 .replace("@@FINAL_EXE@@", str(final_exe))
                 .replace("@@FLAG_FILE@@", str(flag_file))
+                .replace("@@LOG_FILE@@", str(log_file))
+                .replace("@@READY_FILE@@", str(ready_file))
             )
             script_path.write_text(script, encoding="cp866", errors="ignore")
 

src/main.py

@@ -4,9 +4,11 @@
 import os
 import sys
 
+from PyQt6.QtGui import QIcon
 from PyQt6.QtWidgets import QApplication, QMessageBox
 
 from src.core.i18n import I18n
+from src.core.resources import resource_path
 from src.core.settings import Settings
 from src.core.single_instance import acquire_single_instance_lock
 from src.ui.tray.tray_app import TrayApp
@@ -29,26 +31,79 @@ def _consume_switch(flag: str) -> bool:
     return False
 
 
+def _consume_arg(flag: str) -> str:
+    if flag not in sys.argv:
+        return ""
+    idx = sys.argv.index(flag)
+    value = ""
+    if idx + 1 < len(sys.argv):
+        value = sys.argv[idx + 1]
+        del sys.argv[idx:idx + 2]
+    else:
+        del sys.argv[idx]
+    return value
+
+
+def _write_ready_flag(path: str) -> None:
+    if not path:
+        return
+    try:
+        folder = os.path.dirname(path)
+        if folder:
+            os.makedirs(folder, exist_ok=True)
+        with open(path, "w", encoding="utf-8") as fh:
+            fh.write("ready")
+    except Exception:
+        pass
+
+
+def _resolve_app_icon() -> QIcon:
+    icon = QIcon()
+    if getattr(sys, "frozen", False):
+        exe_icon = QIcon(sys.executable)
+        if not exe_icon.isNull():
+            icon = exe_icon
+
+    if icon.isNull():
+        fallback_path = resource_path("icons/bin_full.ico")
+        if os.path.exists(fallback_path):
+            icon = QIcon(fallback_path)
+
+    return icon
+
+
 def main() -> int:
     _set_windows_app_id()
     show_after_update = _consume_switch("--show-after-update")
+    update_ready_flag = _consume_arg("--update-ready-flag")
 
     app = QApplication(sys.argv)
     app.setQuitOnLastWindowClosed(False)
     app.setApplicationName(__app_name__)
 
+    app_icon = _resolve_app_icon()
+    if not app_icon.isNull():
+        app.setWindowIcon(app_icon)
+
     settings = Settings()
     i18n = I18n(settings.language)
 
     lock = acquire_single_instance_lock()
     if lock is None:
-        QMessageBox.information(None, __app_name__, i18n.tr("already_running"))
+        msg = QMessageBox()
+        msg.setIcon(QMessageBox.Icon.Information)
+        msg.setWindowTitle(__app_name__)
+        msg.setText(i18n.tr("already_running"))
+        if not app_icon.isNull():
+            msg.setWindowIcon(app_icon)
+        msg.exec()
         return 0
 
     app._instance_lock = lock  # type: ignore[attr-defined]
 
     tray_app = TrayApp(settings=settings, i18n=i18n, show_after_update=show_after_update)
     app._tray_app = tray_app  # type: ignore[attr-defined]
+    _write_ready_flag(update_ready_flag)
 
     return int(app.exec())
 

src/ui/dialogs/confirm_dialog.py

@@ -1,9 +1,11 @@
-from __future__ import annotations
+from __future__ import annotations
 
 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout
+from PyQt6.QtGui import QIcon
+from PyQt6.QtWidgets import QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout
 
 from src.core.i18n import I18n
+from src.core.resources import resource_path
 
 
 class ConfirmDialog(QDialog):
@@ -15,6 +17,14 @@ def __init__(self, i18n: I18n, message_override: str | None = None, parent=None)
         self.setWindowFlag(Qt.WindowType.WindowContextHelpButtonHint, False)
         self.setModal(True)
         self.setMinimumWidth(420)
+
+        app = QApplication.instance()
+        app_icon = app.windowIcon() if app else QIcon()
+        if app_icon.isNull():
+            app_icon = QIcon(resource_path("icons/bin_full.ico"))
+        if not app_icon.isNull():
+            self.setWindowIcon(app_icon)
+
         self.setStyleSheet(
             """
             QDialog { background: #171a23; color: #f3f4f6; }