Notifications on long run jobs

FaserF · FaserF · commit 0b436b207021 · 2026-01-26T13:03:12.000+01:00
diff --git a/src/switchcraft/assets/lang/de.json b/src/switchcraft/assets/lang/de.json
@@ -159,6 +159,24 @@
     "intune_log_label": "Ausgabe-Log:",
     "intune_start_creation": "Starte Paketerstellung...",
     "intune_pkg_success": "Paket erstellt in:\n{path}",
+    "notif_intunewin_complete_title": "IntuneWin bereit",
+    "notif_intunewin_complete_msg": "Das Paket '{name}' wurde erfolgreich erstellt.",
+    "notif_analysis_complete_title": "Analyse abgeschlossen",
+    "notif_analysis_complete_msg": "'{name}' wurde erfolgreich analysiert.",
+    "notif_all_in_one_complete_title": "Auto-Deploy beendet",
+    "notif_all_in_one_complete_msg": "Der Deployment-Flow für '{name}' wurde erfolgreich abgeschlossen.",
+    "notif_winget_download_complete_title": "Download abgeschlossen",
+    "notif_winget_download_complete_msg": "Der Installer für '{name}' wurde in deinen Downloads-Ordner heruntergeladen.",
+    "notif_winget_install_complete_title": "Installation beendet",
+    "notif_winget_install_complete_msg": "Die Installation von '{name}' wurde abgeschlossen.",
+    "notif_intune_upload_complete_title": "Upload erfolgreich",
+    "notif_intune_upload_complete_msg": "'{name}' wurde erfolgreich nach Intune hochgeladen.",
+    "notif_stack_deploy_complete_title": "Stack bereitgestellt",
+    "notif_stack_deploy_complete_msg": "Der Projekt-Stack '{name}' wurde erfolgreich bereitgestellt.",
+    "notif_addon_install_complete_title": "Addon installiert",
+    "notif_addon_install_complete_msg": "Das Addon '{name}' wurde erfolgreich installiert.",
+    "notif_btn_open_folder": "Ordner öffnen",
+    "notif_btn_open_intune": "Intune öffnen",
     "browse": "Durchsuchen",
     "search": "Suchen",
     "addon_missing_msg_ai": "Das KI-Addon ist nicht installiert oder konnte nicht geladen werden.",
diff --git a/src/switchcraft/assets/lang/en.json b/src/switchcraft/assets/lang/en.json
@@ -160,6 +160,24 @@
     "intune_log_label": "Output Log:",
     "intune_start_creation": "Starting package creation...",
     "intune_pkg_success": "Package created in:\n{path}",
+    "notif_intunewin_complete_title": "IntuneWin Ready",
+    "notif_intunewin_complete_msg": "The package '{name}' was created successfully.",
+    "notif_analysis_complete_title": "Analysis Complete",
+    "notif_analysis_complete_msg": "Successfully analyzed '{name}'.",
+    "notif_all_in_one_complete_title": "Auto-Deploy Finished",
+    "notif_all_in_one_complete_msg": "Deployment flow for '{name}' completed successfully.",
+    "notif_winget_download_complete_title": "Download Complete",
+    "notif_winget_download_complete_msg": "Installer for '{name}' downloaded to your Downloads folder.",
+    "notif_winget_install_complete_title": "Installation Finished",
+    "notif_winget_install_complete_msg": "The installation of '{name}' has completed.",
+    "notif_intune_upload_complete_title": "Upload Successful",
+    "notif_intune_upload_complete_msg": "'{name}' was successfully uploaded to Intune.",
+    "notif_stack_deploy_complete_title": "Stack Deployed",
+    "notif_stack_deploy_complete_msg": "Project stack '{name}' was deployed successfully.",
+    "notif_addon_install_complete_title": "Addon Installed",
+    "notif_addon_install_complete_msg": "The addon '{name}' was installed successfully.",
+    "notif_btn_open_folder": "Open Folder",
+    "notif_btn_open_intune": "Open Intune",
     "browse": "Browse",
     "search": "Search",
     "addon_missing_msg_ai": "The AI Addon is not installed or failed to load.",
diff --git a/src/switchcraft/gui_modern/app.py b/src/switchcraft/gui_modern/app.py
@@ -1909,14 +1909,28 @@ def _on_notification_update(self):
                              # Button 2: Open App
                              toast.add_actions(label=i18n.get("notif_open_app") or "Open App", launch="switchcraft://notifications")
                          else:
-                             # Regular notifications (error/info/warning)
-                             # Button 1: Open Logs Folder (if exists)
-                             logs_path = Path(os.getenv('APPDATA', '')) / "FaserF" / "SwitchCraft" / "Logs"
-                             if logs_path.exists():
-                                 toast.add_actions(label=i18n.get("notif_open_logs") or "Open Logs", launch="file://{logs_path}")
-
-                             if notif_type == "error":
-                                 toast.add_actions(label=i18n.get("notif_open_app") or "Open App", launch="switchcraft://notifications")
+                             # Regular notifications (error/info/warning/success)
+
+                             # 1. Custom Path (e.g. Open Folder)
+                             custom_path = n_data.get("path")
+                             if custom_path and os.path.exists(custom_path):
+                                 toast.add_actions(label=i18n.get("notif_btn_open_folder") or "Open Folder", launch=f"file://{custom_path}")
+
+                             # 2. Custom URL (e.g. Open Intune)
+                             custom_url = n_data.get("url")
+                             if custom_url:
+                                 label = i18n.get("notif_btn_open_intune") if "intune.microsoft.com" in custom_url else "Open Link"
+                                 toast.add_actions(label=label, launch=custom_url)
+
+                             # 3. Default buttons for specific types
+                             if not custom_path and not custom_url:
+                                 # Button 1: Open Logs Folder (if exists)
+                                 logs_path = Path(os.getenv('APPDATA', '')) / "FaserF" / "SwitchCraft" / "Logs"
+                                 if logs_path.exists():
+                                     toast.add_actions(label=i18n.get("notif_open_logs") or "Open Logs", launch=f"file://{logs_path}")
+
+                                 if notif_type == "error":
+                                     toast.add_actions(label=i18n.get("notif_open_app") or "Open App", launch="switchcraft://notifications")
 
                          if notif_type == "error":
                              toast.set_audio(audio.LoopingAlarm, loop=False)
diff --git a/src/switchcraft/gui_modern/utils/view_utils.py b/src/switchcraft/gui_modern/utils/view_utils.py
@@ -209,7 +209,15 @@ def _launch_url(self, url: str):
             try:
                 # Flet's launch_url
                 logger.info(f"Using page.launch_url for: {url}")
-                page.launch_url(url)
+                res = page.launch_url(url)
+
+                # Handle potential coroutine (e.g. in newer Flet versions or async context)
+                if inspect.isawaitable(res):
+                    if hasattr(page, "run_task"):
+                        async def _wait(coro):
+                            await coro
+                        page.run_task(_wait, res)
+                    # if no run_task, we can't do much in a sync method, but at least we caught it
                 return
             except Exception as e:
                 logger.error(f"page.launch_url failed: {e}")
diff --git a/src/switchcraft/gui_modern/views/analyzer_view.py b/src/switchcraft/gui_modern/views/analyzer_view.py
@@ -466,6 +466,16 @@ def _run():
                  success = AddonService().install_addon(str(addon_zip))
             if success:
                 self._show_snack("Addon installed! Please restart SwitchCraft.", "GREEN")
+                # Trigger Desktop Notification
+                try:
+                    NotificationService().add_notification(
+                        title=i18n.get("notif_addon_install_complete_title") or "Addon Installed",
+                        message=(i18n.get("notif_addon_install_complete_msg") or "The addon '{name}' was installed successfully.").format(name="Advanced Features"),
+                        type="success",
+                        notify_system=True
+                    )
+                except Exception as n_ex:
+                    logger.warning(f"Failed to trigger Addon installation notification: {n_ex}")
                 self.addon_warning.visible = False
             else:
                 self._show_snack("Installation failed. Check logs.", "RED")
@@ -526,6 +536,19 @@ def on_progress(pct, msg, eta=None):
                     self.app_page.switchcraft_app.set_progress(visible=False)
 
                 self._show_results(result)
+
+                # Trigger Desktop Notification
+                try:
+                    name = Path(filepath).name
+                    NotificationService().add_notification(
+                        title=i18n.get("notif_analysis_complete_title") or "Analysis Complete",
+                        message=(i18n.get("notif_analysis_complete_msg") or "Successfully analyzed '{name}'.").format(name=name),
+                        type="success",
+                        notify_system=True,
+                        data={"path": str(Path(filepath).parent)}
+                    )
+                except Exception as n_ex:
+                    logger.warning(f"Failed to trigger analysis notification: {n_ex}")
             except Exception as ex:
                 logger.exception("Analysis failed")
                 self.status_text.value = f"Error: {ex}"
@@ -937,7 +960,17 @@ def _bg():
                     def prog_cb(p, m): log(f"Upload: {int(p * 100)}% - {m}")
                     app_id = self.intune_service.upload_win32_app(token, pkg_path, app_meta, progress_callback=prog_cb)
                     log(f"\nSUCCESS! App ID: {app_id}")
-                    NotificationService.send_notification("Intune Upload Success", f"Uploaded {info.product_name} to Intune.")
+                    # Trigger Desktop Notification
+                    try:
+                        NotificationService().add_notification(
+                            title=i18n.get("notif_all_in_one_complete_title") or "Auto-Deploy Finished",
+                            message=(i18n.get("notif_all_in_one_complete_msg") or "Deployment flow for '{name}' completed successfully.").format(name=info.product_name or "Application"),
+                            type="success",
+                            notify_system=True,
+                            data={"path": str(base_dir)}
+                        )
+                    except Exception as n_ex:
+                        logger.warning(f"Failed to trigger all-in-one notification: {n_ex}")
                     self._add_history_entry(info, "Deployed")
                 else:
                     log("\nSkipping Intune Upload (No Tenant ID configured).")
@@ -1205,6 +1238,18 @@ def _bg():
             try:
                 self.intune_service.create_intunewin(str(source), setup_file, str(output), quiet=True)
 
+                # Trigger Desktop Notification
+                try:
+                    NotificationService().add_notification(
+                        title=i18n.get("notif_intunewin_complete_title") or "IntuneWin Ready",
+                        message=(i18n.get("notif_intunewin_complete_msg") or "The package '{name}' was created successfully.").format(name=setup_file),
+                        type="success",
+                        notify_system=True,
+                        data={"path": str(output)}
+                    )
+                except Exception as n_ex:
+                    logger.warning(f"Failed to trigger IntuneWin creation notification: {n_ex}")
+
                 # Find the created file
                 expected_intunewin = source / (installer.stem + ".intunewin")
                 if expected_intunewin.exists():
diff --git a/src/switchcraft/gui_modern/views/intune_view.py b/src/switchcraft/gui_modern/views/intune_view.py
@@ -5,6 +5,7 @@
 from pathlib import Path
 
 from switchcraft.services.intune_service import IntuneService
+from switchcraft.services.notification_service import NotificationService
 from switchcraft.gui_modern.utils.file_picker_helper import FilePickerHelper
 from switchcraft.utils.config import SwitchCraftConfig
 from switchcraft.utils.i18n import i18n
@@ -644,6 +645,19 @@ def _bg():
                          output_file = f
                          break
 
+                # Trigger Desktop Notification
+                try:
+                    pkg_name = os.path.basename(output_file)
+                    NotificationService().add_notification(
+                        title=i18n.get("notif_intunewin_complete_title") or "IntuneWin Ready",
+                        message=(i18n.get("notif_intunewin_complete_msg") or "The package '{name}' was created successfully.").format(name=pkg_name),
+                        type="success",
+                        notify_system=True,
+                        data={"path": str(output)}
+                    )
+                except Exception as n_ex:
+                    logger.warning(f"Failed to trigger IntuneWin completion notification: {n_ex}")
+
                 def open_folder(e):
                     import subprocess
                     if os.name == 'nt':
@@ -732,6 +746,17 @@ def update_done():
                     self.up_status.color = "GREEN"
                     self.btn_upload.disabled = False
                     self.update()
+                    # Trigger Desktop Notification
+                    try:
+                        NotificationService().add_notification(
+                            title=i18n.get("notif_intune_upload_complete_title") or "Upload Successful",
+                            message=(i18n.get("notif_intune_upload_complete_msg") or "'{name}' was successfully uploaded to Intune.").format(name=app_info.get("displayName") or "Application"),
+                            type="success",
+                            notify_system=True,
+                            data={"url": "https://intune.microsoft.com/#view/Microsoft_Intune_DeviceSettings/AppsWindowsAppsMenu"}
+                        )
+                    except Exception as n_ex:
+                        logger.warning(f"Failed to trigger Intune upload notification: {n_ex}")
                     self._show_success_dialog(new_app_id)
                 self._run_task_safe(update_done)
 
diff --git a/src/switchcraft/gui_modern/views/sap_wizard_view.py b/src/switchcraft/gui_modern/views/sap_wizard_view.py
@@ -55,7 +55,7 @@ def _build_admin_warning(self):
             ft.Text(i18n.get("sap_admin_required_title") or "Administrator Privileges Required", size=20, weight=ft.FontWeight.BOLD),
             ft.Text(i18n.get("sap_admin_required_desc") or "The SAP Installation Server Administration Tool (NwSapSetupAdmin.exe) requires administrative rights to merge updates and create packages."),
             ft.Container(height=20),
-            ft.ElevatedButton(
+            ft.FilledButton(
                 i18n.get("btn_restart_admin") or "Restart SwitchCraft as Admin",
                 icon=ft.Icons.SHIELD,
                 on_click=lambda _: ShellUtils.restart_as_admin(),
@@ -95,7 +95,7 @@ def on_pick_server(e: ft.FilePickerResultEvent):
             ft.Text(i18n.get("sap_step1_title") or "1. Select SAP Installation Server", size=18, weight=ft.FontWeight.BOLD),
             ft.Text(i18n.get("sap_step1_desc") or "Point to the root folder of your SAP nwsetupadmin server."),
             ft.Row([
-                ft.ElevatedButton(i18n.get("btn_browse_folder") or "Browse Server Folder", icon=ft.Icons.FOLDER_OPEN, on_click=lambda _: fp.get_directory_path()),
+                ft.FilledButton(i18n.get("btn_browse_folder") or "Browse Server Folder", icon=ft.Icons.FOLDER_OPEN, on_click=lambda _: fp.get_directory_path()),
                 path_text
             ]),
             ft.Divider(height=20, color="TRANSPARENT"),
@@ -108,7 +108,7 @@ def _build_step_2(self):
         return ft.Column([
             ft.Text(i18n.get("sap_step2_title") or "2. Add Updates & Add-ons (Optional)", size=18, weight=ft.FontWeight.BOLD),
             ft.Text(i18n.get("sap_step2_desc") or "Select .exe files to merge into the installation server."),
-            ft.ElevatedButton(i18n.get("btn_add_update") or "Add Update EXE", icon=ft.Icons.ADD, on_click=lambda _: self._show_snack("Not implemented in stub")),
+            ft.FilledButton(i18n.get("btn_add_update") or "Add Update EXE", icon=ft.Icons.ADD, on_click=lambda _: self._show_snack("Not implemented in stub")),
             ft.ListView(expand=True, height=100) # Placeholder for file list
         ])
 
@@ -118,7 +118,7 @@ def _build_step_3(self):
             ft.Text(i18n.get("sap_step3_title") or "3. Customization", size=18, weight=ft.FontWeight.BOLD),
             ft.Checkbox(label=i18n.get("sap_use_webview2") or "Default to Edge WebView2 (Recommended)", value=self.use_webview2, on_change=lambda e: setattr(self, 'use_webview2', e.control.value)),
             ft.Row([
-                ft.ElevatedButton(i18n.get("btn_select_logo") or "Select Custom Logo", icon=ft.Icons.IMAGE),
+                ft.FilledButton(i18n.get("btn_select_logo") or "Select Custom Logo", icon=ft.Icons.IMAGE),
                 ft.Text(i18n.get("no_logo_selected") or "No logo selected", italic=True)
             ])
         ])
@@ -152,13 +152,13 @@ def _build_step_4(self):
             ft.Divider(),
             self.package_dd,
             ft.Container(height=10),
-            ft.ElevatedButton(i18n.get("btn_apply_build") or "Apply & Build Packaging", icon=ft.Icons.BUILD_CIRCLE, bgcolor="PRIMARY", color="WHITE", on_click=self._on_finalize)
+            ft.FilledButton(i18n.get("btn_apply_build") or "Apply & Build Packaging", icon=ft.Icons.BUILD_CIRCLE, bgcolor="PRIMARY", color="WHITE", on_click=self._on_finalize)
         ])
 
     def _build_nav_buttons(self):
         return ft.Row([
             ft.TextButton(i18n.get("btn_back") or "Back", on_click=lambda _: self._show_step(self.current_step - 1) if self.current_step > 1 else None),
-            ft.ElevatedButton(i18n.get("btn_next") or "Next", on_click=lambda _: self._show_step(self.current_step + 1) if self.current_step < 4 else None)
+            ft.FilledButton(i18n.get("btn_next") or "Next", on_click=lambda _: self._show_step(self.current_step + 1) if self.current_step < 4 else None)
         ], alignment=ft.MainAxisAlignment.END)
 
     def _on_finalize(self, _):
diff --git a/src/switchcraft/gui_modern/views/stack_manager_view.py b/src/switchcraft/gui_modern/views/stack_manager_view.py
@@ -3,6 +3,7 @@
 import logging
 from pathlib import Path
 from switchcraft.utils.i18n import i18n
+from switchcraft.services.notification_service import NotificationService
 from switchcraft.gui_modern.utils.view_utils import ViewMixin
 
 logger = logging.getLogger(__name__)
@@ -350,6 +351,16 @@ def _deploy_worker():
                 self._run_task_with_fallback(
                     lambda: self._show_snack(f"Stack {self.current_stack} deployed successfully!", "GREEN")
                 )
+                # Trigger Desktop Notification
+                try:
+                    NotificationService().add_notification(
+                        title=i18n.get("notif_stack_deploy_complete_title") or "Stack Deployed",
+                        message=(i18n.get("notif_stack_deploy_complete_msg") or "Project stack '{name}' was deployed successfully.").format(name=self.current_stack),
+                        type="success",
+                        notify_system=True
+                    )
+                except Exception as n_ex:
+                    logger.warning(f"Failed to trigger stack deployment notification: {n_ex}")
             except Exception as e:
                 logger.error(f"Stack deployment failed: {e}")
                 self._run_task_with_fallback(
diff --git a/src/switchcraft/gui_modern/views/winget_view.py b/src/switchcraft/gui_modern/views/winget_view.py
diff --git a/src/switchcraft/utils/logging_handler.py b/src/switchcraft/utils/logging_handler.py
diff --git a/tests/test_all_buttons.py b/tests/test_all_buttons.py
diff --git a/tests/test_button_functionality.py b/tests/test_button_functionality.py
