Version & FIlePicker bug fixes

Author: FaserF

.github/scripts/update_version_info.py

@@ -35,11 +35,12 @@ def update_version_info(version_str, file_path='file_version_info.txt'):
     content = re.sub(r'filevers=\(\d+, \d+, \d+, \d+\)', f'filevers={tuple_str}', content)
     content = re.sub(r'prodvers=\(\d+, \d+, \d+, \d+\)', f'prodvers={tuple_str}', content)
 
+    # Update StringStructs
     # Update StringStructs
     # FileVersion should be numeric only
-    content = re.sub(r"StringStruct\(u'FileVersion', u'[^']+'\)", f"StringStruct(u'FileVersion', u'{full_version_str}')", content)
+    content = re.sub(r"StringStruct\(u?'FileVersion', u?'[^']+'\)", f"StringStruct(u'FileVersion', u'{full_version_str}')", content)
     # ProductVersion can include suffix for display
-    content = re.sub(r"StringStruct\(u'ProductVersion', u'[^']+'\)", f"StringStruct(u'ProductVersion', u'{display_version_str}')", content)
+    content = re.sub(r"StringStruct\(u?'ProductVersion', u?'[^']+'\)", f"StringStruct(u'ProductVersion', u'{display_version_str}')", content)
 
     with open(file_path, 'w', encoding='utf-8') as f:
         f.write(content)

.github/workflows/review-auto-merge.yml

@@ -61,7 +61,8 @@ jobs:
 
           # 2. Check PR Author Permissions
           PR_AUTHOR=$(gh pr view "$PR_NUMBER" --json author --jq '.author.login')
-          if [[ "$PR_AUTHOR" == *"[bot]" ]]; then
+          echo "PR Author: $PR_AUTHOR"
+          if [[ "$PR_AUTHOR" == *"[bot]" || "$PR_AUTHOR" == "app/renovate" ]]; then
              echo "PR Author is a Bot. Allowed."
           else
              PERM=$(gh api "repos/$REPO/collaborators/$PR_AUTHOR/permission" --jq '.permission')

file_version_info.txt

@@ -31,12 +31,12 @@ VSVersionInfo(
         '040904B0',
         [StringStruct('CompanyName', 'FaserF'),
         StringStruct('FileDescription', 'SwitchCraft - Advanced Silent Switch & Packaging Tool'),
-        StringStruct('FileVersion', '2026.1.4.0'),
+        StringStruct('FileVersion', '2026.1.5.0'),
         StringStruct('InternalName', 'SwitchCraft'),
         StringStruct('LegalCopyright', 'Copyright (c) 2026 FaserF'),
         StringStruct('OriginalFilename', 'SwitchCraft.exe'),
         StringStruct('ProductName', 'SwitchCraft'),
-        StringStruct('ProductVersion', '2026.1.4.0')])
+        StringStruct('ProductVersion', '2026.1.5.0')])
       ]),
     VarFileInfo([VarStruct('Translation', [1033, 1200])])
   ]

scripts/build_release.ps1

@@ -226,10 +226,26 @@ if (-not $IsCI -and (Test-Path (Join-Path $RepoRoot ".git"))) {
     try {
         $GitCommit = (git rev-parse --short HEAD).Trim()
         if ($GitCommit) {
-            # Append local dev suffix
-            $AppVersion = "$AppVersion.dev0+$GitCommit"
-            Write-Host "Local Dev Build Detected: Appending commit hash $GitCommit" -ForegroundColor Cyan
-            Write-Host "New Version: $AppVersion" -ForegroundColor Cyan
+            # Append local dev suffix only if not already present
+            if (-not ($AppVersion -like "*$GitCommit*")) {
+                 # If version is already a dev version (has .dev), just append +commit if missing?
+                 # Or typically we want "X.Y.Z.dev0+commit"
+                 # If AppVersion is "2026.1.5", we make "2026.1.5.dev0+commit"
+                 # If AppVersion is "2026.1.5.dev0+oldcommit", we might be in trouble, but assuming standard flow:
+
+                 if ($AppVersion -match "dev\d+") {
+                     # Already has dev tag, maybe just missing commit or has different one?
+                     # Ideally we replace the existing build metadata?
+                     # For safety/simplicity in this script: Don't append .dev0 again if it has dev match
+                     $AppVersion = "$AppVersion+$GitCommit"
+                 } else {
+                     $AppVersion = "$AppVersion.dev0+$GitCommit"
+                 }
+                 Write-Host "Local Dev Build Detected: Appending commit hash $GitCommit" -ForegroundColor Cyan
+                 Write-Host "New Version: $AppVersion" -ForegroundColor Cyan
+            } else {
+                 Write-Host "Local Dev Build: Version already contains current commit hash ($GitCommit). Skipping append." -ForegroundColor Gray
+            }
         }
     } catch {
         Write-Warning "Failed to get git commit hash: $_"

src/switchcraft/gui_modern/views/intune_store_view.py

@@ -361,6 +361,15 @@ def _load_image_async():
             )
             detail_controls.append(self.title_field)
 
+
+            # Editable Version Field
+            self.version_field = ft.TextField(
+                label=i18n.get("field_version") or "Version",
+                value=app.get("displayVersion", ""),
+                expand=True
+            )
+            detail_controls.append(self.version_field)
+
             # Metadata (read-only)
             meta_rows = [
                 (i18n.get("field_id", default="ID"), app.get("id")),
@@ -561,6 +570,9 @@ def _save_changes(self, app):
             if hasattr(self, 'title_field') and self.title_field.value != app.get('displayName'):
                 update_data['displayName'] = self.title_field.value
 
+            if hasattr(self, 'version_field') and self.version_field.value != app.get('displayVersion'):
+                update_data['displayVersion'] = self.version_field.value
+
             if hasattr(self, 'description_field') and self.description_field.value != app.get('description'):
                 update_data['description'] = self.description_field.value
 

src/switchcraft/gui_modern/views/settings_view.py

@@ -27,8 +27,9 @@ def __init__(self, page: ft.Page, initial_tab_index=0):
         self.latest_version_text = ft.Text("")
 
         # Shared FilePicker for various actions
-        self.file_picker = ft.FilePicker()
-        self.file_picker.on_result = self._on_file_picker_result
+        # self.file_picker removed in favor of FilePickerHelper (Tkinter) logic
+        # self.file_picker = ft.FilePicker()
+        # self.file_picker.on_result = self._on_file_picker_result
 
         # Custom Tab Navigation
         self.current_content = ft.Container(expand=True, padding=10)
@@ -57,8 +58,7 @@ def __init__(self, page: ft.Page, initial_tab_index=0):
         self.controls = [
             ft.Container(content=self.nav_row, height=60, padding=5, bgcolor="SURFACE_CONTAINER"),
             ft.Divider(height=1, thickness=1),
-            self.current_content,
-            self.file_picker
+            self.current_content
         ]
 
         # Load initial content
@@ -93,6 +93,8 @@ def did_mount(self):
         # Check for policy-managed settings
         self._check_managed_settings()
 
+
+
     def _switch_tab(self, builder_func):
         try:
             if builder_func:
@@ -1127,6 +1129,7 @@ async def _export_settings(self, e):
         """
         from switchcraft import IS_WEB
         import base64
+        import json
 
         prefs = SwitchCraftConfig.export_preferences()
         json_str = json.dumps(prefs, indent=4)
@@ -1140,89 +1143,55 @@ async def _export_settings(self, e):
             self._launch_url(data_uri)
             self._show_snack("Export started (Check downloads)", "GREEN")
         else:
-            # Desktop: Use Save File Dialog
-            self._picker_context = "export_settings"
-            await self.file_picker.save_file(
+            # Desktop: Use Save File Dialog via Helper
+            from switchcraft.gui_modern.utils.file_picker_helper import FilePickerHelper
+            path = FilePickerHelper.save_file(
                 dialog_title=i18n.get("btn_export_settings") or "Export Settings",
                 file_name="settings.json",
                 allowed_extensions=["json"]
             )
 
+            if path:
+                try:
+                    with open(path, "w") as f:
+                        f.write(json_str)
+                    self._show_snack(f"{i18n.get('export_success') or 'Exported to'} {path}", "GREEN")
+                except Exception as ex:
+                    logger.error(f"Failed to export settings: {ex}")
+                    self._show_snack(f"Export Failed: {ex}", "RED")
+
     async def _import_settings(self, e):
         """
         Import settings via FilePicker.
         """
-        self._picker_context = "import_settings"
-        await self.file_picker.pick_files(
-            allow_multiple=False,
-            allowed_extensions=["json"],
-            dialog_title=i18n.get("btn_import_settings") or "Import Settings"
-        )
+        from switchcraft import IS_WEB
+        import json
 
-    def _on_file_picker_result(self, e):
-        """Handle results from the shared FilePicker."""
-        context = getattr(self, "_picker_context", None)
-        if not context:
-            return
+        if IS_WEB:
+             self._show_snack("Settings import not supported in web version yet", "ORANGE")
+             return
 
-        if context == "export_settings":
-            if e.path:
-                try:
-                    prefs = SwitchCraftConfig.export_preferences()
-                    with open(e.path, "w") as f:
-                        json.dump(prefs, f, indent=4)
-                    self._show_snack(f"{i18n.get('export_success') or 'Exported to'} {e.path}")
-                except Exception as ex:
-                    logger.error(f"Failed to export settings: {ex}")
-                    self._show_snack(f"Export Failed: {ex}", "RED")
+        from switchcraft.gui_modern.utils.file_picker_helper import FilePickerHelper
+        path = FilePickerHelper.pick_file(
+            allowed_extensions=["json"],
+            allow_multiple=False
+        )
 
-        elif context == "import_settings":
-            if e.files and len(e.files) > 0:
-                fpath = e.files[0].path
-                content = getattr(e.files[0], "content", None)
+        if path:
+            # pick_file returns string if allow_multiple=False is intended or just first item
+            fpath = path[0] if isinstance(path, list) else path
 
-                try:
-                    if fpath:
-                        # Desktop Flow
-                        with open(fpath, "r", encoding="utf-8") as f:
-                            data = json.load(f)
-                    elif content:
-                        # Web Flow (Simulated/Future-Proofing for Flet Web Byte Access)
-                        # content is usually bytes in Flet Web
-                        data = json.loads(content.decode("utf-8"))
-                    else:
-                        # Fallback for Web where path is None and content not provided directly
-                        # Or restricted environment
-                        from switchcraft import IS_WEB
-                        if IS_WEB:
-                            self._show_snack("Settings import not supported in web version yet (Sandbox restriction)", "ORANGE")
-                        else:
-                            self._show_snack("Import failed: No file path or content received", "RED")
-                        return
+            try:
+                with open(fpath, "r", encoding="utf-8") as f:
+                    data = json.load(f)
 
-                    SwitchCraftConfig.import_preferences(data)
-                    self._show_snack(i18n.get("import_success") or "Settings Imported. Please Restart.", "GREEN")
-                except Exception as ex:
-                    logger.error(f"Error importing settings: {ex}")
-                    self._show_snack(f"Import Failed: {ex}", "RED")
+                SwitchCraftConfig.import_preferences(data)
+                self._show_snack(i18n.get("import_success") or "Settings Imported. Please Restart.", "GREEN")
+            except Exception as ex:
+                logger.error(f"Error importing settings: {ex}")
+                self._show_snack(f"Import Failed: {ex}", "RED")
 
-        elif context == "export_logs":
-            if e.path:
-                try:
-                    # e.path is the destination
-                    # We need to copy from self._log_source_path (set in _export_logs)
-                    src = getattr(self, "_log_source_path", None)
-                    if src:
-                        import shutil
-                        shutil.copy2(src, e.path)
-                        self._show_snack(f"Logs exported to {e.path}", "GREEN")
-                    else:
-                        self._show_snack("Log copy failed: Source lost", "RED")
-                except Exception as ex:
-                    self._show_snack(f"Log export failed: {ex}", "RED")
 
-        # Reset context
-        self._picker_context = None
 
     async def _export_logs(self, e):
         """Export logs to a file. Includes current session log and recent log files."""
@@ -1275,14 +1244,22 @@ async def _export_logs(self, e):
                 self._show_snack(f"Web Export Failed: {ex}", "RED")
         else:
             # Desktop: Save Dialog
-            self._log_source_path = source_path
-            self._picker_context = "export_logs"
-            await self.file_picker.save_file(
+            from switchcraft.gui_modern.utils.file_picker_helper import FilePickerHelper
+
+            path = FilePickerHelper.save_file(
                 dialog_title=i18n.get("help_export_logs") or "Export Logs",
                 file_name=filename,
                 allowed_extensions=["log", "txt"]
             )
 
+            if path:
+                try:
+                   import shutil
+                   shutil.copy2(source_path, path)
+                   self._show_snack(f"Logs exported to {path}", "GREEN")
+                except Exception as ex:
+                   self._show_snack(f"Log export failed: {ex}", "RED")
+
 
 
 

src/switchcraft/services/intune_service.py

@@ -581,7 +581,7 @@ def list_apps(self, token, filter_query=None):
         else:
             # Default limits and select to improve performance
             params["$top"] = "100"
-            params["$select"] = "id,displayName,publisher,appType,largeIcon,iconUrl,logoUrl"
+            params["$select"] = "id,displayName,publisher,appType,largeIcon,iconUrl,logoUrl,displayVersion"
 
         try:
             resp = requests.get(url, headers=headers, params=params, timeout=30, stream=False)

switchcraft.iss

@@ -17,7 +17,8 @@
 #define MyAppPublisher "FaserF"
 #define MyAppURL "https://github.com/FaserF/SwitchCraft"
 #define MyAppExeName "SwitchCraft.exe"
-#define MyAppDescription "Silent Install Switch Finder"
+#define MyAppDescription "SwitchCraft - Advanced Silent Switch & Packaging Tool"
+#define MyAppCopyright "Copyright (c) 2026 FaserF"
 
 [Setup]
 ; Basic Info
@@ -33,6 +34,8 @@ VersionInfoVersion={#MyAppVersionInfo}
 VersionInfoCompany={#MyAppPublisher}
 VersionInfoDescription={#MyAppDescription}
 VersionInfoProductName={#MyAppName}
+VersionInfoCopyright={#MyAppCopyright}
+VersionInfoProductVersion={#MyAppVersionInfo}
 
 ; Default directory (changes based on admin/user mode)
 DefaultDirName={autopf}\{#MyAppPublisher}\{#MyAppName}

switchcraft_legacy.iss

@@ -17,7 +17,8 @@
 #define MyAppPublisher "FaserF"
 #define MyAppURL "https://github.com/FaserF/SwitchCraft"
 #define MyAppExeName "SwitchCraft-Legacy.exe"
-#define MyAppDescription "Silent Install Switch Finder (Legacy)"
+#define MyAppDescription "SwitchCraft - Advanced Silent Switch & Packaging Tool (Legacy)"
+#define MyAppCopyright "Copyright (c) 2026 FaserF"
 
 [Setup]
 ; Basic Info
@@ -33,6 +34,8 @@ VersionInfoVersion={#MyAppVersionInfo}
 VersionInfoCompany={#MyAppPublisher}
 VersionInfoDescription={#MyAppDescription}
 VersionInfoProductName={#MyAppName}
+VersionInfoCopyright={#MyAppCopyright}
+VersionInfoProductVersion={#MyAppVersionInfo}
 
 ; Default directory (changes based on admin/user mode)
 DefaultDirName={autopf}\{#MyAppPublisher}\{#MyAppName}