small test fixes

FaserF · FaserF · commit 52b2420d40e6 · 2026-01-16T13:08:43.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,6 +54,12 @@ jobs:
           # Update file_version_info.txt
           python .github/scripts/update_version_info.py "$VERSION"
 
+          # Update .iss files (Inno Setup installer scripts)
+          sed -i "s/#define MyAppVersion \".*\"/#define MyAppVersion \"$VERSION\"/" switchcraft_modern.iss
+          sed -i "s/#define MyAppVersionNumeric \".*\"/#define MyAppVersionNumeric \"$VERSION\"/" switchcraft_modern.iss
+          sed -i "s/#define MyAppVersion \".*\"/#define MyAppVersion \"$VERSION\"/" switchcraft_legacy.iss
+          sed -i "s/#define MyAppVersionNumeric \".*\"/#define MyAppVersionNumeric \"$VERSION\"/" switchcraft_legacy.iss
+
       - name: Generate Changelog
         id: changelog
         run: |
@@ -86,7 +92,7 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-          git add pyproject.toml src/switchcraft/__init__.py file_version_info.txt
+          git add pyproject.toml src/switchcraft/__init__.py file_version_info.txt switchcraft_modern.iss switchcraft_legacy.iss
 
           # Only commit if there are changes
           if ! git diff --cached --quiet; then
@@ -141,8 +147,15 @@ jobs:
           sed -i "s/__version__ = \".*\"/__version__ = \"$DEV_VERSION\"/" src/switchcraft/__init__.py
           python .github/scripts/update_version_info.py "$DEV_VERSION"
 
+          # Update .iss files (Inno Setup installer scripts) - keep base version without -dev suffix for installer
+          BASE_VERSION=$(echo $DEV_VERSION | sed 's/-dev$//')
+          sed -i "s/#define MyAppVersion \".*\"/#define MyAppVersion \"$BASE_VERSION\"/" switchcraft_modern.iss
+          sed -i "s/#define MyAppVersionNumeric \".*\"/#define MyAppVersionNumeric \"$BASE_VERSION\"/" switchcraft_modern.iss
+          sed -i "s/#define MyAppVersion \".*\"/#define MyAppVersion \"$BASE_VERSION\"/" switchcraft_legacy.iss
+          sed -i "s/#define MyAppVersionNumeric \".*\"/#define MyAppVersionNumeric \"$BASE_VERSION\"/" switchcraft_legacy.iss
+
           # Commit
-          git add pyproject.toml src/switchcraft/__init__.py file_version_info.txt
+          git add pyproject.toml src/switchcraft/__init__.py file_version_info.txt switchcraft_modern.iss switchcraft_legacy.iss
           git commit -m "chore: bump version to $DEV_VERSION for development [skip ci]"
           git push origin main
 
diff --git a/renovate.json b/renovate.json
@@ -20,6 +20,10 @@
     "**/venv/**",
     "**/__pycache__/**"
   ],
+  "schedule": [
+    "before 4am on monday"
+  ],
+  "timezone": "Europe/Berlin",
   "packageRules": [
     {
       "matchManagers": [
@@ -33,6 +37,16 @@
       "groupName": "flet packages",
       "description": "Group flet and flet-desktop updates together to keep them in sync"
     },
+    {
+      "matchManagers": [
+        "pep621",
+        "pip_requirements"
+      ],
+      "matchPackageNames": [
+        "pyinstaller"
+      ],
+      "description": "PyInstaller build dependency - ensure updates are detected"
+    },
     {
       "matchManagers": [
         "pep621",
diff --git a/src/switchcraft/gui_modern/views/intune_store_view.py b/src/switchcraft/gui_modern/views/intune_store_view.py
@@ -147,16 +147,20 @@ def _search_task():
                     else:
                         apps = self.intune_service.list_apps(token) # Top 50?
 
-                    result_holder["apps"] = apps
+                    result_holder["apps"] = apps if apps else []
                     result_holder["completed"] = True
                 except requests.exceptions.Timeout:
-                    result_holder["error"] = "Request timed out. The server took too long to respond. Please try again."
+                    result_holder["error"] = "Request timed out after 30 seconds. Please check your connection and try again."
                     result_holder["completed"] = True
                 except requests.exceptions.RequestException as ex:
-                    result_holder["error"] = f"Network error: {str(ex)}"
+                    result_holder["error"] = f"Network error: {str(ex)}. Please check your connection."
                     result_holder["completed"] = True
                 except Exception as ex:
-                    result_holder["error"] = f"Error: {str(ex)}"
+                    error_msg = str(ex)
+                    if "timeout" in error_msg.lower():
+                        result_holder["error"] = "Request timed out. Please check your connection and try again."
+                    else:
+                        result_holder["error"] = f"Error: {error_msg}"
                     result_holder["completed"] = True
 
             # Start search in background thread
diff --git a/src/switchcraft/gui_modern/views/winget_view.py b/src/switchcraft/gui_modern/views/winget_view.py
@@ -329,13 +329,34 @@ def _show_list(self, results, filter_by="all", query=""):
     def _load_details(self, short_info):
         logger.info(f"Loading details for package: {short_info.get('Id', 'Unknown')}")
 
-        # Show loading immediately
-        self.details_area.controls.clear()
-        self.details_area.controls.append(ft.ProgressBar())
+        # Create new loading area immediately
+        loading_area = ft.Column(scroll=ft.ScrollMode.AUTO, expand=True)
+        loading_area.controls.append(ft.ProgressBar())
+        loading_area.controls.append(ft.Text("Loading package details...", color="GREY_500", italic=True))
+        self.details_area = loading_area
+
+        # CRITICAL: Re-assign content to force container refresh
+        self.right_pane.content = self.details_area
         self.right_pane.visible = True
 
-        # Force update
-        self.update()
+        # Force update of details area, row, and page
+        try:
+            self.details_area.update()
+        except Exception as ex:
+            logger.debug(f"Error updating details_area: {ex}")
+        try:
+            self.right_pane.update()
+        except Exception as ex:
+            logger.debug(f"Error updating right_pane: {ex}")
+        try:
+            self.update()
+        except Exception as ex:
+            logger.debug(f"Error updating row: {ex}")
+        if hasattr(self, 'app_page'):
+            try:
+                self.app_page.update()
+            except Exception as ex:
+                logger.debug(f"Error updating app_page: {ex}")
 
         def _fetch():
             try:
@@ -353,8 +374,8 @@ def _show_ui():
                     except Exception as ex:
                         logger.exception(f"Error in _show_details_ui: {ex}")
                         # Show error in UI
-                        self.details_area.controls.clear()
-                        self.details_area.controls.append(
+                        error_area = ft.Column(scroll=ft.ScrollMode.AUTO, expand=True)
+                        error_area.controls.append(
                             ft.Container(
                                 content=ft.Column([
                                     ft.Icon(ft.Icons.ERROR, color="RED", size=40),
@@ -364,7 +385,17 @@ def _show_ui():
                                 alignment=ft.Alignment(0, 0)
                             )
                         )
-                        self.update()
+                        self.details_area = error_area
+                        self.right_pane.content = self.details_area
+                        self.right_pane.visible = True
+                        try:
+                            self.details_area.update()
+                            self.right_pane.update()
+                            self.update()
+                            if hasattr(self, 'app_page'):
+                                self.app_page.update()
+                        except Exception:
+                            pass
 
                 if hasattr(self.app_page, 'run_task'):
                     try:
@@ -385,8 +416,8 @@ def _show_ui():
 
                 # Update UI on main thread
                 def _show_error_ui():
-                    self.details_area.controls.clear()
-                    self.details_area.controls.append(
+                    error_area = ft.Column(scroll=ft.ScrollMode.AUTO, expand=True)
+                    error_area.controls.append(
                         ft.Container(
                             content=ft.Column([
                                 ft.Icon(ft.Icons.ERROR, color="RED", size=40),
@@ -397,7 +428,17 @@ def _show_error_ui():
                             alignment=ft.Alignment(0, 0)
                         )
                     )
-                    self.update()
+                    self.details_area = error_area
+                    self.right_pane.content = self.details_area
+                    self.right_pane.visible = True
+                    try:
+                        self.details_area.update()
+                        self.right_pane.update()
+                        self.update()
+                        if hasattr(self, 'app_page'):
+                            self.app_page.update()
+                    except Exception:
+                        pass
 
                 if hasattr(self.app_page, 'run_task'):
                     self.app_page.run_task(_show_error_ui)
diff --git a/src/switchcraft/services/intune_service.py b/src/switchcraft/services/intune_service.py
@@ -106,7 +106,7 @@ def create_intunewin(self, source_folder: str, setup_file: str, output_folder: s
             startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
 
         try:
-            process = subprocess.Popen(
+            with subprocess.Popen(
                 cmd,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,
@@ -115,19 +115,21 @@ def create_intunewin(self, source_folder: str, setup_file: str, output_folder: s
                 startupinfo=startupinfo,
                 bufsize=1,
                 universal_newlines=True
-            )
+            ) as process:
 
-            full_output = []
+                full_output = []
 
-            # Stream output
-            for line in process.stdout:
-                line_str = line
-                full_output.append(line_str)
-                # If a callback is provided (e.g. for UI)
-                if progress_callback:
-                    progress_callback(line_str)
+                # Stream output
+                for line in process.stdout:
+                    line_str = line
+                    full_output.append(line_str)
+                    # If a callback is provided (e.g. for UI)
+                    if progress_callback:
+                        progress_callback(line_str)
 
-            process.wait()
+                # No need to call process.wait() explicitly as 'with' handles it,
+                # but we can do it if we want the return code check immediately after loop
+                # The loop ends when stdout closes (process exit usually)
 
             output_str = "".join(full_output)
 
@@ -385,7 +387,7 @@ def list_apps(self, token, filter_query=None):
             params["$select"] = "id,displayName,publisher,appType,largeIcon,iconUrl,logoUrl"
 
         try:
-            resp = requests.get(url, headers=headers, params=params, timeout=30)
+            resp = requests.get(url, headers=headers, params=params, timeout=30, stream=False)
             resp.raise_for_status()
             data = resp.json()
             return data.get("value", [])
@@ -466,9 +468,15 @@ def get_app_details(self, token, app_id):
         base_url = f"https://graph.microsoft.com/beta/deviceAppManagement/mobileApps/{app_id}"
 
         try:
-            resp = requests.get(base_url, headers=headers, timeout=30)
+            resp = requests.get(base_url, headers=headers, timeout=30, stream=False)
             resp.raise_for_status()
             return resp.json()
+        except requests.exceptions.Timeout:
+            logger.error(f"Request timed out while getting app details for {app_id}")
+            raise Exception("Request timed out. The server took too long to respond.")
+        except requests.exceptions.RequestException as e:
+            logger.error(f"Network error getting app details: {e}")
+            raise Exception(f"Network error: {str(e)}")
         except Exception as e:
             logger.error(f"Failed to get app details: {e}")
             raise e
diff --git a/src/switchcraft/utils/logging_handler.py b/src/switchcraft/utils/logging_handler.py
@@ -32,6 +32,13 @@ def setup_file_logging(self, log_dir):
             filename = f"SwitchCraft_Session_{timestamp}.log"
             self.current_log_path = log_dir / filename
 
+            # Close existing handler if it exists
+            if self.file_handler:
+                try:
+                    self.file_handler.close()
+                except Exception:
+                    pass
+
             # Create FileHandler
             self.file_handler = logging.FileHandler(self.current_log_path, encoding='utf-8')
             formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
diff --git a/src/switchcraft_winget/utils/winget.py b/src/switchcraft_winget/utils/winget.py
@@ -131,7 +131,17 @@ def _search_via_powershell(self, query: str) -> List[Dict[str, str]]:
             cmd = ["powershell", "-NoProfile", "-NonInteractive", "-Command", ps_script]
             startupinfo = self._get_startup_info()
 
-            proc = subprocess.run(cmd, capture_output=True, text=True, encoding="utf-8", errors="ignore", startupinfo=startupinfo, timeout=45)
+            # Hide CMD window on Windows
+            kwargs = {}
+            if startupinfo:
+                kwargs['startupinfo'] = startupinfo
+            import sys
+            if sys.platform == "win32":
+                if hasattr(subprocess, 'CREATE_NO_WINDOW'):
+                    kwargs['creationflags'] = subprocess.CREATE_NO_WINDOW
+                else:
+                    kwargs['creationflags'] = 0x08000000  # CREATE_NO_WINDOW constant
+            proc = subprocess.run(cmd, capture_output=True, text=True, encoding="utf-8", errors="ignore", timeout=45, **kwargs)
 
             if proc.returncode != 0:
                 logger.debug(f"PowerShell search failed: {proc.stderr[:200] if proc.stderr else 'No error'}")
@@ -317,7 +327,17 @@ def install_package(self, package_id: str, scope: str = "machine") -> bool:
             "--accept-source-agreements"
         ]
         try:
-            proc = subprocess.run(cmd, capture_output=True, text=True)
+            startupinfo = self._get_startup_info()
+            kwargs = {}
+            if startupinfo:
+                kwargs['startupinfo'] = startupinfo
+            import sys
+            if sys.platform == "win32":
+                if hasattr(subprocess, 'CREATE_NO_WINDOW'):
+                    kwargs['creationflags'] = subprocess.CREATE_NO_WINDOW
+                else:
+                    kwargs['creationflags'] = 0x08000000  # CREATE_NO_WINDOW constant
+            proc = subprocess.run(cmd, capture_output=True, text=True, **kwargs)
             if proc.returncode != 0:
                 logger.error(f"Winget install failed: {proc.stderr}")
                 return False
@@ -330,7 +350,17 @@ def download_package(self, package_id: str, dest_dir: Path) -> Optional[Path]:
         """Download a package installer to dest_dir. Returns path to installer if found."""
         cmd = ["winget", "download", "--id", package_id, "--dir", str(dest_dir), "--accept-source-agreements", "--accept-package-agreements"]
         try:
-            proc = subprocess.run(cmd, capture_output=True, text=True)
+            startupinfo = self._get_startup_info()
+            kwargs = {}
+            if startupinfo:
+                kwargs['startupinfo'] = startupinfo
+            import sys
+            if sys.platform == "win32":
+                if hasattr(subprocess, 'CREATE_NO_WINDOW'):
+                    kwargs['creationflags'] = subprocess.CREATE_NO_WINDOW
+                else:
+                    kwargs['creationflags'] = 0x08000000  # CREATE_NO_WINDOW constant
+            proc = subprocess.run(cmd, capture_output=True, text=True, **kwargs)
             if proc.returncode != 0:
                 logger.error(f"Winget download failed: {proc.stderr}")
                 return None
@@ -351,7 +381,17 @@ def _search_via_cli(self, query: str) -> List[Dict[str, str]]:
              cmd = ["winget", "search", query, "--accept-source-agreements"]
              startupinfo = self._get_startup_info()
 
-             proc = subprocess.run(cmd, capture_output=True, text=True, encoding="utf-8", errors="ignore", startupinfo=startupinfo)
+             # Hide CMD window on Windows
+             kwargs = {}
+             if startupinfo:
+                 kwargs['startupinfo'] = startupinfo
+             import sys
+             if sys.platform == "win32":
+                 if hasattr(subprocess, 'CREATE_NO_WINDOW'):
+                     kwargs['creationflags'] = subprocess.CREATE_NO_WINDOW
+                 else:
+                     kwargs['creationflags'] = 0x08000000  # CREATE_NO_WINDOW constant
+             proc = subprocess.run(cmd, capture_output=True, text=True, encoding="utf-8", errors="ignore", **kwargs)
              if proc.returncode != 0:
                  return []
 
diff --git a/switchcraft_legacy.iss b/switchcraft_legacy.iss
@@ -5,8 +5,12 @@
 ; Debug Mode: /DEBUGMODE=1 (enables verbose logging)
 
 #define MyAppName "SwitchCraft Legacy"
-#define MyAppVersion "2025.12.4"
-#define MyAppVersionNumeric "2025.12.4"
+#ifndef MyAppVersion
+  #define MyAppVersion "2026.1.1"
+#endif
+#ifndef MyAppVersionNumeric
+  #define MyAppVersionNumeric "2026.1.1"
+#endif
 #define MyAppPublisher "FaserF"
 #define MyAppURL "https://github.com/FaserF/SwitchCraft"
 #define MyAppExeName "SwitchCraft-Legacy.exe"
diff --git a/switchcraft_modern.iss b/switchcraft_modern.iss
@@ -5,8 +5,12 @@
 ; Debug Mode: /DEBUGMODE=1 (enables verbose logging)
 
 #define MyAppName "SwitchCraft"
-#define MyAppVersion "2025.12.4"
-#define MyAppVersionNumeric "2025.12.4"
+#ifndef MyAppVersion
+  #define MyAppVersion "2026.1.1"
+#endif
+#ifndef MyAppVersionNumeric
+  #define MyAppVersionNumeric "2026.1.1"
+#endif
 #define MyAppPublisher "FaserF"
 #define MyAppURL "https://github.com/FaserF/SwitchCraft"
 #define MyAppExeName "SwitchCraft.exe"
diff --git a/tests/test_full_coverage.py b/tests/test_full_coverage.py
@@ -66,6 +66,7 @@ def test_intune_packaging(mock_popen, mock_is_avail, intune_service, tmp_path):
     process_mock.stdout = ["Output line 1\n", "Output line 2\n"]
     process_mock.returncode = 0
     process_mock.wait.return_value = None
+    process_mock.__enter__.return_value = process_mock
     mock_popen.return_value = process_mock
 
     # Correct args: source_folder, setup_file, output_folder
diff --git a/tests/test_phase4.py b/tests/test_phase4.py
@@ -61,6 +61,7 @@ def test_create_intunewin(self, mock_popen):
         mock_proc.returncode = 0
         mock_proc.stdout = ["Package created\n"] # Iterable
         mock_proc.wait.return_value = None
+        mock_proc.__enter__.return_value = mock_proc
         mock_popen.return_value = mock_proc
 
         output_dir = Path(self.test_dir) / "output"
diff --git a/tests/test_phase7.py b/tests/test_phase7.py
