filepicker fixes

FaserF · FaserF · commit 1bfe6fbb95be · 2026-01-27T19:24:15.000+01:00
diff --git a/src/switchcraft/assets/manifest.json b/src/switchcraft/assets/manifest.json
@@ -1,32 +1,22 @@
 {
-    "name": "SwitchCraft",
-    "short_name": "SwitchCraft",
-    "start_url": ".",
-    "display": "standalone",
-    "background_color": "#202020",
-    "theme_color": "#202020",
-    "description": "SwitchCraft - Enterprise Application Management",
-    "icons": [
-        {
-            "src": "icon-192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "icon-512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        },
-        {
-            "src": "switchcraft_logo.png",
-            "sizes": "any",
-            "type": "image/png"
-        },
-        {
-            "src": "apple-touch-icon.png",
-            "sizes": "180x180",
-            "type": "image/png"
-        }
-    ],
-    "version": "2026.1.5b3"
+  "name": "SwitchCraft",
+  "short_name": "SwitchCraft",
+  "id": "/",
+  "start_url": "./?pwa=1",
+  "display": "standalone",
+  "background_color": "#111315",
+  "theme_color": "#0066cc",
+  "description": "SwitchCraft Modern Software Management (v2026.1.5b3.dev0+f487e59)",
+  "icons": [
+    {
+      "src": "icon-192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "icon-512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ]
 }
diff --git a/src/switchcraft/gui_modern/utils/view_utils.py b/src/switchcraft/gui_modern/utils/view_utils.py
@@ -401,16 +401,16 @@ def _open_dialog_safe(self, dlg):
              return False
 
         try:
-            # Method 1: Modern API (Preferred) - DISABLED due to visibility issues on Windows Desktop
-            # if hasattr(page, 'open'):
-            #     try:
-            #         logger.debug("Attempting to open dialog using page.open()...")
-            #         page.open(dlg)
-            #         page.update()
-            #         logger.info("Dialog opened successfully using page.open()")
-            #         return True
-            #     except Exception as e:
-            #         logger.warning(f"page.open(dlg) failed: {e}. Falling back to legacy mode.")
+            # Method 1: Modern API (Preferred)
+            if hasattr(page, 'open'):
+                try:
+                    logger.debug("Attempting to open dialog using page.open()...")
+                    page.open(dlg)
+                    page.update()
+                    logger.info("Dialog opened successfully using page.open()")
+                    return True
+                except Exception as e:
+                    logger.warning(f"page.open(dlg) failed: {e}. Falling back to legacy mode.")
 
             # Method 2: Legacy API (Fallback)
             logger.debug("Attempting to open dialog using legacy page.dialog...")
diff --git a/src/switchcraft/gui_modern/views/analyzer_view.py b/src/switchcraft/gui_modern/views/analyzer_view.py
@@ -50,17 +50,13 @@ def __init__(self, page: ft.Page):
         self.progress_bar = ft.ProgressBar(width=400, visible=False)
         self.addon_warning = ft.Container(visible=False)
 
-        # File Picker for Native/Web Support
-        self.file_picker = ft.FilePicker()
-        self.file_picker.on_result = self._on_file_picker_result
-        self.file_picker.on_upload = self._on_file_upload
-
         async def on_drop_click(e):
-             # Use Flet's FilePicker instead of blocking helper
-             await self.file_picker.pick_files(
-                 allow_multiple=False,
+             # Use FilePickerHelper (Tkinter) instead of Flet's potentially buggy FilePicker
+             path = FilePickerHelper.pick_file(
                  allowed_extensions=["exe", "msi", "ps1", "bat", "cmd", "vbs", "msp"]
              )
+             if path:
+                 self.start_analysis(path)
 
         def on_drag_enter(e):
             self.drop_zone.border = ft.Border.all(4, "BLUE_400")
@@ -224,8 +220,7 @@ def on_source_tab_change(e):
 
         ]
 
-        # Add FilePicker to controls (it's invisible but needs to be in the tree)
-        self.controls.append(self.file_picker)
+        # Add FilePicker removed in favor of FilePickerHelper (Tkinter) logic
 
         self._check_addon()
 
@@ -651,9 +646,9 @@ def _show_results(self, result: AnalysisResult):
             )
 
         action_buttons = ft.Row([
-            ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.AUTO_FIX_HIGH), ft.Text(i18n.get("btn_auto_deploy") or "Auto Deploy (All-in-One)")], alignment=ft.MainAxisAlignment.CENTER), style=ft.ButtonStyle(bgcolor="RED_700", color="WHITE"), on_click=lambda _: self._run_all_in_one_flow(result)),
-            ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.PLAY_ARROW), ft.Text(i18n.get("btn_test_locally") or "Test Locally (Admin)")], alignment=ft.MainAxisAlignment.CENTER), style=ft.ButtonStyle(bgcolor="GREEN_700", color="WHITE"), on_click=lambda _: self._run_local_test_action(info.file_path, info.install_switches)),
-            ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.DESCRIPTION), ft.Text(i18n.get("btn_winget_manifest") or "Winget Manifest")], alignment=ft.MainAxisAlignment.CENTER), on_click=lambda _: self._open_manifest_dialog(info)),
+            ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.AUTO_FIX_HIGH), ft.Text(i18n.get("btn_auto_deploy") or "Auto Deploy (All-in-One)")], alignment=ft.MainAxisAlignment.CENTER), style=ft.ButtonStyle(bgcolor="RED_700", color="WHITE"), on_click=self._safe_event_handler(lambda _: self._run_all_in_one_flow(result), "Auto Deploy")),
+            ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.PLAY_ARROW), ft.Text(i18n.get("btn_test_locally") or "Test Locally (Admin)")], alignment=ft.MainAxisAlignment.CENTER), style=ft.ButtonStyle(bgcolor="GREEN_700", color="WHITE"), on_click=self._safe_event_handler(lambda _: self._run_local_test_action(info.file_path, info.install_switches), "Test Locally")),
+            ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.DESCRIPTION), ft.Text(i18n.get("btn_winget_manifest") or "Winget Manifest")], alignment=ft.MainAxisAlignment.CENTER), on_click=self._safe_event_handler(lambda _: self._open_manifest_dialog(info), "Winget Manifest")),
         ], wrap=True)
         self.results_column.controls.append(action_buttons)
 
@@ -687,9 +682,9 @@ def _show_results(self, result: AnalysisResult):
         # 7. Deployment Actions (Intune, IntuneWin)
         self.results_column.controls.append(
             ft.Row([
-                ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.CODE), ft.Text(i18n.get("generate_intune_script") or "Generate Intune Script")], alignment=ft.MainAxisAlignment.CENTER), on_click=self._on_click_create_script),
-                ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.INVENTORY), ft.Text(i18n.get("btn_create_intunewin") or "Create .intunewin")], alignment=ft.MainAxisAlignment.CENTER), on_click=self._on_click_create_intunewin),
-                ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.TERMINAL), ft.Text(i18n.get("btn_manual_cmds") or "Manual Commands")], alignment=ft.MainAxisAlignment.CENTER), on_click=self._show_manual_cmds),
+                ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.CODE), ft.Text(i18n.get("generate_intune_script") or "Generate Intune Script")], alignment=ft.MainAxisAlignment.CENTER), on_click=self._safe_event_handler(self._on_click_create_script, "Generate Script")),
+                ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.INVENTORY), ft.Text(i18n.get("btn_create_intunewin") or "Create .intunewin")], alignment=ft.MainAxisAlignment.CENTER), on_click=self._safe_event_handler(self._on_click_create_intunewin, "Create Intunewin")),
+                ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.TERMINAL), ft.Text(i18n.get("btn_manual_cmds") or "Manual Commands")], alignment=ft.MainAxisAlignment.CENTER), on_click=self._safe_event_handler(self._show_manual_cmds, "Manual Commands")),
             ], wrap=True)
         )
 
@@ -761,7 +756,7 @@ def _show_results(self, result: AnalysisResult):
 
         # 12. View Detailed Button
         self.results_column.controls.append(
-            ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.ZOOM_IN), ft.Text(i18n.get("view_full_params") or "View Detailed Analysis Data")], alignment=ft.MainAxisAlignment.CENTER), on_click=lambda _: self._show_detailed_parameters(result))
+            ft.FilledButton(content=ft.Row([ft.Icon(ft.Icons.ZOOM_IN), ft.Text(i18n.get("view_full_params") or "View Detailed Analysis Data")], alignment=ft.MainAxisAlignment.CENTER), on_click=self._safe_event_handler(lambda _: self._show_detailed_parameters(result), "View Details"))
         )
 
         self.update()
diff --git a/src/switchcraft/gui_modern/views/sap_wizard_view.py b/src/switchcraft/gui_modern/views/sap_wizard_view.py
@@ -87,15 +87,14 @@ def on_pick_server(e: ft.FilePickerResultEvent):
                 self.update()
 
         path_text = ft.Text(self.server_path or "No path selected", italic=True)
-        fp = ft.FilePicker()
-        fp.on_result = on_pick_server
-        self.app_page.overlay.append(fp)
+
+        # Use FilePickerHelper (Tkinter) instead of Flet's FilePicker
 
         return ft.Column([
             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.FilledButton(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 _: on_pick_server(ft.FilePickerResultEvent(path=FilePickerHelper.pick_directory(), files=None))),
                 path_text
             ]),
             ft.Divider(height=20, color="TRANSPARENT"),
diff --git a/src/switchcraft/main.py b/src/switchcraft/main.py
@@ -95,28 +95,7 @@ def start_splash():
 # Now do heavy imports
 import flet as ft # noqa: E402
 
-# --- MONKEY PATCH: Fix web_entry.py legacy ft.run call ---
-# web_entry.py (generated) calls ft.run(target=...) but Pyodide flet might expect ft.app or different sig.
-def flexible_run(*args, **kwargs):
-    # Extract target from kwargs or args
-    target = kwargs.get("target")
-    if not target and args:
-        target = args[0]
-
-    # Use run() if available (Flet 0.80.0+), else app()
-    clean_kwargs = {k: v for k, v in kwargs.items() if k != "target"}
-    if hasattr(ft, "_original_run") and ft._original_run:
-        return ft._original_run(target, **clean_kwargs)
-    elif hasattr(ft, "run") and ft.run != flexible_run:
-        return ft.run(target, **clean_kwargs)
-
-    return ft.app(target=target, **clean_kwargs)
-
-# Save original run and override
-if not hasattr(ft, "_original_run"):
-    ft._original_run = getattr(ft, "run", None)
-ft.run = flexible_run
-# ---------------------------------------------------------
+# Monkey patch removed - using standard methods
 
 # Flet Universal Compatibility Patch
 def patch_flet():
@@ -839,10 +818,7 @@ def _ensure_pwa_manifest():
             pass
 
     try:
-        if hasattr(ft, "run"):
-            ft.run(main)
-        else:
-            ft.app(target=main, assets_dir="assets")
+        ft.run(main, assets_dir="assets")
     except Exception as e:
         # Fallback for early failures (before main() handles it)
         try:
diff --git a/tests/test_i18n_integrity.py b/tests/test_i18n_integrity.py
@@ -128,7 +128,8 @@ def test_codebase_keys_exist(self):
             'rule_type', 'output_json', 'target_version', 'search_query',
             'error_description', 'import_settings', 'created_at', 'export_settings', 'export_logs',
             'admin_password', 'config_path', 'admin_password_hash', 'first_run', 'demo_mode',
-            'current_password', 'new_password', 'confirm_password', 'update_exe', 'banner_container'
+            'current_password', 'new_password', 'confirm_password', 'update_exe', 'banner_container',
+            'file_picker'
         }
 
         for k in found_keys:
diff --git a/tests/test_smoke.py b/tests/test_smoke.py
@@ -29,8 +29,14 @@ def test_import_gui(self):
 
     def test_cli_version(self):
         """Verify CLI --version runs without error."""
+        import os
+        env = os.environ.copy()
+        # Add src to PYTHONPATH so it finds switchcraft module without installation
+        src_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src"))
+        env["PYTHONPATH"] = src_path + os.pathsep + env.get("PYTHONPATH", "")
+
         cmd = [sys.executable, "-m", "switchcraft.main", "--version"]
-        result = subprocess.run(cmd, capture_output=True, text=True)
+        result = subprocess.run(cmd, capture_output=True, text=True, env=env)
         self.assertEqual(result.returncode, 0)
         self.assertIn("SwitchCraft", result.stdout)
 

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,8 @@ def test_codebase_keys_exist(self):`
`128`	`128`	`'rule_type', 'output_json', 'target_version', 'search_query',`
`129`	`129`	`'error_description', 'import_settings', 'created_at', 'export_settings', 'export_logs',`
`130`	`130`	`'admin_password', 'config_path', 'admin_password_hash', 'first_run', 'demo_mode',`
`131`		`- 'current_password', 'new_password', 'confirm_password', 'update_exe', 'banner_container'`
	`131`	`+ 'current_password', 'new_password', 'confirm_password', 'update_exe', 'banner_container',`
	`132`	`+ 'file_picker'`
`132`	`133`	`}`
`133`	`134`
`134`	`135`	`for k in found_keys:`