disabled new sap view for now

Author: FaserF

.gitignore

@@ -92,3 +92,4 @@ debug_button_2.py
 # Build Web - track web_entry.py and requirements.txt
 !/build_web/web_entry.py
 !/build_web/requirements.txt
+/sap_sources

src/switchcraft/assets/lang/de.json

@@ -142,7 +142,11 @@
     "context_copy": "Kopieren",
     "intune_util_missing": "IntuneWinAppUtil.exe fehlt.",
     "intune_download_activate": "Herunterladen & Aktivieren",
+    "sap_admin_required_title": "Administrator-Rechte erforderlich",
+    "sap_admin_required_desc": "Das SAP Installation Server Administration Tool (NwSapSetupAdmin.exe) benoetigt administrative Rechte, um Updates zusammenzufuehren und Pakete zu erstellen.",
+    "btn_restart_admin": "SwitchCraft als Admin neu starten",
     "intune_downloading": "Lade Intune Tool...",
+    "sap_arch_select": "Architektur:",
     "intune_success": "Intune Tool erfolgreich heruntergeladen!",
     "intune_ready": "Bereit",
     "intune_failed": "Download fehlgeschlagen. Prüfe Logs.",

src/switchcraft/assets/lang/en.json

@@ -143,7 +143,11 @@
     "context_copy": "Copy",
     "intune_util_missing": "IntuneWinAppUtil.exe is missing.",
     "intune_download_activate": "Download & Activate",
+    "sap_admin_required_title": "Administrator Privileges Required",
+    "sap_admin_required_desc": "The SAP Installation Server Administration Tool (NwSapSetupAdmin.exe) requires administrative rights to merge updates and create packages.",
+    "btn_restart_admin": "Restart SwitchCraft as Admin",
     "intune_downloading": "Downloading Intune Tool...",
+    "sap_arch_select": "Architecture:",
     "intune_success": "Intune Tool downloaded successfully!",
     "intune_ready": "Ready",
     "intune_failed": "Failed to download Intune Tool. Check logs.",

src/switchcraft/gui_modern/app.py

@@ -1076,9 +1076,6 @@ def build_ui(self):
                 ft.NavigationRailDestination(
                     icon=ft.Icons.POLICY_OUTLINED, selected_icon=ft.Icons.POLICY, label=i18n.get("settings_policies") or "Policies"
                 ),  # 21 Policies
-                ft.NavigationRailDestination(
-                    icon=ft.Icons.BUSINESS, selected_icon=ft.Icons.BUSINESS, label=i18n.get("sap_card_title") or "SAP Management"
-                ),  # 22 SAP Magic
             ]
 
 
@@ -1782,12 +1779,6 @@ def _f():
                 from switchcraft.gui_modern.views.wingetcreate_view import WingetCreateView
                 return WingetCreateView(self.page)
             load_view(_f)
-        elif idx == NavIndex.SAP_WIZARD:
-            # SAP Management
-            def _f():
-                from switchcraft.gui_modern.views.sap_wizard_view import SapWizardView
-                return SapWizardView(self.page)
-            load_view(_f)
 
         else:
             # Dynamic Addons

src/switchcraft/gui_modern/controls/sidebar.py

@@ -27,7 +27,7 @@ def __init__(self, app, destinations, on_navigate):
         self.categories = [
             (ft.Icons.DASHBOARD, i18n.get("cat_dashboard") or "Dashboard", [NavIndex.HOME, NavIndex.DASHBOARD]), # Home, Dashboard
             (ft.Icons.APPS, i18n.get("cat_apps_devices") or "Apps & Devices", [NavIndex.INTUNE, NavIndex.INTUNE_STORE, NavIndex.WINGET, NavIndex.LIBRARY, NavIndex.GROUP_MANAGER, NavIndex.EXCHANGE, NavIndex.STACK_MANAGER]), # Intune, Store, Winget, Library, Groups, Exchange, Stacks
-            (ft.Icons.BUILD, i18n.get("cat_tools") or "Tools", [NavIndex.ANALYZER, NavIndex.HELPER, NavIndex.SCRIPTS, NavIndex.MACOS, NavIndex.PACKAGING_WIZARD, NavIndex.DETECTION_TESTER, NavIndex.WINGET_CREATE]), # Analyze, Generate, Scripts, MacOS, Wizard, Tester, WingetCreate
+            (ft.Icons.BUILD, i18n.get("cat_tools") or "Tools", [NavIndex.ANALYZER, NavIndex.HELPER, NavIndex.SCRIPTS, NavIndex.MACOS, NavIndex.PACKAGING_WIZARD, NavIndex.DETECTION_TESTER, NavIndex.WINGET_CREATE, NavIndex.SAP_WIZARD]), # Analyze, Generate, Scripts, MacOS, Wizard, Tester, WingetCreate, SAP
             (ft.Icons.SETTINGS, i18n.get("cat_system") or "System", [NavIndex.SETTINGS, NavIndex.SETTINGS_UPDATES, NavIndex.SETTINGS_GRAPH, NavIndex.SETTINGS_POLICIES, NavIndex.HISTORY, NavIndex.SETTINGS_HELP]), # Settings, Updates, Graph, Policies, History, Help
         ]
 

src/switchcraft/gui_modern/nav_constants.py

@@ -46,7 +46,6 @@ class NavIndex:
     EXCHANGE = 20             # Exchange Online View
 
     SETTINGS_POLICIES = 21    # Settings tab index 3 (Policies)
-    SAP_WIZARD = 22           # SAP Management Wizard
 
 
 # Mapping from NavIndex to sidebar category for reference
@@ -59,7 +58,7 @@ class NavIndex:
     "Tools": [
         NavIndex.ANALYZER, NavIndex.HELPER, NavIndex.SCRIPTS,
         NavIndex.MACOS, NavIndex.PACKAGING_WIZARD, NavIndex.DETECTION_TESTER,
-        NavIndex.WINGET_CREATE, NavIndex.SAP_WIZARD
+        NavIndex.WINGET_CREATE
     ],
     "System": [
         NavIndex.SETTINGS, NavIndex.SETTINGS_UPDATES,

src/switchcraft/gui_modern/views/sap_wizard_view.py

@@ -24,6 +24,10 @@ def __init__(self, page: ft.Page):
         self.update_files = []
         self.logo_path = ""
         self.use_webview2 = True
+        self.arch_group = ft.RadioGroup(content=ft.Row([
+            ft.Radio(value="32", label="32-bit (Win32)"),
+            ft.Radio(value="64", label="64-bit (Win64)")
+        ]), value="64")
 
         self.current_step = 1
         self.content_area = ft.Container(expand=True)
@@ -34,9 +38,35 @@ def __init__(self, page: ft.Page):
             self._build_nav_buttons()
         ]
 
-        self._show_step(1)
+        from switchcraft.utils.shell_utils import ShellUtils
+        self.is_admin = ShellUtils.is_admin()
+
+        if not self.is_admin:
+             self.content_area.content = self._build_admin_warning()
+             # Hide nav buttons if not admin
+             self.controls[-1].visible = False
+        else:
+             self._show_step(1)
+
+    def _build_admin_warning(self):
+        from switchcraft.utils.shell_utils import ShellUtils
+        return ft.Column([
+            ft.Icon(ft.Icons.SECURITY, size=64, color="RED"),
+            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(
+                i18n.get("btn_restart_admin") or "Restart SwitchCraft as Admin",
+                icon=ft.Icons.SHIELD,
+                on_click=lambda _: ShellUtils.restart_as_admin(),
+                bgcolor="RED", color="WHITE"
+            )
+        ], alignment=ft.MainAxisAlignment.CENTER, horizontal_alignment=ft.CrossAxisAlignment.CENTER, expand=True)
 
     def _show_step(self, step_num):
+        if not self.is_admin:
+            return
+
         self.current_step = step_num
         if step_num == 1:
             self.content_area.content = self._build_step_1()
@@ -67,7 +97,10 @@ def on_pick_server(e: ft.FilePickerResultEvent):
             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()),
                 path_text
-            ])
+            ]),
+            ft.Divider(height=20, color="TRANSPARENT"),
+            ft.Text(i18n.get("sap_arch_select") or "Architecture:", weight=ft.FontWeight.BOLD),
+            self.arch_group
         ])
 
     def _build_step_2(self):
@@ -92,12 +125,33 @@ def _build_step_3(self):
 
     def _build_step_4(self):
         """Step 4: Summary & Packaging."""
+        # Refresh packages list on entry
+        packages = []
+        try:
+            packages = self.sap_service.list_packages(self.server_path)
+        except:
+            pass
+
+        opts = [ft.dropdown.Option(p['name']) for p in packages]
+        # Default to first if available, else standard SAPGUI
+        default_val = packages[0]['name'] if packages else "SAPGUI"
+
+        self.package_dd = ft.Dropdown(
+            label=i18n.get("sap_package_select") or "Select Package to Build",
+            options=opts,
+            value=default_val,
+            width=400
+        )
+
         return ft.Column([
             ft.Text(i18n.get("sap_step4_title") or "4. Summary & Packaging", size=18, weight=ft.FontWeight.BOLD),
             ft.Text(f"{i18n.get('label_server') or 'Server'}: {self.server_path}"),
+            ft.Text(f"Architecture: {self.arch_group.value}-bit"),
             ft.Text(f"{i18n.get('label_custom_logo') or 'Custom Logo'}: {'Yes' if self.logo_path else 'No'}"),
             ft.Text(f"{i18n.get('label_webview2') or 'Edge WebView2'}: {'Enabled' if self.use_webview2 else 'Disabled'}"),
             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)
         ])
 
@@ -113,8 +167,42 @@ def _on_finalize(self, _):
             return
 
         try:
-            self.sap_service.customize_server(self.server_path, self.logo_path, self.use_webview2)
+            target_path = self.server_path
+            if self.arch_group.value == "64":
+                 if "Win32" in target_path:
+                     target_path = target_path.replace("Win32", "Win64")
+                 elif "Win64" not in target_path and (Path(target_path) / "Win64").exists():
+                     target_path = str(Path(target_path) / "Win64")
+
+            # 1. Customize
+            self.sap_service.customize_server(target_path, self.logo_path, self.use_webview2)
             self._show_snack("SAP Server customized successfully!", color="GREEN")
-            # In a real app, we would now trigger the packaging process
+
+            # 2. Build
+            pkg_name = self.package_dd.value
+            if not pkg_name:
+                self._show_snack("Please select a package to build.", color="RED")
+                return
+
+            import tempfile
+            # Use %TEMP%\SwitchCraft\Dist
+            temp_dir = Path(tempfile.gettempdir()) / "SwitchCraft" / "Dist"
+            out_dir = str(temp_dir)
+
+            self._show_snack(f"Building package '{pkg_name}'... Please wait...", color="BLUE")
+            self.app_page.update()
+
+            # Use threading to avoid UI freeze if desired, but for now simple blocking is safer for debugging logic
+            out_file = self.sap_service.create_single_file_installer(target_path, pkg_name, out_dir)
+
+            self._show_snack(f"Build Success! Installer at: {out_file}", color="GREEN", duration=5000)
+
+            # Auto-open in Explorer
+            try:
+                os.startfile(out_dir)
+            except Exception as e:
+                logger.error(f"Failed to open explorer: {e}")
+
         except Exception as e:
+            logger.error(f"SAP Finalize Error: {e}")
             self._show_snack(f"Error: {e}", color="RED")

src/switchcraft/services/sap_service.py

@@ -97,28 +97,103 @@ def customize_server(self, server_path: str, logo_path: Optional[str] = None, us
 
         return True
 
-    def create_single_file_installer(self, server_path: str, package_name: str, output_path: str) -> str:
+    def list_packages(self, server_path: str) -> List[dict]:
         """
-        Creates a single-file installer (SFU) for a specific package.
-        Note: NwSapSetupAdmin.exe CLI for SFU creation is semi-documented.
-        We fallback to the command pattern often used for automation.
+        Parses SapSetup.xml or SapGuiSetup.xml to list available products/packages.
+        Returns list of dicts: {'name': 'Package Name', 'id': 'Guid'}
+        """
+        packages = []
+
+        # Possible XML files defining products
+        candidates = ["SapSetup.xml", "SapGuiSetup.xml"]
+
+        base_path = Path(server_path)
+        # Handle architecture path adjustments (if user selected root, we look in Setup)
+        setup_path = base_path / "Setup"
+        if not setup_path.exists():
+            setup_path = base_path # Maybe user pointed directly to Setup?
+
+        for xml_name in candidates:
+             xml_path = setup_path / xml_name
+             if not xml_path.exists():
+                 continue
+
+             try:
+                 tree = ET.parse(xml_path)
+                 root = tree.getroot()
+
+                 # Look for <Product> or <SapSetupProduct>
+                 for tag in ["Product", "SapSetupProduct"]:
+                     for product in root.findall(f".//{tag}"):
+                         name = product.get("Name")
+                         guid = product.get("Guid")
+                         if name:
+                             packages.append({"name": name, "id": guid})
+
+             except Exception as e:
+                 logger.error(f"Failed to parse {xml_name}: {e}")
+
+        return packages
+
+    def create_single_file_installer(self, server_path: str, package_name: str, output_dir: str) -> str:
+        """
+        Creates a Single File Installer (SFU) for the specified package.
+        UsesNwSapSetupAdmin.exe from the server path.
         """
         admin_tool = self.detect_admin_tool(server_path)
         if not admin_tool:
             raise FileNotFoundError("SAP Admin Tool not found.")
 
-        # Best-guess CLI for SFU creation (NwSapSetupAdmin.exe /CreateSFU)
-        # Actual implementation might require NwSapSetup.exe /Package="name" /CreateSFU
-        cmd = [
-            str(admin_tool),
-            f"/Package={package_name}",
-            "/CreateSFU",
-            f"/dest={output_path}"
-        ]
+        output_path = Path(output_dir)
+        if not output_path.exists():
+            output_path.mkdir(parents=True, exist_ok=True)
 
-        logger.info(f"Creating SAP SFU: {cmd}")
-        result = ShellUtils.run_command(cmd)
+        # Use a temporary batch file to guarantee exact quoting behavior.
+        import tempfile
+        import os
+
+        # Ensure output_dir is the directory
+        output_dir = Path(output_path)
+        if not output_dir.exists():
+            output_dir.mkdir(parents=True, exist_ok=True)
+
+        # Target file must be specified in /Dest for many SFU creators
+        target_file_path = output_dir / f"{package_name}.exe"
+
+        # Using colon-based syntax which is often required for legacy SAP tools
+        # /CreateSFU:"Path" /Package:"Name" /Silent
+        bat_content = f"""
+@echo off
+"{str(admin_tool)}" /CreateSFU:"{str(target_file_path)}" /Package:"{package_name}" /Silent
+echo Exit Code: %ERRORLEVEL%
+"""
+        fd, bat_path = tempfile.mkstemp(suffix=".bat", text=True)
+        os.close(fd)
+
+        try:
+            with open(bat_path, "w") as f:
+                f.write(bat_content)
+
+            logger.info(f"Executing SAP Batch Wrapper: {bat_path}")
+            logger.info(f"Command: \"{str(admin_tool)}\" /CreateSFU:\"{str(target_file_path)}\" /Package:\"{package_name}\" /Silent")
+
+            # Run the batch file
+            result = ShellUtils.run_command([bat_path])
+
+            if result:
+                 logger.info(f"SAP Batch Output: {result.stdout}")
+                 if result.stderr:
+                     logger.error(f"SAP Batch Stderr: {result.stderr}")
+
+        finally:
+            if os.path.exists(bat_path):
+                os.unlink(bat_path)
+
+        if target_file_path.exists():
+            return str(target_file_path)
+
+        # If result was OK, return dir
         if result and result.returncode == 0:
-            return output_path
+             return str(output_path)
 
-        raise RuntimeError(f"Failed to create SAP SFU: {result.stderr if result else 'Unknown error'}")
+        raise RuntimeError(f"Failed to create SAP SFU. ReturnCode: {result.returncode if result else 'None'}.")

src/switchcraft/utils/__init__.py

@@ -1,5 +1,3 @@
-
 from .config import SwitchCraftConfig
-from .app_updater import UpdateChecker
 
-__all__ = ['SwitchCraftConfig', 'UpdateChecker']
+__all__ = ['SwitchCraftConfig']