diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a059d6..28e16ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Jackify Changelog +## v0.2.0.1 - Critical Bugfix Release +**Release Date:** 2025-12-15 + +### Critical Bug Fixes +- **Directory Safety Validation**: Fixed data loss bug where directories with only a `downloads/` folder were incorrectly identified as valid modlist directories +- **Flatpak Steam Restart**: Fixed Steam restart failures on Ubuntu/PopOS by removing incompatible `-foreground` flag and increasing startup wait + +### Bug Fixes +- **External Links**: Fixed Ko-fi, GitHub, and Nexus links not opening on some distros using xdg-open with clean environment +- **TTW Console Output**: Filtered standalone "OK"/"DONE" noise messages from TTW installation console +- **Activity Window**: Fixed progress display updates in TTW Installer and other workflows +- **Wine Component Installation**: Added status feedback during component installation showing component list +- **Progress Parser**: Added defensive checks to prevent segfaults from malformed engine output +- **Progress Parser Speed Info**: Fixed 'OperationType' object has no attribute 'lower' error by converting enum to string value when extracting speed info from timestamp status patterns + +### Improvements +- **Default Wine Components**: Added dxvk to default component list for better graphics compatibility +- **TTW Installer UI**: Show version numbers in status displays + +### Engine Updates +- **jackify-engine 0.4.1**: Download reliability fixes, BSA case sensitivity handling, external drive I/O limiting, GPU detection caching, and texture processing performance improvements + +--- + ## v0.2.0 - Modlist Gallery, OAuth Authentication & Performance Improvements **Release Date:** 2025-12-06 diff --git a/jackify/__init__.py b/jackify/__init__.py index a01e7cb..379538c 100644 --- a/jackify/__init__.py +++ b/jackify/__init__.py @@ -5,4 +5,4 @@ This package provides both CLI and GUI interfaces for managing Wabbajack modlists natively on Linux systems. """ -__version__ = "0.2.0" +__version__ = "0.2.0.1" diff --git a/jackify/backend/handlers/modlist_handler.py b/jackify/backend/handlers/modlist_handler.py index 7e6e7d9..7d6316f 100644 --- a/jackify/backend/handlers/modlist_handler.py +++ b/jackify/backend/handlers/modlist_handler.py @@ -722,7 +722,7 @@ class ModlistHandler: try: self.logger.info("Installing Wine components using user's preferred method...") self.logger.debug(f"Calling winetricks_handler.install_wine_components with wineprefix={wineprefix}, game_var={self.game_var_full}, components={components}") - success = self.winetricks_handler.install_wine_components(wineprefix, self.game_var_full, specific_components=components) + success = self.winetricks_handler.install_wine_components(wineprefix, self.game_var_full, specific_components=components, status_callback=status_callback) if success: self.logger.info("Wine component installation completed successfully") if status_callback: diff --git a/jackify/backend/handlers/progress_parser.py b/jackify/backend/handlers/progress_parser.py index f053409..22bced6 100644 --- a/jackify/backend/handlers/progress_parser.py +++ b/jackify/backend/handlers/progress_parser.py @@ -224,7 +224,7 @@ class ProgressParser: speed_info = self._parse_speed_from_string(speed_str) if speed_info: operation = self._detect_operation_from_line(status_text) - result.speed_info = (operation, speed_info) + result.speed_info = (operation.value, speed_info) # Calculate overall percentage from step progress if max_steps > 0: @@ -400,6 +400,18 @@ class ProgressParser: def _extract_file_progress(self, line: str) -> Optional[FileProgress]: """Extract file-level progress information.""" + # CRITICAL: Defensive checks to prevent segfault in regex engine + # Segfaults happen in C code before Python exceptions, so we must validate input first + if not line or not isinstance(line, str): + return None + # Limit line length to prevent stack overflow in regex (10KB should be more than enough) + if len(line) > 10000: + return None + # Check for null bytes or other problematic characters that could corrupt regex + if '\x00' in line: + # Replace null bytes to prevent corruption + line = line.replace('\x00', '') + # PRIORITY: Check for [FILE_PROGRESS] prefix first (new engine format) # Format: [FILE_PROGRESS] Downloading: filename.zip (20.0%) [3.7MB/s] # Updated format: [FILE_PROGRESS] (Downloading|Extracting|Installing|Converting|Completed|etc): filename.zip (20.0%) [3.7MB/s] (current/total) @@ -907,6 +919,13 @@ class ProgressStateManager: self._remove_synthetic_wabbajack() # Mark that we have a real .wabbajack entry to prevent synthetic ones self._has_real_wabbajack = True + else: + # CRITICAL: If we get a real archive file (not .wabbajack), remove all .wabbajack entries + # This ensures .wabbajack entries disappear as soon as archive downloads start + from jackify.shared.progress_models import OperationType + if parsed.file_progress.operation == OperationType.DOWNLOAD: + self._remove_all_wabbajack_entries() + self._has_real_wabbajack = True # Prevent re-adding self._augment_file_metrics(parsed.file_progress) # Don't add files that are already at 100% unless they're being updated # This prevents re-adding completed files @@ -934,6 +953,21 @@ class ProgressStateManager: self.state.add_file(parsed.file_progress) updated = True elif parsed.data_info: + # CRITICAL: Remove .wabbajack entries as soon as archive download phase starts + # Check if we're in "Downloading Mod Archives" phase or have real archive files downloading + phase_name_lower = (parsed.phase_name or "").lower() + message_lower = (parsed.message or "").lower() + is_archive_phase = ( + 'mod archives' in phase_name_lower or + 'downloading mod archives' in message_lower or + (parsed.phase == InstallationPhase.DOWNLOAD and self._has_real_download_activity()) + ) + + if is_archive_phase: + # Archive download phase has started - remove all .wabbajack entries immediately + self._remove_all_wabbajack_entries() + self._has_real_wabbajack = True # Prevent re-adding + # Only create synthetic .wabbajack entry if we don't already have a real one if not getattr(self, '_has_real_wabbajack', False): if self._maybe_add_wabbajack_progress(parsed): @@ -1164,4 +1198,19 @@ class ProgressStateManager: remaining.append(fp) if removed: self.state.active_files = remaining + + def _remove_all_wabbajack_entries(self): + """Remove ALL .wabbajack entries (synthetic and real) when archive download phase starts.""" + remaining = [] + removed = False + for fp in self.state.active_files: + if fp.filename.lower().endswith('.wabbajack') or 'wabbajack' in fp.filename.lower(): + removed = True + self._file_history.pop(fp.filename, None) + continue + remaining.append(fp) + if removed: + self.state.active_files = remaining + # Also clear the wabbajack entry name to prevent re-adding + self._wabbajack_entry_name = None diff --git a/jackify/backend/handlers/validation_handler.py b/jackify/backend/handlers/validation_handler.py index 060ce44..7576bc3 100644 --- a/jackify/backend/handlers/validation_handler.py +++ b/jackify/backend/handlers/validation_handler.py @@ -300,7 +300,7 @@ class ValidationHandler: def looks_like_modlist_dir(self, path: Path) -> bool: """Return True if the directory contains files/folders typical of a modlist install.""" expected = [ - 'ModOrganizer.exe', 'profiles', 'mods', 'downloads', '.wabbajack', '.jackify_modlist_marker', 'ModOrganizer.ini' + 'ModOrganizer.exe', 'profiles', 'mods', '.wabbajack', '.jackify_modlist_marker', 'ModOrganizer.ini' ] for item in expected: if (path / item).exists(): diff --git a/jackify/backend/handlers/winetricks_handler.py b/jackify/backend/handlers/winetricks_handler.py index 2c35c89..8d9b74b 100644 --- a/jackify/backend/handlers/winetricks_handler.py +++ b/jackify/backend/handlers/winetricks_handler.py @@ -9,7 +9,7 @@ import os import subprocess import logging from pathlib import Path -from typing import Optional, List +from typing import Optional, List, Callable logger = logging.getLogger(__name__) @@ -110,10 +110,16 @@ class WinetricksHandler: self.logger.error(f"Error testing winetricks: {e}") return False - def install_wine_components(self, wineprefix: str, game_var: str, specific_components: Optional[List[str]] = None) -> bool: + def install_wine_components(self, wineprefix: str, game_var: str, specific_components: Optional[List[str]] = None, status_callback: Optional[Callable[[str], None]] = None) -> bool: """ Install the specified Wine components into the given prefix using winetricks. If specific_components is None, use the default set (fontsmooth=rgb, xact, xact_x64, vcrun2022). + + Args: + wineprefix: Path to Wine prefix + game_var: Game name for logging + specific_components: Optional list of specific components to install + status_callback: Optional callback function(status_message: str) for progress updates """ if not self.is_available(): self.logger.error("Winetricks is not available") @@ -268,11 +274,18 @@ class WinetricksHandler: if not all_components: self.logger.info("No Wine components to install.") + if status_callback: + status_callback("No Wine components to install") return True # Reorder components for proper installation sequence components_to_install = self._reorder_components_for_installation(all_components) self.logger.info(f"WINEPREFIX: {wineprefix}, Game: {game_var}, Ordered Components: {components_to_install}") + + # Show status with component list + if status_callback: + components_list = ', '.join(components_to_install) + status_callback(f"Installing Wine components: {components_list}") # Check user preference for component installation method from ..handlers.config_handler import ConfigHandler @@ -290,7 +303,7 @@ class WinetricksHandler: # Choose installation method based on user preference if method == 'system_protontricks': self.logger.info("Using system protontricks for all components") - return self._install_components_protontricks_only(components_to_install, wineprefix, game_var) + return self._install_components_protontricks_only(components_to_install, wineprefix, game_var, status_callback) # else: method == 'winetricks' (default behavior continues below) # Install all components together with winetricks (faster) @@ -358,6 +371,9 @@ class WinetricksHandler: # Verify components were actually installed if self._verify_components_installed(wineprefix, components_to_install, env): self.logger.info("Component verification successful - all components installed correctly.") + components_list = ', '.join(components_to_install) + if status_callback: + status_callback(f"Wine components installed and verified: {components_list}") # Set Windows 10 mode after component installation (matches legacy script timing) self._set_windows_10_mode(wineprefix, env.get('WINE', '')) return True @@ -461,7 +477,7 @@ class WinetricksHandler: self.logger.warning("=" * 80) # Attempt fallback to protontricks - fallback_success = self._install_components_protontricks_only(components_to_install, wineprefix, game_var) + fallback_success = self._install_components_protontricks_only(components_to_install, wineprefix, game_var, status_callback) if fallback_success: self.logger.info("SUCCESS: Protontricks fallback succeeded where winetricks failed") @@ -698,7 +714,7 @@ class WinetricksHandler: except Exception as e: self.logger.warning(f"Error setting Windows 10 mode: {e}") - def _install_components_protontricks_only(self, components: list, wineprefix: str, game_var: str) -> bool: + def _install_components_protontricks_only(self, components: list, wineprefix: str, game_var: str, status_callback: Optional[Callable[[str], None]] = None) -> bool: """ Install all components using protontricks only. This matches the behavior of the original bash script. @@ -732,6 +748,9 @@ class WinetricksHandler: return False # Install all components using protontricks + components_list = ', '.join(components) + if status_callback: + status_callback(f"Installing Wine components via protontricks: {components_list}") success = protontricks_handler.install_wine_components(appid, game_var, components) if success: diff --git a/jackify/backend/services/steam_restart_service.py b/jackify/backend/services/steam_restart_service.py index 30f3b34..00b7ea7 100644 --- a/jackify/backend/services/steam_restart_service.py +++ b/jackify/backend/services/steam_restart_service.py @@ -150,8 +150,14 @@ def is_flatpak_steam() -> bool: stderr=subprocess.DEVNULL, # Suppress stderr to avoid error messages text=True, timeout=5) - if result.returncode == 0 and 'com.valvesoftware.Steam' in result.stdout: - return True + if result.returncode == 0: + # Check for exact match - "com.valvesoftware.Steam" as a whole word + # This prevents matching "com.valvesoftware.SteamLink" or similar + for line in result.stdout.splitlines(): + parts = line.split() + if parts and parts[0] == 'com.valvesoftware.Steam': + return True + return False except Exception as e: logger.debug(f"Error detecting Flatpak Steam: {e}") return False @@ -222,7 +228,8 @@ def _start_steam_nak_style(is_steamdeck_flag=False, is_flatpak_flag=False, env_o subprocess.Popen("steam", shell=True, env=env) time.sleep(5) - check_result = subprocess.run(['pgrep', '-f', 'steam'], capture_output=True, timeout=10, env=env) + # Use steamwebhelper for detection (actual Steam process, not steam-powerbuttond) + check_result = subprocess.run(['pgrep', '-f', 'steamwebhelper'], capture_output=True, timeout=10, env=env) if check_result.returncode == 0: logger.info("NaK-style restart detected running Steam process.") return True @@ -282,7 +289,8 @@ def start_steam(is_steamdeck_flag=None, is_flatpak_flag=None, env_override=None, subprocess.Popen(["flatpak", "run", "com.valvesoftware.Steam"], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) time.sleep(7) # Give Flatpak more time to start - check_result = subprocess.run(['pgrep', '-f', 'steam'], capture_output=True, timeout=10, env=env) + # For Flatpak Steam, check for the flatpak process, not steamwebhelper + check_result = subprocess.run(['pgrep', '-f', 'com.valvesoftware.Steam'], capture_output=True, timeout=10, env=env) if check_result.returncode == 0: logger.info("Flatpak Steam started successfully") return True @@ -308,7 +316,8 @@ def start_steam(is_steamdeck_flag=None, is_flatpak_flag=None, env_override=None, if process is not None: logger.info(f"Initiated Steam start with {method_name}.") time.sleep(5) # Wait 5 seconds as in existing logic - check_result = subprocess.run(['pgrep', '-f', 'steam'], capture_output=True, timeout=10, env=env) + # Use steamwebhelper for detection (actual Steam process, not steam-powerbuttond) + check_result = subprocess.run(['pgrep', '-f', 'steamwebhelper'], capture_output=True, timeout=10, env=env) if check_result.returncode == 0: logger.info(f"Steam process detected after using {method_name}. Proceeding to wait phase.") return True @@ -367,7 +376,7 @@ def robust_steam_restart(progress_callback: Optional[Callable[[str], None]] = No try: report("Flatpak Steam detected - stopping via flatpak...") subprocess.run(['flatpak', 'kill', 'com.valvesoftware.Steam'], - timeout=15, check=False, capture_output=True, stderr=subprocess.DEVNULL, env=shutdown_env) + timeout=15, check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, env=shutdown_env) time.sleep(2) except Exception as e: logger.debug(f"flatpak kill failed: {e}") @@ -427,7 +436,8 @@ def robust_steam_restart(progress_callback: Optional[Callable[[str], None]] = No report("Failed to start Steam.") return False - # Wait for Steam to fully initialize using existing logic + # Wait for Steam to fully initialize + # CRITICAL: Use steamwebhelper (actual Steam process), not "steam" (matches steam-powerbuttond, etc.) report("Waiting for Steam to fully start") logger.info("Waiting up to 2 minutes for Steam to fully initialize...") max_startup_wait = 120 @@ -436,7 +446,8 @@ def robust_steam_restart(progress_callback: Optional[Callable[[str], None]] = No while elapsed_wait < max_startup_wait: try: - result = subprocess.run(['pgrep', '-f', 'steam'], capture_output=True, timeout=10, env=start_env) + # Use steamwebhelper for detection (matches shutdown logic) + result = subprocess.run(['pgrep', '-f', 'steamwebhelper'], capture_output=True, timeout=10, env=start_env) if result.returncode == 0: if not initial_wait_done: logger.info("Steam process detected. Waiting additional time for full initialization...") @@ -444,7 +455,7 @@ def robust_steam_restart(progress_callback: Optional[Callable[[str], None]] = No time.sleep(5) elapsed_wait += 5 if initial_wait_done and elapsed_wait >= 15: - final_check = subprocess.run(['pgrep', '-f', 'steam'], capture_output=True, timeout=10, env=start_env) + final_check = subprocess.run(['pgrep', '-f', 'steamwebhelper'], capture_output=True, timeout=10, env=start_env) if final_check.returncode == 0: report("Steam started successfully.") logger.info("Steam confirmed running after wait.") diff --git a/jackify/engine/Wabbajack.CLI.Builder.dll b/jackify/engine/Wabbajack.CLI.Builder.dll index 051a52b..36bab7d 100644 Binary files a/jackify/engine/Wabbajack.CLI.Builder.dll and b/jackify/engine/Wabbajack.CLI.Builder.dll differ diff --git a/jackify/engine/Wabbajack.Common.dll b/jackify/engine/Wabbajack.Common.dll index a49259e..4cb5299 100644 Binary files a/jackify/engine/Wabbajack.Common.dll and b/jackify/engine/Wabbajack.Common.dll differ diff --git a/jackify/engine/Wabbajack.Compiler.dll b/jackify/engine/Wabbajack.Compiler.dll index d47fed5..c2e4425 100644 Binary files a/jackify/engine/Wabbajack.Compiler.dll and b/jackify/engine/Wabbajack.Compiler.dll differ diff --git a/jackify/engine/Wabbajack.Compression.BSA.dll b/jackify/engine/Wabbajack.Compression.BSA.dll index 25ff1c5..f74bfa3 100644 Binary files a/jackify/engine/Wabbajack.Compression.BSA.dll and b/jackify/engine/Wabbajack.Compression.BSA.dll differ diff --git a/jackify/engine/Wabbajack.Compression.Zip.dll b/jackify/engine/Wabbajack.Compression.Zip.dll index 601184a..e43b4b9 100644 Binary files a/jackify/engine/Wabbajack.Compression.Zip.dll and b/jackify/engine/Wabbajack.Compression.Zip.dll differ diff --git a/jackify/engine/Wabbajack.Configuration.dll b/jackify/engine/Wabbajack.Configuration.dll index 31327ad..ef8cac9 100644 Binary files a/jackify/engine/Wabbajack.Configuration.dll and b/jackify/engine/Wabbajack.Configuration.dll differ diff --git a/jackify/engine/Wabbajack.DTOs.dll b/jackify/engine/Wabbajack.DTOs.dll index 7a4864b..2e6f766 100644 Binary files a/jackify/engine/Wabbajack.DTOs.dll and b/jackify/engine/Wabbajack.DTOs.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Bethesda.dll b/jackify/engine/Wabbajack.Downloaders.Bethesda.dll index fb8732b..2e753ec 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Bethesda.dll and b/jackify/engine/Wabbajack.Downloaders.Bethesda.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Dispatcher.dll b/jackify/engine/Wabbajack.Downloaders.Dispatcher.dll index ebd85f2..e6a7564 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Dispatcher.dll and b/jackify/engine/Wabbajack.Downloaders.Dispatcher.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.GameFile.dll b/jackify/engine/Wabbajack.Downloaders.GameFile.dll index 762f600..cb67b7b 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.GameFile.dll and b/jackify/engine/Wabbajack.Downloaders.GameFile.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.GoogleDrive.dll b/jackify/engine/Wabbajack.Downloaders.GoogleDrive.dll index 2fabfbf..47b40bb 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.GoogleDrive.dll and b/jackify/engine/Wabbajack.Downloaders.GoogleDrive.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Http.dll b/jackify/engine/Wabbajack.Downloaders.Http.dll index f13612a..46e2eae 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Http.dll and b/jackify/engine/Wabbajack.Downloaders.Http.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.IPS4OAuth2Downloader.dll b/jackify/engine/Wabbajack.Downloaders.IPS4OAuth2Downloader.dll index 0b78e4a..19d2e13 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.IPS4OAuth2Downloader.dll and b/jackify/engine/Wabbajack.Downloaders.IPS4OAuth2Downloader.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Interfaces.dll b/jackify/engine/Wabbajack.Downloaders.Interfaces.dll index 1fd0d74..8a339e7 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Interfaces.dll and b/jackify/engine/Wabbajack.Downloaders.Interfaces.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Manual.dll b/jackify/engine/Wabbajack.Downloaders.Manual.dll index 9858b78..c0bd050 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Manual.dll and b/jackify/engine/Wabbajack.Downloaders.Manual.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.MediaFire.dll b/jackify/engine/Wabbajack.Downloaders.MediaFire.dll index 2a14e88..9445433 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.MediaFire.dll and b/jackify/engine/Wabbajack.Downloaders.MediaFire.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Mega.dll b/jackify/engine/Wabbajack.Downloaders.Mega.dll index 2eea4c0..bbdeed2 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Mega.dll and b/jackify/engine/Wabbajack.Downloaders.Mega.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.ModDB.dll b/jackify/engine/Wabbajack.Downloaders.ModDB.dll index 2110715..8d5dd28 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.ModDB.dll and b/jackify/engine/Wabbajack.Downloaders.ModDB.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.Nexus.dll b/jackify/engine/Wabbajack.Downloaders.Nexus.dll index 949fde1..d5818ab 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.Nexus.dll and b/jackify/engine/Wabbajack.Downloaders.Nexus.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.VerificationCache.dll b/jackify/engine/Wabbajack.Downloaders.VerificationCache.dll index f23b873..d425d58 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.VerificationCache.dll and b/jackify/engine/Wabbajack.Downloaders.VerificationCache.dll differ diff --git a/jackify/engine/Wabbajack.Downloaders.WabbajackCDN.dll b/jackify/engine/Wabbajack.Downloaders.WabbajackCDN.dll index 50ad81f..928a01e 100644 Binary files a/jackify/engine/Wabbajack.Downloaders.WabbajackCDN.dll and b/jackify/engine/Wabbajack.Downloaders.WabbajackCDN.dll differ diff --git a/jackify/engine/Wabbajack.FileExtractor.dll b/jackify/engine/Wabbajack.FileExtractor.dll index 5b10df3..ad573dd 100644 Binary files a/jackify/engine/Wabbajack.FileExtractor.dll and b/jackify/engine/Wabbajack.FileExtractor.dll differ diff --git a/jackify/engine/Wabbajack.Hashing.PHash.dll b/jackify/engine/Wabbajack.Hashing.PHash.dll index fc663e9..91b305e 100644 Binary files a/jackify/engine/Wabbajack.Hashing.PHash.dll and b/jackify/engine/Wabbajack.Hashing.PHash.dll differ diff --git a/jackify/engine/Wabbajack.Hashing.xxHash64.dll b/jackify/engine/Wabbajack.Hashing.xxHash64.dll index 7df6d1f..fa7160d 100644 Binary files a/jackify/engine/Wabbajack.Hashing.xxHash64.dll and b/jackify/engine/Wabbajack.Hashing.xxHash64.dll differ diff --git a/jackify/engine/Wabbajack.IO.Async.dll b/jackify/engine/Wabbajack.IO.Async.dll index 83df54c..1f1b10b 100644 Binary files a/jackify/engine/Wabbajack.IO.Async.dll and b/jackify/engine/Wabbajack.IO.Async.dll differ diff --git a/jackify/engine/Wabbajack.Installer.dll b/jackify/engine/Wabbajack.Installer.dll index 0abac60..82d6b31 100644 Binary files a/jackify/engine/Wabbajack.Installer.dll and b/jackify/engine/Wabbajack.Installer.dll differ diff --git a/jackify/engine/Wabbajack.Networking.BethesdaNet.dll b/jackify/engine/Wabbajack.Networking.BethesdaNet.dll index 5fab10b..3313684 100644 Binary files a/jackify/engine/Wabbajack.Networking.BethesdaNet.dll and b/jackify/engine/Wabbajack.Networking.BethesdaNet.dll differ diff --git a/jackify/engine/Wabbajack.Networking.Discord.dll b/jackify/engine/Wabbajack.Networking.Discord.dll index ba04336..6767098 100644 Binary files a/jackify/engine/Wabbajack.Networking.Discord.dll and b/jackify/engine/Wabbajack.Networking.Discord.dll differ diff --git a/jackify/engine/Wabbajack.Networking.GitHub.dll b/jackify/engine/Wabbajack.Networking.GitHub.dll index d702dd0..de52168 100644 Binary files a/jackify/engine/Wabbajack.Networking.GitHub.dll and b/jackify/engine/Wabbajack.Networking.GitHub.dll differ diff --git a/jackify/engine/Wabbajack.Networking.Http.Interfaces.dll b/jackify/engine/Wabbajack.Networking.Http.Interfaces.dll index cb5574b..60327da 100644 Binary files a/jackify/engine/Wabbajack.Networking.Http.Interfaces.dll and b/jackify/engine/Wabbajack.Networking.Http.Interfaces.dll differ diff --git a/jackify/engine/Wabbajack.Networking.Http.dll b/jackify/engine/Wabbajack.Networking.Http.dll index f3d2050..8d56361 100644 Binary files a/jackify/engine/Wabbajack.Networking.Http.dll and b/jackify/engine/Wabbajack.Networking.Http.dll differ diff --git a/jackify/engine/Wabbajack.Networking.NexusApi.dll b/jackify/engine/Wabbajack.Networking.NexusApi.dll index 5b5de37..b9e53a6 100644 Binary files a/jackify/engine/Wabbajack.Networking.NexusApi.dll and b/jackify/engine/Wabbajack.Networking.NexusApi.dll differ diff --git a/jackify/engine/Wabbajack.Networking.WabbajackClientApi.dll b/jackify/engine/Wabbajack.Networking.WabbajackClientApi.dll index 512f33a..b9b31c1 100644 Binary files a/jackify/engine/Wabbajack.Networking.WabbajackClientApi.dll and b/jackify/engine/Wabbajack.Networking.WabbajackClientApi.dll differ diff --git a/jackify/engine/Wabbajack.Paths.IO.dll b/jackify/engine/Wabbajack.Paths.IO.dll index a5fe781..53eab63 100644 Binary files a/jackify/engine/Wabbajack.Paths.IO.dll and b/jackify/engine/Wabbajack.Paths.IO.dll differ diff --git a/jackify/engine/Wabbajack.Paths.dll b/jackify/engine/Wabbajack.Paths.dll index b55c435..055f6e8 100644 Binary files a/jackify/engine/Wabbajack.Paths.dll and b/jackify/engine/Wabbajack.Paths.dll differ diff --git a/jackify/engine/Wabbajack.RateLimiter.dll b/jackify/engine/Wabbajack.RateLimiter.dll index eb8773e..56ebd1b 100644 Binary files a/jackify/engine/Wabbajack.RateLimiter.dll and b/jackify/engine/Wabbajack.RateLimiter.dll differ diff --git a/jackify/engine/Wabbajack.Server.Lib.dll b/jackify/engine/Wabbajack.Server.Lib.dll index 2d191fe..f173139 100644 Binary files a/jackify/engine/Wabbajack.Server.Lib.dll and b/jackify/engine/Wabbajack.Server.Lib.dll differ diff --git a/jackify/engine/Wabbajack.Services.OSIntegrated.dll b/jackify/engine/Wabbajack.Services.OSIntegrated.dll index cf23f74..a45195f 100644 Binary files a/jackify/engine/Wabbajack.Services.OSIntegrated.dll and b/jackify/engine/Wabbajack.Services.OSIntegrated.dll differ diff --git a/jackify/engine/Wabbajack.VFS.Interfaces.dll b/jackify/engine/Wabbajack.VFS.Interfaces.dll index 479defa..d82d32e 100644 Binary files a/jackify/engine/Wabbajack.VFS.Interfaces.dll and b/jackify/engine/Wabbajack.VFS.Interfaces.dll differ diff --git a/jackify/engine/Wabbajack.VFS.dll b/jackify/engine/Wabbajack.VFS.dll index 8e943a7..25514da 100644 Binary files a/jackify/engine/Wabbajack.VFS.dll and b/jackify/engine/Wabbajack.VFS.dll differ diff --git a/jackify/engine/jackify-engine.deps.json b/jackify/engine/jackify-engine.deps.json index 18dde1e..bfb25f6 100644 --- a/jackify/engine/jackify-engine.deps.json +++ b/jackify/engine/jackify-engine.deps.json @@ -7,7 +7,7 @@ "targets": { ".NETCoreApp,Version=v8.0": {}, ".NETCoreApp,Version=v8.0/linux-x64": { - "jackify-engine/0.4.0": { + "jackify-engine/0.4.1": { "dependencies": { "Markdig": "0.40.0", "Microsoft.Extensions.Configuration.Json": "9.0.1", @@ -22,16 +22,16 @@ "SixLabors.ImageSharp": "3.1.6", "System.CommandLine": "2.0.0-beta4.22272.1", "System.CommandLine.NamingConventionBinder": "2.0.0-beta4.22272.1", - "Wabbajack.CLI.Builder": "0.4.0", - "Wabbajack.Downloaders.Bethesda": "0.4.0", - "Wabbajack.Downloaders.Dispatcher": "0.4.0", - "Wabbajack.Hashing.xxHash64": "0.4.0", - "Wabbajack.Networking.Discord": "0.4.0", - "Wabbajack.Networking.GitHub": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0", - "Wabbajack.Server.Lib": "0.4.0", - "Wabbajack.Services.OSIntegrated": "0.4.0", - "Wabbajack.VFS": "0.4.0", + "Wabbajack.CLI.Builder": "0.4.1", + "Wabbajack.Downloaders.Bethesda": "0.4.1", + "Wabbajack.Downloaders.Dispatcher": "0.4.1", + "Wabbajack.Hashing.xxHash64": "0.4.1", + "Wabbajack.Networking.Discord": "0.4.1", + "Wabbajack.Networking.GitHub": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1", + "Wabbajack.Server.Lib": "0.4.1", + "Wabbajack.Services.OSIntegrated": "0.4.1", + "Wabbajack.VFS": "0.4.1", "MegaApiClient": "1.0.0.0", "runtimepack.Microsoft.NETCore.App.Runtime.linux-x64": "8.0.21" }, @@ -1781,7 +1781,7 @@ } } }, - "Wabbajack.CLI.Builder/0.4.0": { + "Wabbajack.CLI.Builder/0.4.1": { "dependencies": { "Microsoft.Extensions.Configuration.Json": "9.0.1", "Microsoft.Extensions.DependencyInjection": "9.0.1", @@ -1791,109 +1791,109 @@ "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "System.CommandLine": "2.0.0-beta4.22272.1", "System.CommandLine.NamingConventionBinder": "2.0.0-beta4.22272.1", - "Wabbajack.Paths": "0.4.0" + "Wabbajack.Paths": "0.4.1" }, "runtime": { "Wabbajack.CLI.Builder.dll": {} } }, - "Wabbajack.Common/0.4.0": { + "Wabbajack.Common/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "System.Reactive": "6.0.1", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Networking.Http": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0" + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Networking.Http": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1" }, "runtime": { "Wabbajack.Common.dll": {} } }, - "Wabbajack.Compiler/0.4.0": { + "Wabbajack.Compiler/0.4.1": { "dependencies": { "F23.StringSimilarity": "6.0.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Downloaders.Dispatcher": "0.4.0", - "Wabbajack.Installer": "0.4.0", - "Wabbajack.VFS": "0.4.0", + "Wabbajack.Downloaders.Dispatcher": "0.4.1", + "Wabbajack.Installer": "0.4.1", + "Wabbajack.VFS": "0.4.1", "ini-parser-netstandard": "2.5.2" }, "runtime": { "Wabbajack.Compiler.dll": {} } }, - "Wabbajack.Compression.BSA/0.4.0": { + "Wabbajack.Compression.BSA/0.4.1": { "dependencies": { "K4os.Compression.LZ4.Streams": "1.3.8", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "SharpZipLib": "1.4.2", - "Wabbajack.Common": "0.4.0", - "Wabbajack.DTOs": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.DTOs": "0.4.1" }, "runtime": { "Wabbajack.Compression.BSA.dll": {} } }, - "Wabbajack.Compression.Zip/0.4.0": { + "Wabbajack.Compression.Zip/0.4.1": { "dependencies": { - "Wabbajack.IO.Async": "0.4.0" + "Wabbajack.IO.Async": "0.4.1" }, "runtime": { "Wabbajack.Compression.Zip.dll": {} } }, - "Wabbajack.Configuration/0.4.0": { + "Wabbajack.Configuration/0.4.1": { "runtime": { "Wabbajack.Configuration.dll": {} } }, - "Wabbajack.Downloaders.Bethesda/0.4.0": { + "Wabbajack.Downloaders.Bethesda/0.4.1": { "dependencies": { "LibAES-CTR": "1.1.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "SharpZipLib": "1.4.2", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Networking.BethesdaNet": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Networking.BethesdaNet": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.Bethesda.dll": {} } }, - "Wabbajack.Downloaders.Dispatcher/0.4.0": { + "Wabbajack.Downloaders.Dispatcher/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Downloaders.Bethesda": "0.4.0", - "Wabbajack.Downloaders.GameFile": "0.4.0", - "Wabbajack.Downloaders.GoogleDrive": "0.4.0", - "Wabbajack.Downloaders.Http": "0.4.0", - "Wabbajack.Downloaders.IPS4OAuth2Downloader": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Downloaders.Manual": "0.4.0", - "Wabbajack.Downloaders.MediaFire": "0.4.0", - "Wabbajack.Downloaders.Mega": "0.4.0", - "Wabbajack.Downloaders.ModDB": "0.4.0", - "Wabbajack.Downloaders.Nexus": "0.4.0", - "Wabbajack.Downloaders.VerificationCache": "0.4.0", - "Wabbajack.Downloaders.WabbajackCDN": "0.4.0", - "Wabbajack.Networking.WabbajackClientApi": "0.4.0" + "Wabbajack.Downloaders.Bethesda": "0.4.1", + "Wabbajack.Downloaders.GameFile": "0.4.1", + "Wabbajack.Downloaders.GoogleDrive": "0.4.1", + "Wabbajack.Downloaders.Http": "0.4.1", + "Wabbajack.Downloaders.IPS4OAuth2Downloader": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Downloaders.Manual": "0.4.1", + "Wabbajack.Downloaders.MediaFire": "0.4.1", + "Wabbajack.Downloaders.Mega": "0.4.1", + "Wabbajack.Downloaders.ModDB": "0.4.1", + "Wabbajack.Downloaders.Nexus": "0.4.1", + "Wabbajack.Downloaders.VerificationCache": "0.4.1", + "Wabbajack.Downloaders.WabbajackCDN": "0.4.1", + "Wabbajack.Networking.WabbajackClientApi": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.Dispatcher.dll": {} } }, - "Wabbajack.Downloaders.GameFile/0.4.0": { + "Wabbajack.Downloaders.GameFile/0.4.1": { "dependencies": { "GameFinder.StoreHandlers.EADesktop": "4.5.0", "GameFinder.StoreHandlers.EGS": "4.5.0", @@ -1903,360 +1903,360 @@ "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.VFS": "0.4.0" + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.VFS": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.GameFile.dll": {} } }, - "Wabbajack.Downloaders.GoogleDrive/0.4.0": { + "Wabbajack.Downloaders.GoogleDrive/0.4.1": { "dependencies": { "HtmlAgilityPack": "1.11.72", "Microsoft.AspNetCore.Http.Extensions": "2.3.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.4.0", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Networking.Http": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Networking.Http": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.GoogleDrive.dll": {} } }, - "Wabbajack.Downloaders.Http/0.4.0": { + "Wabbajack.Downloaders.Http/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.4.0", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Networking.BethesdaNet": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Networking.BethesdaNet": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.Http.dll": {} } }, - "Wabbajack.Downloaders.Interfaces/0.4.0": { + "Wabbajack.Downloaders.Interfaces/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.Compression.Zip": "0.4.0", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0" + "Wabbajack.Compression.Zip": "0.4.1", + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.Interfaces.dll": {} } }, - "Wabbajack.Downloaders.IPS4OAuth2Downloader/0.4.0": { + "Wabbajack.Downloaders.IPS4OAuth2Downloader/0.4.1": { "dependencies": { "F23.StringSimilarity": "6.0.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Networking.Http": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Networking.Http": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.IPS4OAuth2Downloader.dll": {} } }, - "Wabbajack.Downloaders.Manual/0.4.0": { + "Wabbajack.Downloaders.Manual/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.Manual.dll": {} } }, - "Wabbajack.Downloaders.MediaFire/0.4.0": { + "Wabbajack.Downloaders.MediaFire/0.4.1": { "dependencies": { "HtmlAgilityPack": "1.11.72", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.MediaFire.dll": {} } }, - "Wabbajack.Downloaders.Mega/0.4.0": { + "Wabbajack.Downloaders.Mega/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.Mega.dll": {} } }, - "Wabbajack.Downloaders.ModDB/0.4.0": { + "Wabbajack.Downloaders.ModDB/0.4.1": { "dependencies": { "HtmlAgilityPack": "1.11.72", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Networking.Http": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Networking.Http": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.ModDB.dll": {} } }, - "Wabbajack.Downloaders.Nexus/0.4.0": { + "Wabbajack.Downloaders.Nexus/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Hashing.xxHash64": "0.4.0", - "Wabbajack.Networking.Http": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0", - "Wabbajack.Networking.NexusApi": "0.4.0", - "Wabbajack.Paths": "0.4.0" + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Hashing.xxHash64": "0.4.1", + "Wabbajack.Networking.Http": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1", + "Wabbajack.Networking.NexusApi": "0.4.1", + "Wabbajack.Paths": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.Nexus.dll": {} } }, - "Wabbajack.Downloaders.VerificationCache/0.4.0": { + "Wabbajack.Downloaders.VerificationCache/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Stub.System.Data.SQLite.Core.NetStandard": "1.0.119", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0" + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.VerificationCache.dll": {} } }, - "Wabbajack.Downloaders.WabbajackCDN/0.4.0": { + "Wabbajack.Downloaders.WabbajackCDN/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Microsoft.Toolkit.HighPerformance": "7.1.2", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Networking.Http": "0.4.0", - "Wabbajack.RateLimiter": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Networking.Http": "0.4.1", + "Wabbajack.RateLimiter": "0.4.1" }, "runtime": { "Wabbajack.Downloaders.WabbajackCDN.dll": {} } }, - "Wabbajack.DTOs/0.4.0": { + "Wabbajack.DTOs/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.Hashing.xxHash64": "0.4.0", - "Wabbajack.Paths": "0.4.0" + "Wabbajack.Hashing.xxHash64": "0.4.1", + "Wabbajack.Paths": "0.4.1" }, "runtime": { "Wabbajack.DTOs.dll": {} } }, - "Wabbajack.FileExtractor/0.4.0": { + "Wabbajack.FileExtractor/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "OMODFramework": "3.0.1", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Compression.BSA": "0.4.0", - "Wabbajack.Hashing.PHash": "0.4.0", - "Wabbajack.Paths": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Compression.BSA": "0.4.1", + "Wabbajack.Hashing.PHash": "0.4.1", + "Wabbajack.Paths": "0.4.1" }, "runtime": { "Wabbajack.FileExtractor.dll": {} } }, - "Wabbajack.Hashing.PHash/0.4.0": { + "Wabbajack.Hashing.PHash/0.4.1": { "dependencies": { "BCnEncoder.Net.ImageSharp": "1.1.1", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Shipwreck.Phash": "0.5.0", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Common": "0.4.0", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Paths": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Paths": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1" }, "runtime": { "Wabbajack.Hashing.PHash.dll": {} } }, - "Wabbajack.Hashing.xxHash64/0.4.0": { + "Wabbajack.Hashing.xxHash64/0.4.1": { "dependencies": { - "Wabbajack.Paths": "0.4.0", - "Wabbajack.RateLimiter": "0.4.0" + "Wabbajack.Paths": "0.4.1", + "Wabbajack.RateLimiter": "0.4.1" }, "runtime": { "Wabbajack.Hashing.xxHash64.dll": {} } }, - "Wabbajack.Installer/0.4.0": { + "Wabbajack.Installer/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", "Octopus.Octodiff": "2.0.548", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Downloaders.Dispatcher": "0.4.0", - "Wabbajack.Downloaders.GameFile": "0.4.0", - "Wabbajack.FileExtractor": "0.4.0", - "Wabbajack.Networking.WabbajackClientApi": "0.4.0", - "Wabbajack.Paths": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0", - "Wabbajack.VFS": "0.4.0", + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Downloaders.Dispatcher": "0.4.1", + "Wabbajack.Downloaders.GameFile": "0.4.1", + "Wabbajack.FileExtractor": "0.4.1", + "Wabbajack.Networking.WabbajackClientApi": "0.4.1", + "Wabbajack.Paths": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1", + "Wabbajack.VFS": "0.4.1", "ini-parser-netstandard": "2.5.2" }, "runtime": { "Wabbajack.Installer.dll": {} } }, - "Wabbajack.IO.Async/0.4.0": { + "Wabbajack.IO.Async/0.4.1": { "runtime": { "Wabbajack.IO.Async.dll": {} } }, - "Wabbajack.Networking.BethesdaNet/0.4.0": { + "Wabbajack.Networking.BethesdaNet/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Networking.Http": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0" + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Networking.Http": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.Networking.BethesdaNet.dll": {} } }, - "Wabbajack.Networking.Discord/0.4.0": { + "Wabbajack.Networking.Discord/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.Networking.Http.Interfaces": "0.4.0" + "Wabbajack.Networking.Http.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.Networking.Discord.dll": {} } }, - "Wabbajack.Networking.GitHub/0.4.0": { + "Wabbajack.Networking.GitHub/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Octokit": "14.0.0", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0" + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.Networking.GitHub.dll": {} } }, - "Wabbajack.Networking.Http/0.4.0": { + "Wabbajack.Networking.Http/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Http": "9.0.1", "Microsoft.Extensions.Logging": "9.0.1", - "Wabbajack.Configuration": "0.4.0", - "Wabbajack.Downloaders.Interfaces": "0.4.0", - "Wabbajack.Hashing.xxHash64": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0", - "Wabbajack.Paths": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0" + "Wabbajack.Configuration": "0.4.1", + "Wabbajack.Downloaders.Interfaces": "0.4.1", + "Wabbajack.Hashing.xxHash64": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1", + "Wabbajack.Paths": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1" }, "runtime": { "Wabbajack.Networking.Http.dll": {} } }, - "Wabbajack.Networking.Http.Interfaces/0.4.0": { + "Wabbajack.Networking.Http.Interfaces/0.4.1": { "dependencies": { - "Wabbajack.Hashing.xxHash64": "0.4.0" + "Wabbajack.Hashing.xxHash64": "0.4.1" }, "runtime": { "Wabbajack.Networking.Http.Interfaces.dll": {} } }, - "Wabbajack.Networking.NexusApi/0.4.0": { + "Wabbajack.Networking.NexusApi/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Networking.Http": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0", - "Wabbajack.Networking.WabbajackClientApi": "0.4.0" + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Networking.Http": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1", + "Wabbajack.Networking.WabbajackClientApi": "0.4.1" }, "runtime": { "Wabbajack.Networking.NexusApi.dll": {} } }, - "Wabbajack.Networking.WabbajackClientApi/0.4.0": { + "Wabbajack.Networking.WabbajackClientApi/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "Octokit": "14.0.0", - "Wabbajack.Common": "0.4.0", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0", - "Wabbajack.VFS.Interfaces": "0.4.0", + "Wabbajack.Common": "0.4.1", + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1", + "Wabbajack.VFS.Interfaces": "0.4.1", "YamlDotNet": "16.3.0" }, "runtime": { "Wabbajack.Networking.WabbajackClientApi.dll": {} } }, - "Wabbajack.Paths/0.4.0": { + "Wabbajack.Paths/0.4.1": { "runtime": { "Wabbajack.Paths.dll": {} } }, - "Wabbajack.Paths.IO/0.4.0": { + "Wabbajack.Paths.IO/0.4.1": { "dependencies": { - "Wabbajack.Paths": "0.4.0", + "Wabbajack.Paths": "0.4.1", "shortid": "4.0.0" }, "runtime": { "Wabbajack.Paths.IO.dll": {} } }, - "Wabbajack.RateLimiter/0.4.0": { + "Wabbajack.RateLimiter/0.4.1": { "runtime": { "Wabbajack.RateLimiter.dll": {} } }, - "Wabbajack.Server.Lib/0.4.0": { + "Wabbajack.Server.Lib/0.4.1": { "dependencies": { "FluentFTP": "52.0.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", @@ -2264,58 +2264,58 @@ "Nettle": "3.0.0", "Newtonsoft.Json": "13.0.3", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Common": "0.4.0", - "Wabbajack.Networking.Http.Interfaces": "0.4.0", - "Wabbajack.Services.OSIntegrated": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.Networking.Http.Interfaces": "0.4.1", + "Wabbajack.Services.OSIntegrated": "0.4.1" }, "runtime": { "Wabbajack.Server.Lib.dll": {} } }, - "Wabbajack.Services.OSIntegrated/0.4.0": { + "Wabbajack.Services.OSIntegrated/0.4.1": { "dependencies": { "DeviceId": "6.8.0", "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Newtonsoft.Json": "13.0.3", "SixLabors.ImageSharp": "3.1.6", - "Wabbajack.Compiler": "0.4.0", - "Wabbajack.Downloaders.Dispatcher": "0.4.0", - "Wabbajack.Installer": "0.4.0", - "Wabbajack.Networking.BethesdaNet": "0.4.0", - "Wabbajack.Networking.Discord": "0.4.0", - "Wabbajack.VFS": "0.4.0" + "Wabbajack.Compiler": "0.4.1", + "Wabbajack.Downloaders.Dispatcher": "0.4.1", + "Wabbajack.Installer": "0.4.1", + "Wabbajack.Networking.BethesdaNet": "0.4.1", + "Wabbajack.Networking.Discord": "0.4.1", + "Wabbajack.VFS": "0.4.1" }, "runtime": { "Wabbajack.Services.OSIntegrated.dll": {} } }, - "Wabbajack.VFS/0.4.0": { + "Wabbajack.VFS/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", "Microsoft.Extensions.Logging.Abstractions": "9.0.1", "SixLabors.ImageSharp": "3.1.6", "System.Data.SQLite.Core": "1.0.119", - "Wabbajack.Common": "0.4.0", - "Wabbajack.FileExtractor": "0.4.0", - "Wabbajack.Hashing.PHash": "0.4.0", - "Wabbajack.Hashing.xxHash64": "0.4.0", - "Wabbajack.Paths": "0.4.0", - "Wabbajack.Paths.IO": "0.4.0", - "Wabbajack.VFS.Interfaces": "0.4.0" + "Wabbajack.Common": "0.4.1", + "Wabbajack.FileExtractor": "0.4.1", + "Wabbajack.Hashing.PHash": "0.4.1", + "Wabbajack.Hashing.xxHash64": "0.4.1", + "Wabbajack.Paths": "0.4.1", + "Wabbajack.Paths.IO": "0.4.1", + "Wabbajack.VFS.Interfaces": "0.4.1" }, "runtime": { "Wabbajack.VFS.dll": {} } }, - "Wabbajack.VFS.Interfaces/0.4.0": { + "Wabbajack.VFS.Interfaces/0.4.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection": "9.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1", - "Wabbajack.DTOs": "0.4.0", - "Wabbajack.Hashing.xxHash64": "0.4.0", - "Wabbajack.Paths": "0.4.0" + "Wabbajack.DTOs": "0.4.1", + "Wabbajack.Hashing.xxHash64": "0.4.1", + "Wabbajack.Paths": "0.4.1" }, "runtime": { "Wabbajack.VFS.Interfaces.dll": {} @@ -2332,7 +2332,7 @@ } }, "libraries": { - "jackify-engine/0.4.0": { + "jackify-engine/0.4.1": { "type": "project", "serviceable": false, "sha512": "" @@ -3021,202 +3021,202 @@ "path": "yamldotnet/16.3.0", "hashPath": "yamldotnet.16.3.0.nupkg.sha512" }, - "Wabbajack.CLI.Builder/0.4.0": { + "Wabbajack.CLI.Builder/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Common/0.4.0": { + "Wabbajack.Common/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Compiler/0.4.0": { + "Wabbajack.Compiler/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Compression.BSA/0.4.0": { + "Wabbajack.Compression.BSA/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Compression.Zip/0.4.0": { + "Wabbajack.Compression.Zip/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Configuration/0.4.0": { + "Wabbajack.Configuration/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Bethesda/0.4.0": { + "Wabbajack.Downloaders.Bethesda/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Dispatcher/0.4.0": { + "Wabbajack.Downloaders.Dispatcher/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.GameFile/0.4.0": { + "Wabbajack.Downloaders.GameFile/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.GoogleDrive/0.4.0": { + "Wabbajack.Downloaders.GoogleDrive/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Http/0.4.0": { + "Wabbajack.Downloaders.Http/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Interfaces/0.4.0": { + "Wabbajack.Downloaders.Interfaces/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.IPS4OAuth2Downloader/0.4.0": { + "Wabbajack.Downloaders.IPS4OAuth2Downloader/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Manual/0.4.0": { + "Wabbajack.Downloaders.Manual/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.MediaFire/0.4.0": { + "Wabbajack.Downloaders.MediaFire/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Mega/0.4.0": { + "Wabbajack.Downloaders.Mega/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.ModDB/0.4.0": { + "Wabbajack.Downloaders.ModDB/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.Nexus/0.4.0": { + "Wabbajack.Downloaders.Nexus/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.VerificationCache/0.4.0": { + "Wabbajack.Downloaders.VerificationCache/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Downloaders.WabbajackCDN/0.4.0": { + "Wabbajack.Downloaders.WabbajackCDN/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.DTOs/0.4.0": { + "Wabbajack.DTOs/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.FileExtractor/0.4.0": { + "Wabbajack.FileExtractor/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Hashing.PHash/0.4.0": { + "Wabbajack.Hashing.PHash/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Hashing.xxHash64/0.4.0": { + "Wabbajack.Hashing.xxHash64/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Installer/0.4.0": { + "Wabbajack.Installer/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.IO.Async/0.4.0": { + "Wabbajack.IO.Async/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.BethesdaNet/0.4.0": { + "Wabbajack.Networking.BethesdaNet/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.Discord/0.4.0": { + "Wabbajack.Networking.Discord/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.GitHub/0.4.0": { + "Wabbajack.Networking.GitHub/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.Http/0.4.0": { + "Wabbajack.Networking.Http/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.Http.Interfaces/0.4.0": { + "Wabbajack.Networking.Http.Interfaces/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.NexusApi/0.4.0": { + "Wabbajack.Networking.NexusApi/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Networking.WabbajackClientApi/0.4.0": { + "Wabbajack.Networking.WabbajackClientApi/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Paths/0.4.0": { + "Wabbajack.Paths/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Paths.IO/0.4.0": { + "Wabbajack.Paths.IO/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.RateLimiter/0.4.0": { + "Wabbajack.RateLimiter/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Server.Lib/0.4.0": { + "Wabbajack.Server.Lib/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.Services.OSIntegrated/0.4.0": { + "Wabbajack.Services.OSIntegrated/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.VFS/0.4.0": { + "Wabbajack.VFS/0.4.1": { "type": "project", "serviceable": false, "sha512": "" }, - "Wabbajack.VFS.Interfaces/0.4.0": { + "Wabbajack.VFS.Interfaces/0.4.1": { "type": "project", "serviceable": false, "sha512": "" @@ -3264,7 +3264,7 @@ "any", "base" ], - "fedora.42-x64": [ + "fedora.43-x64": [ "linux-x64", "linux", "unix-x64", diff --git a/jackify/engine/jackify-engine.dll b/jackify/engine/jackify-engine.dll index 95fb394..41cb347 100644 Binary files a/jackify/engine/jackify-engine.dll and b/jackify/engine/jackify-engine.dll differ diff --git a/jackify/frontends/gui/dialogs/about_dialog.py b/jackify/frontends/gui/dialogs/about_dialog.py index 5012c70..cfda211 100644 --- a/jackify/frontends/gui/dialogs/about_dialog.py +++ b/jackify/frontends/gui/dialogs/about_dialog.py @@ -379,18 +379,44 @@ Python: {platform.python_version()}""" def open_github(self): """Open GitHub repository.""" try: - import webbrowser - webbrowser.open("https://github.com/Omni-guides/Jackify") + self._open_url("https://github.com/Omni-guides/Jackify") except Exception as e: logger.error(f"Error opening GitHub: {e}") - + def open_nexus(self): """Open Nexus Mods page.""" try: - import webbrowser - webbrowser.open("https://www.nexusmods.com/site/mods/1427") + self._open_url("https://www.nexusmods.com/site/mods/1427") except Exception as e: logger.error(f"Error opening Nexus: {e}") + + def _open_url(self, url: str): + """Open URL with clean environment to avoid AppImage library conflicts.""" + import os + + env = os.environ.copy() + + # Remove AppImage-specific environment variables + appimage_vars = [ + 'LD_LIBRARY_PATH', + 'PYTHONPATH', + 'PYTHONHOME', + 'QT_PLUGIN_PATH', + 'QML2_IMPORT_PATH', + ] + + if 'APPIMAGE' in env or 'APPDIR' in env: + for var in appimage_vars: + if var in env: + del env[var] + + subprocess.Popen( + ['xdg-open', url], + env=env, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + start_new_session=True + ) def closeEvent(self, event): """Handle dialog close event.""" diff --git a/jackify/frontends/gui/main.py b/jackify/frontends/gui/main.py index 146cd8f..3ee8eb0 100644 --- a/jackify/frontends/gui/main.py +++ b/jackify/frontends/gui/main.py @@ -101,7 +101,7 @@ src_dir = Path(__file__).parent.parent.parent.parent sys.path.insert(0, str(src_dir)) from PySide6.QtWidgets import ( - QSizePolicy, + QSizePolicy, QScrollArea, QApplication, QMainWindow, QWidget, QLabel, QVBoxLayout, QPushButton, QStackedWidget, QHBoxLayout, QDialog, QFormLayout, QLineEdit, QCheckBox, QSpinBox, QMessageBox, QGroupBox, QGridLayout, QFileDialog, QToolButton, QStyle, QComboBox, QTabWidget, QRadioButton, QButtonGroup ) @@ -171,8 +171,8 @@ class SettingsDialog(QDialog): self._original_debug_mode = self.config_handler.get('debug_mode', False) self.setWindowTitle("Settings") self.setModal(True) - self.setMinimumWidth(650) # Reduced width for Steam Deck compatibility - self.setMaximumWidth(800) # Maximum width to prevent excessive stretching + self.setMinimumWidth(650) + self.setMaximumWidth(800) self.setStyleSheet("QDialog { background-color: #232323; color: #eee; } QPushButton:hover { background-color: #333; }") main_layout = QVBoxLayout() @@ -420,69 +420,119 @@ class SettingsDialog(QDialog): resource_group = QGroupBox("Resource Limits") resource_group.setStyleSheet("QGroupBox { border: 1px solid #555; border-radius: 6px; margin-top: 8px; padding: 8px; background: #23282d; } QGroupBox:title { subcontrol-origin: margin; left: 10px; padding: 0 3px 0 3px; font-weight: bold; color: #fff; }") - resource_layout = QGridLayout() - resource_group.setLayout(resource_layout) - resource_layout.setVerticalSpacing(4) - resource_layout.setHorizontalSpacing(8) - resource_layout.addWidget(self._bold_label("Resource"), 0, 0, 1, 1, Qt.AlignLeft) - resource_layout.addWidget(self._bold_label("Max Tasks"), 0, 1, 1, 1, Qt.AlignLeft) + resource_outer_layout = QVBoxLayout() + resource_group.setLayout(resource_outer_layout) + self.resource_settings_path = os.path.expanduser("~/.config/jackify/resource_settings.json") self.resource_settings = self._load_json(self.resource_settings_path) self.resource_edits = {} - resource_row_index = 0 - for resource_row_index, (k, v) in enumerate(self.resource_settings.items(), start=1): - try: - # Create resource label - resource_layout.addWidget(QLabel(f"{k}:", parent=self), resource_row_index, 0, 1, 1, Qt.AlignLeft) - - max_tasks_spin = QSpinBox() - max_tasks_spin.setMinimum(1) - max_tasks_spin.setMaximum(128) - max_tasks_spin.setValue(v.get('MaxTasks', 16)) - max_tasks_spin.setToolTip("Maximum number of concurrent tasks for this resource.") - max_tasks_spin.setFixedWidth(160) - resource_layout.addWidget(max_tasks_spin, resource_row_index, 1) - - # Store the widgets - self.resource_edits[k] = (None, max_tasks_spin) - except Exception as e: - print(f"[ERROR] Failed to create widgets for resource '{k}': {e}") - continue # If no resources exist, show helpful message - if not self.resource_edits: + if not self.resource_settings: info_label = QLabel("Resource Limit settings will be generated once a modlist install action is performed") info_label.setStyleSheet("color: #aaa; font-style: italic; padding: 20px; font-size: 11pt;") info_label.setWordWrap(True) info_label.setAlignment(Qt.AlignCenter) - info_label.setMinimumHeight(60) # Ensure enough height to prevent cutoff - resource_layout.addWidget(info_label, 1, 0, 3, 2) # Span more rows for better space - - # Bandwidth limiter row (only show if Downloads resource exists) - if "Downloads" in self.resource_settings: - downloads_throughput_bytes = self.resource_settings["Downloads"].get("MaxThroughput", 0) - # Convert bytes/s to KB/s for display - downloads_throughput_kb = downloads_throughput_bytes // 1024 if downloads_throughput_bytes > 0 else 0 - - self.bandwidth_spin = QSpinBox() - self.bandwidth_spin.setMinimum(0) - self.bandwidth_spin.setMaximum(1000000) - self.bandwidth_spin.setValue(downloads_throughput_kb) - self.bandwidth_spin.setSuffix(" KB/s") - self.bandwidth_spin.setFixedWidth(160) - self.bandwidth_spin.setToolTip("Set the maximum download speed for modlist downloads. 0 = unlimited.") - bandwidth_note = QLabel("(0 = unlimited)") - bandwidth_note.setStyleSheet("color: #aaa; font-size: 10pt;") - # Create horizontal layout for bandwidth row - bandwidth_row = QHBoxLayout() - bandwidth_row.addWidget(self.bandwidth_spin) - bandwidth_row.addWidget(bandwidth_note) - bandwidth_row.addStretch() # Push to the left - - resource_layout.addWidget(QLabel("Bandwidth Limit:", parent=self), resource_row_index+1, 0, 1, 1, Qt.AlignLeft) - resource_layout.addLayout(bandwidth_row, resource_row_index+1, 1) + info_label.setMinimumHeight(60) + resource_outer_layout.addWidget(info_label) else: - self.bandwidth_spin = None # No bandwidth UI if Downloads resource doesn't exist + # Two-column layout for better space usage + # Use a single grid with proper column spacing + resource_grid = QGridLayout() + resource_grid.setVerticalSpacing(4) + resource_grid.setHorizontalSpacing(8) + resource_grid.setColumnMinimumWidth(2, 40) # Spacing between columns + + # Headers for left column (columns 0-1) + resource_grid.addWidget(self._bold_label("Resource"), 0, 0, 1, 1, Qt.AlignLeft) + resource_grid.addWidget(self._bold_label("Max Tasks"), 0, 1, 1, 1, Qt.AlignLeft) + + # Headers for right column (columns 3-4, skip column 2 for spacing) + resource_grid.addWidget(self._bold_label("Resource"), 0, 3, 1, 1, Qt.AlignLeft) + resource_grid.addWidget(self._bold_label("Max Tasks"), 0, 4, 1, 1, Qt.AlignLeft) + + # Split resources between left and right columns (4 + 4) + resource_items = list(self.resource_settings.items()) + + # Find Bandwidth info from Downloads resource if it exists + bandwidth_kb = 0 + if "Downloads" in self.resource_settings: + downloads_throughput_bytes = self.resource_settings["Downloads"].get("MaxThroughput", 0) + bandwidth_kb = downloads_throughput_bytes // 1024 if downloads_throughput_bytes > 0 else 0 + + # Left column gets first 4 resources (columns 0-1) + left_row = 1 + for k, v in resource_items[:4]: + try: + resource_grid.addWidget(QLabel(f"{k}:", parent=self), left_row, 0, 1, 1, Qt.AlignLeft) + + max_tasks_spin = QSpinBox() + max_tasks_spin.setMinimum(1) + max_tasks_spin.setMaximum(128) + max_tasks_spin.setValue(v.get('MaxTasks', 16)) + max_tasks_spin.setToolTip("Maximum number of concurrent tasks for this resource.") + max_tasks_spin.setFixedWidth(100) + resource_grid.addWidget(max_tasks_spin, left_row, 1) + + self.resource_edits[k] = (None, max_tasks_spin) + left_row += 1 + except Exception as e: + print(f"[ERROR] Failed to create widgets for resource '{k}': {e}") + continue + + # Right column gets next 4 resources (columns 3-4, skip column 2 for spacing) + right_row = 1 + for k, v in resource_items[4:]: + try: + resource_grid.addWidget(QLabel(f"{k}:", parent=self), right_row, 3, 1, 1, Qt.AlignLeft) + + max_tasks_spin = QSpinBox() + max_tasks_spin.setMinimum(1) + max_tasks_spin.setMaximum(128) + max_tasks_spin.setValue(v.get('MaxTasks', 16)) + max_tasks_spin.setToolTip("Maximum number of concurrent tasks for this resource.") + max_tasks_spin.setFixedWidth(100) + resource_grid.addWidget(max_tasks_spin, right_row, 4) + + self.resource_edits[k] = (None, max_tasks_spin) + right_row += 1 + except Exception as e: + print(f"[ERROR] Failed to create widgets for resource '{k}': {e}") + continue + + # Add Bandwidth Limit at the bottom of right column + if "Downloads" in self.resource_settings: + resource_grid.addWidget(QLabel("Bandwidth Limit:", parent=self), right_row, 3, 1, 1, Qt.AlignLeft) + + self.bandwidth_spin = QSpinBox() + self.bandwidth_spin.setMinimum(0) + self.bandwidth_spin.setMaximum(1000000) + self.bandwidth_spin.setValue(bandwidth_kb) + self.bandwidth_spin.setSuffix(" KB/s") + self.bandwidth_spin.setFixedWidth(100) + self.bandwidth_spin.setToolTip("Set the maximum download speed for modlist downloads. 0 = unlimited.") + + # Create a layout for the spinbox and note + bandwidth_widget_layout = QHBoxLayout() + bandwidth_widget_layout.setContentsMargins(0, 0, 0, 0) + bandwidth_widget_layout.addWidget(self.bandwidth_spin) + + bandwidth_note = QLabel("(0 = unlimited)") + bandwidth_note.setStyleSheet("color: #aaa; font-size: 9pt;") + bandwidth_widget_layout.addWidget(bandwidth_note) + bandwidth_widget_layout.addStretch() + + # Create container widget for the layout + bandwidth_container = QWidget() + bandwidth_container.setLayout(bandwidth_widget_layout) + resource_grid.addWidget(bandwidth_container, right_row, 4, 1, 1, Qt.AlignLeft) + else: + self.bandwidth_spin = None + + # Add stretch column at the end to push content left + resource_grid.setColumnStretch(5, 1) + + resource_outer_layout.addLayout(resource_grid) advanced_layout.addWidget(resource_group) @@ -1358,10 +1408,11 @@ class JackifyMainWindow(QMainWindow): bottom_bar_layout.addStretch(1) # Ko-Fi support link (center) - kofi_link = QLabel('♥ Support on Ko-fi') + kofi_link = QLabel('♥ Support on Ko-fi') kofi_link.setStyleSheet("color: #72A5F2; font-size: 13px;") kofi_link.setTextInteractionFlags(Qt.TextBrowserInteraction) - kofi_link.setOpenExternalLinks(True) + kofi_link.setOpenExternalLinks(False) + kofi_link.linkActivated.connect(lambda: self._open_url("https://ko-fi.com/omni1")) kofi_link.setToolTip("Support Jackify development") bottom_bar_layout.addWidget(kofi_link, alignment=Qt.AlignCenter) @@ -1629,6 +1680,35 @@ class JackifyMainWindow(QMainWindow): import traceback traceback.print_exc() + def _open_url(self, url: str): + """Open URL with clean environment to avoid AppImage library conflicts.""" + import subprocess + import os + + env = os.environ.copy() + + # Remove AppImage-specific environment variables + appimage_vars = [ + 'LD_LIBRARY_PATH', + 'PYTHONPATH', + 'PYTHONHOME', + 'QT_PLUGIN_PATH', + 'QML2_IMPORT_PATH', + ] + + if 'APPIMAGE' in env or 'APPDIR' in env: + for var in appimage_vars: + if var in env: + del env[var] + + subprocess.Popen( + ['xdg-open', url], + env=env, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + start_new_session=True + ) + def _on_child_resize_request(self, mode: str): """ Handle child screen resize requests (expand/collapse console). @@ -1761,6 +1841,20 @@ def resource_path(relative_path): def main(): """Main entry point for the GUI application""" + # CRITICAL: Enable faulthandler for segfault debugging + # This will print Python stack traces on segfault + import faulthandler + import signal + # Enable faulthandler to both stderr and file + try: + log_dir = Path.home() / '.local' / 'share' / 'jackify' / 'logs' + log_dir.mkdir(parents=True, exist_ok=True) + trace_file = open(log_dir / 'segfault_trace.txt', 'w') + faulthandler.enable(file=trace_file, all_threads=True) + except Exception: + # Fallback to stderr only if file can't be opened + faulthandler.enable(all_threads=True) + # Check for CLI mode argument if len(sys.argv) > 1 and '--cli' in sys.argv: # Launch CLI frontend instead of GUI diff --git a/jackify/frontends/gui/screens/install_modlist.py b/jackify/frontends/gui/screens/install_modlist.py index 5e0360d..12c76e1 100644 --- a/jackify/frontends/gui/screens/install_modlist.py +++ b/jackify/frontends/gui/screens/install_modlist.py @@ -1,7 +1,7 @@ """ InstallModlistScreen for Jackify GUI """ -from PySide6.QtWidgets import QWidget, QVBoxLayout, QLabel, QComboBox, QHBoxLayout, QLineEdit, QPushButton, QGridLayout, QFileDialog, QTextEdit, QSizePolicy, QTabWidget, QDialog, QListWidget, QListWidgetItem, QMessageBox, QProgressDialog, QApplication, QCheckBox, QStyledItemDelegate, QStyle, QTableWidget, QTableWidgetItem, QHeaderView +from PySide6.QtWidgets import QWidget, QVBoxLayout, QLabel, QComboBox, QHBoxLayout, QLineEdit, QPushButton, QGridLayout, QFileDialog, QTextEdit, QSizePolicy, QTabWidget, QDialog, QListWidget, QListWidgetItem, QMessageBox, QProgressDialog, QApplication, QCheckBox, QStyledItemDelegate, QStyle, QTableWidget, QTableWidgetItem, QHeaderView, QMainWindow from PySide6.QtCore import Qt, QSize, QThread, Signal, QTimer, QProcess, QMetaObject, QUrl from PySide6.QtGui import QPixmap, QTextCursor, QColor, QPainter, QFont from ..shared_theme import JACKIFY_COLOR_BLUE, DEBUG_BORDERS @@ -2533,10 +2533,34 @@ class InstallModlistScreen(QWidget): debug_print(f"DEBUG: - {fp.filename}: {fp.percent:.1f}% ({fp.operation.value})") # Pass phase label to update header (e.g., "[Activity - Downloading]") # Explicitly clear summary_info when showing file list - self.file_progress_list.update_files(progress_state.active_files, current_phase=phase_label, summary_info=None) + try: + self.file_progress_list.update_files(progress_state.active_files, current_phase=phase_label, summary_info=None) + except RuntimeError as e: + # Widget was deleted - ignore to prevent coredump + if "already deleted" in str(e): + if self.debug: + debug_print(f"DEBUG: Ignoring widget deletion error: {e}") + return + raise + except Exception as e: + # Catch any other exceptions to prevent coredump + if self.debug: + debug_print(f"DEBUG: Error updating file progress list: {e}") + import logging + logging.getLogger(__name__).error(f"Error updating file progress list: {e}", exc_info=True) else: # Show empty state so widget stays visible even when no files are active - self.file_progress_list.update_files([], current_phase=phase_label) + try: + self.file_progress_list.update_files([], current_phase=phase_label) + except RuntimeError as e: + # Widget was deleted - ignore to prevent coredump + if "already deleted" in str(e): + return + raise + except Exception as e: + # Catch any other exceptions to prevent coredump + import logging + logging.getLogger(__name__).error(f"Error updating file progress list: {e}", exc_info=True) def _on_show_details_toggled(self, checked: bool): """R&D: Toggle console visibility (reuse TTW pattern)""" @@ -2996,19 +3020,24 @@ class InstallModlistScreen(QWidget): normalized = text.lower() total = max(1, self._post_install_total_steps) matched = False + matched_step = None for idx, step in enumerate(self._post_install_sequence, start=1): if any(keyword in normalized for keyword in step['keywords']): matched = True + matched_step = idx + # Always update to the highest step we've seen (don't go backwards) if idx >= self._post_install_current_step: self._post_install_current_step = idx self._post_install_last_label = step['label'] - self._update_post_install_ui(step['label'], idx, total, detail=text) - else: - self._update_post_install_ui(step['label'], idx, total, detail=text) + # CRITICAL: Always use the current step (not the matched step) to ensure consistency + # This prevents Activity window showing different step than progress banner + self._update_post_install_ui(step['label'], self._post_install_current_step, total, detail=text) break + # If no match but we have a current step, update with that step (not a new one) if not matched and self._post_install_current_step > 0: label = self._post_install_last_label or "Post-installation" + # CRITICAL: Use _post_install_current_step (not a new step) to keep displays in sync self._update_post_install_ui(label, self._post_install_current_step, total, detail=text) def _strip_timestamp_prefix(self, text: str) -> str: @@ -3020,11 +3049,14 @@ class InstallModlistScreen(QWidget): def _update_post_install_ui(self, label: str, step: int, total: int, detail: Optional[str] = None): """Update progress indicator + activity summary for post-install steps.""" + # Use the label as the primary display, but include step info in Activity window display_label = label if detail: # Remove timestamp prefix from detail messages clean_detail = self._strip_timestamp_prefix(detail.strip()) if clean_detail: + # For Activity window, show the detail with step counter + # But keep label simple for progress banner if clean_detail.lower().startswith(label.lower()): display_label = clean_detail else: @@ -3032,18 +3064,24 @@ class InstallModlistScreen(QWidget): total = max(1, total) step_clamped = max(0, min(step, total)) overall_percent = (step_clamped / total) * 100.0 + + # CRITICAL: Ensure both displays use the SAME step counter + # Progress banner uses phase_step/phase_max_steps from progress_state progress_state = InstallationProgress( phase=InstallationPhase.FINALIZE, - phase_name=display_label, - phase_step=step_clamped, + phase_name=display_label, # This will show in progress banner + phase_step=step_clamped, # This creates [step/total] in display_text phase_max_steps=total, overall_percent=overall_percent ) self.progress_indicator.update_progress(progress_state) + + # Activity window uses summary_info with the SAME step counter summary_info = { - 'current_step': step_clamped, - 'max_steps': total, + 'current_step': step_clamped, # Must match phase_step above + 'max_steps': total, # Must match phase_max_steps above } + # Use the same label for consistency self.file_progress_list.update_files([], current_phase=display_label, summary_info=summary_info) def _end_post_install_feedback(self, success: bool): @@ -3263,6 +3301,52 @@ class InstallModlistScreen(QWidget): debug_print(f"DEBUG: steam -foreground failed: {e2}") except Exception as e: debug_print(f"DEBUG: Error ensuring Steam GUI visibility: {e}") + + # CRITICAL: Bring Jackify window back to focus after Steam restart + # This ensures the user can continue with the installation workflow + debug_print("DEBUG: Bringing Jackify window back to focus") + try: + # Get the main window - use window() to get top-level widget, then find QMainWindow + top_level = self.window() + main_window = None + + # Try to find QMainWindow in the widget hierarchy + if isinstance(top_level, QMainWindow): + main_window = top_level + else: + # Walk up the parent chain + current = self + while current: + if isinstance(current, QMainWindow): + main_window = current + break + current = current.parent() + + # Last resort: use top-level widget + if not main_window and top_level: + main_window = top_level + + if main_window: + # Restore window if minimized + if hasattr(main_window, 'isMinimized') and main_window.isMinimized(): + main_window.showNormal() + + # Bring to front and activate - use multiple methods for reliability + main_window.raise_() + main_window.activateWindow() + main_window.show() + + # Force focus with multiple attempts (some window managers need this) + from PySide6.QtCore import QTimer + QTimer.singleShot(50, lambda: main_window.activateWindow() if main_window else None) + QTimer.singleShot(200, lambda: (main_window.raise_(), main_window.activateWindow()) if main_window else None) + QTimer.singleShot(500, lambda: main_window.activateWindow() if main_window else None) + + debug_print(f"DEBUG: Jackify window brought back to focus (type: {type(main_window).__name__})") + else: + debug_print("DEBUG: Could not find main window to bring to focus") + except Exception as e: + debug_print(f"DEBUG: Error bringing Jackify to focus: {e}") # Save context for later use in configuration self._manual_steps_retry_count = 0 diff --git a/jackify/frontends/gui/screens/install_ttw.py b/jackify/frontends/gui/screens/install_ttw.py index b1f09d9..82da3ef 100644 --- a/jackify/frontends/gui/screens/install_ttw.py +++ b/jackify/frontends/gui/screens/install_ttw.py @@ -472,13 +472,15 @@ class InstallTTWScreen(QWidget): # Check version against latest update_available, installed_v, latest_v = ttw_installer_handler.is_ttw_installer_update_available() if update_available: - self.ttw_installer_status.setText("Out of date") + version_text = f"Out of date (v{installed_v} → v{latest_v})" if installed_v and latest_v else "Out of date" + self.ttw_installer_status.setText(version_text) self.ttw_installer_status.setStyleSheet("color: #f44336;") self.ttw_installer_btn.setText("Update now") self.ttw_installer_btn.setEnabled(True) self.ttw_installer_btn.setVisible(True) else: - self.ttw_installer_status.setText("Ready") + version_text = f"Ready (v{installed_v})" if installed_v else "Ready" + self.ttw_installer_status.setText(version_text) self.ttw_installer_status.setStyleSheet("color: #3fd0ea;") self.ttw_installer_btn.setText("Update now") self.ttw_installer_btn.setEnabled(False) # Greyed out when ready @@ -1418,8 +1420,11 @@ class InstallTTWScreen(QWidget): is_warning = 'warning:' in lower_cleaned is_milestone = any(kw in lower_cleaned for kw in ['===', 'complete', 'finished', 'validation', 'configuration valid']) is_file_op = any(ext in lower_cleaned for ext in ['.ogg', '.mp3', '.bsa', '.dds', '.nif', '.kf', '.hkx']) - - should_show = (is_error or is_warning or is_milestone) or (self.show_details_checkbox.isChecked() and not is_file_op) + + # Filter out meaningless standalone messages (just "OK", etc.) + is_noise = cleaned.strip().upper() in ['OK', 'OK.', 'OK!', 'DONE', 'DONE.', 'SUCCESS', 'SUCCESS.'] + + should_show = (is_error or is_warning or is_milestone) or (self.show_details_checkbox.isChecked() and not is_file_op and not is_noise) if should_show: if is_error or is_warning: @@ -1550,7 +1555,10 @@ class InstallTTWScreen(QWidget): is_milestone = any(kw in lower_cleaned for kw in ['===', 'complete', 'finished', 'validation', 'configuration valid']) is_file_op = any(ext in lower_cleaned for ext in ['.ogg', '.mp3', '.bsa', '.dds', '.nif', '.kf', '.hkx']) - should_show = (is_error or is_warning or is_milestone) or (self.show_details_checkbox.isChecked() and not is_file_op) + # Filter out meaningless standalone messages (just "OK", etc.) + is_noise = cleaned.strip().upper() in ['OK', 'OK.', 'OK!', 'DONE', 'DONE.', 'SUCCESS', 'SUCCESS.'] + + should_show = (is_error or is_warning or is_milestone) or (self.show_details_checkbox.isChecked() and not is_file_op and not is_noise) if should_show: # Direct console append - no recursion, no complex processing diff --git a/jackify/frontends/gui/screens/modlist_gallery.py b/jackify/frontends/gui/screens/modlist_gallery.py index 7f9312e..e1e7b9a 100644 --- a/jackify/frontends/gui/screens/modlist_gallery.py +++ b/jackify/frontends/gui/screens/modlist_gallery.py @@ -10,7 +10,7 @@ from PySide6.QtWidgets import ( QFrame, QSizePolicy, QDialog, QTextEdit, QTextBrowser, QMessageBox, QListWidget ) from PySide6.QtCore import Qt, Signal, QSize, QThread, QUrl, QTimer, QObject -from PySide6.QtGui import QPixmap, QFont, QDesktopServices, QPainter, QColor, QTextOption, QPalette +from PySide6.QtGui import QPixmap, QFont, QPainter, QColor, QTextOption, QPalette from PySide6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply from pathlib import Path from typing import List, Optional, Dict @@ -536,7 +536,7 @@ class ModlistDetailDialog(QDialog): background: #3C45A5; } """) - discord_btn.clicked.connect(lambda: QDesktopServices.openUrl(QUrl(self.metadata.links.discordURL))) + discord_btn.clicked.connect(lambda: self._open_url(self.metadata.links.discordURL)) links_layout.addWidget(discord_btn) if self.metadata.links.websiteURL: @@ -558,7 +558,7 @@ class ModlistDetailDialog(QDialog): background: #2a2a2a; } """) - website_btn.clicked.connect(lambda: QDesktopServices.openUrl(QUrl(self.metadata.links.websiteURL))) + website_btn.clicked.connect(lambda: self._open_url(self.metadata.links.websiteURL)) links_layout.addWidget(website_btn) if self.metadata.links.readme: @@ -581,7 +581,7 @@ class ModlistDetailDialog(QDialog): } """) readme_url = self._convert_raw_github_url(self.metadata.links.readme) - readme_btn.clicked.connect(lambda: QDesktopServices.openUrl(QUrl(readme_url))) + readme_btn.clicked.connect(lambda: self._open_url(readme_url)) links_layout.addWidget(readme_btn) bottom_bar.addLayout(links_layout) @@ -732,6 +732,35 @@ class ModlistDetailDialog(QDialog): self.install_requested.emit(self.metadata) self.accept() + def _open_url(self, url: str): + """Open URL with clean environment to avoid AppImage library conflicts.""" + import subprocess + import os + + env = os.environ.copy() + + # Remove AppImage-specific environment variables + appimage_vars = [ + 'LD_LIBRARY_PATH', + 'PYTHONPATH', + 'PYTHONHOME', + 'QT_PLUGIN_PATH', + 'QML2_IMPORT_PATH', + ] + + if 'APPIMAGE' in env or 'APPDIR' in env: + for var in appimage_vars: + if var in env: + del env[var] + + subprocess.Popen( + ['xdg-open', url], + env=env, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + start_new_session=True + ) + class ModlistGalleryDialog(QDialog): """Enhanced modlist gallery dialog with visual browsing""" diff --git a/jackify/frontends/gui/widgets/file_progress_list.py b/jackify/frontends/gui/widgets/file_progress_list.py index 8d4da3b..c077c2b 100644 --- a/jackify/frontends/gui/widgets/file_progress_list.py +++ b/jackify/frontends/gui/widgets/file_progress_list.py @@ -105,6 +105,8 @@ class FileProgressItem(QWidget): self.file_progress = file_progress self._target_percent = file_progress.percent # Target value for smooth animation self._current_display_percent = file_progress.percent # Currently displayed value + self._spinner_position = 0 # For custom indeterminate spinner animation (0-200 range for smooth wraparound) + self._is_indeterminate = False # Track if we're in indeterminate mode self._animation_timer = QTimer(self) self._animation_timer.timeout.connect(self._animate_progress) self._animation_timer.setInterval(16) # ~60fps for smooth animation @@ -239,10 +241,32 @@ class FileProgressItem(QWidget): self.progress_bar.setRange(0, 100) # Progress bar value will be updated by animation timer else: - # Indeterminate if no max - use Qt's built-in smooth animation + # No max for summary - use custom animated spinner + self._is_indeterminate = True self.percent_label.setText("") self.speed_label.setText("") - self.progress_bar.setRange(0, 0) # Qt handles animation smoothly + self.progress_bar.setRange(0, 100) # Use determinate range for custom animation + if not self._animation_timer.isActive(): + self._animation_timer.start() + return + + # Check if this is a queued item (not yet started) + # Queued items have total_size > 0 but percent == 0, current_size == 0, speed <= 0 + is_queued = ( + self.file_progress.total_size > 0 and + self.file_progress.percent == 0 and + self.file_progress.current_size == 0 and + self.file_progress.speed <= 0 + ) + + if is_queued: + # Queued download - show "Queued" text with empty progress bar + self._is_indeterminate = False + self._animation_timer.stop() + self.percent_label.setText("Queued") + self.speed_label.setText("") + self.progress_bar.setRange(0, 100) + self.progress_bar.setValue(0) return # Check if we have meaningful progress data @@ -253,49 +277,69 @@ class FileProgressItem(QWidget): (self.file_progress.speed > 0 and self.file_progress.percent >= 0) ) - # Use determinate mode if we have actual progress data, otherwise use Qt's indeterminate mode + # Use determinate mode if we have actual progress data, otherwise use custom animated spinner if has_meaningful_progress: + # Normal progress mode + self._is_indeterminate = False # Update target for smooth animation self._target_percent = max(0, self.file_progress.percent) - + # Start animation timer if not already running if not self._animation_timer.isActive(): self._animation_timer.start() - + # Update speed label immediately (doesn't need animation) self.speed_label.setText(self.file_progress.speed_display) self.progress_bar.setRange(0, 100) # Progress bar value will be updated by animation timer else: - # No progress data (e.g., texture conversions) - Qt's indeterminate mode - self._animation_timer.stop() # Stop animation for indeterminate items - self.percent_label.setText("") # No percentage + # No progress data (e.g., texture conversions, BSA building) - use custom animated spinner + self._is_indeterminate = True + self.percent_label.setText("") # Clear percent label self.speed_label.setText("") # No speed - self.progress_bar.setRange(0, 0) # Qt handles smooth indeterminate animation + self.progress_bar.setRange(0, 100) # Use determinate range for custom animation + # Start animation timer for custom spinner + if not self._animation_timer.isActive(): + self._animation_timer.start() def _animate_progress(self): - """Smoothly animate progress bar from current to target value.""" - # Calculate difference - diff = self._target_percent - self._current_display_percent - - # If very close, snap to target and stop animation - if abs(diff) < 0.1: - self._current_display_percent = self._target_percent - self._animation_timer.stop() + """Smoothly animate progress bar from current to target value, or animate spinner.""" + if self._is_indeterminate: + # Custom indeterminate spinner animation + # Use a bouncing/pulsing effect: position moves 0-100-0 smoothly + # Increment by 4 units per frame for fast animation (full cycle in ~0.8s at 60fps) + self._spinner_position = (self._spinner_position + 4) % 200 + + # Create bouncing effect: 0->100->0 + if self._spinner_position < 100: + display_value = self._spinner_position + else: + display_value = 200 - self._spinner_position + + self.progress_bar.setValue(display_value) else: - # Smooth interpolation (ease-out for natural feel) - # Move 20% of remaining distance per frame (~60fps = smooth) - self._current_display_percent += diff * 0.2 - - # Update display - display_percent = max(0, min(100, self._current_display_percent)) - self.progress_bar.setValue(int(display_percent)) - - # Update percentage label - if self.file_progress.percent > 0: - self.percent_label.setText(f"{display_percent:.0f}%") - else: - self.percent_label.setText("") + # Normal progress animation + # Calculate difference + diff = self._target_percent - self._current_display_percent + + # If very close, snap to target and stop animation + if abs(diff) < 0.1: + self._current_display_percent = self._target_percent + self._animation_timer.stop() + else: + # Smooth interpolation (ease-out for natural feel) + # Move 20% of remaining distance per frame (~60fps = smooth) + self._current_display_percent += diff * 0.2 + + # Update display + display_percent = max(0, min(100, self._current_display_percent)) + self.progress_bar.setValue(int(display_percent)) + + # Update percentage label + if self.file_progress.percent > 0: + self.percent_label.setText(f"{display_percent:.0f}%") + else: + self.percent_label.setText("") def update_progress(self, file_progress: FileProgress): """Update with new progress data.""" @@ -558,30 +602,35 @@ class FileProgressList(QWidget): item_key = file_progress.filename if item_key in self._file_items: - # Update existing - ensure it's in the right position + # Update existing widget - DO NOT reorder items (causes segfaults) + # Reordering with takeItem/insertItem can delete widgets and cause crashes + # Order is less important than stability - just update the widget in place item_widget = self._file_items[item_key] - item_widget.update_progress(file_progress) - - # Find the item in the list and move it if needed - for i in range(self.list_widget.count()): - item = self.list_widget.item(i) - if item and item.data(Qt.UserRole) == item_key: - # Item is at position i, should be at position idx - if i != idx: - # Take item from current position and insert at correct position - taken_item = self.list_widget.takeItem(i) - self.list_widget.insertItem(idx, taken_item) - self.list_widget.setItemWidget(taken_item, item_widget) - break - else: - # Add new - insert at specific position (idx) to maintain order - item_widget = FileProgressItem(file_progress) - list_item = QListWidgetItem() - list_item.setSizeHint(item_widget.sizeHint()) - list_item.setData(Qt.UserRole, item_key) # Use stable key - self.list_widget.insertItem(idx, list_item) # Insert at specific position - self.list_widget.setItemWidget(list_item, item_widget) - self._file_items[item_key] = item_widget + # CRITICAL: Check widget is still valid before updating + if shiboken6.isValid(item_widget): + try: + item_widget.update_progress(file_progress) + except RuntimeError: + # Widget was deleted - remove from dict and create new one below + del self._file_items[item_key] + # Fall through to create new widget + else: + # Update successful - skip creating new widget + continue + else: + # Widget invalid - remove from dict and create new one + del self._file_items[item_key] + # Fall through to create new widget + # Create new widget (either because it didn't exist or was invalid) + # CRITICAL: Use addItem instead of insertItem to avoid position conflicts + # Order is less important than stability - addItem is safer than insertItem + item_widget = FileProgressItem(file_progress) + list_item = QListWidgetItem() + list_item.setSizeHint(item_widget.sizeHint()) + list_item.setData(Qt.UserRole, item_key) # Use stable key + self.list_widget.addItem(list_item) # Use addItem for safety (avoids segfaults) + self.list_widget.setItemWidget(list_item, item_widget) + self._file_items[item_key] = item_widget # Update last phase tracker if current_phase: diff --git a/jackify/frontends/gui/widgets/progress_indicator.py b/jackify/frontends/gui/widgets/progress_indicator.py index e4477e9..d1ee8e9 100644 --- a/jackify/frontends/gui/widgets/progress_indicator.py +++ b/jackify/frontends/gui/widgets/progress_indicator.py @@ -117,8 +117,9 @@ class OverallProgressIndicator(QWidget): from jackify.shared.progress_models import InstallationPhase is_bsa_building = progress.get_phase_label() == "Building BSAs" - # For install/extract/BSA building phases, prefer step-based progress (more accurate) - if progress.phase in (InstallationPhase.INSTALL, InstallationPhase.EXTRACT) or is_bsa_building: + # For install/extract/download/BSA building phases, prefer step-based progress (more accurate) + # This prevents carrying over 100% from previous phases (e.g., .wabbajack download) + if progress.phase in (InstallationPhase.INSTALL, InstallationPhase.EXTRACT, InstallationPhase.DOWNLOAD) or is_bsa_building: if progress.phase_max_steps > 0: display_percent = (progress.phase_step / progress.phase_max_steps) * 100.0 elif progress.data_total > 0 and progress.data_processed > 0: diff --git a/jackify/shared/progress_models.py b/jackify/shared/progress_models.py index 2c0c5ce..00ad3c4 100644 --- a/jackify/shared/progress_models.py +++ b/jackify/shared/progress_models.py @@ -123,7 +123,7 @@ class InstallationProgress: return "" def get_overall_speed_display(self) -> str: - """Get overall speed display from speeds dict or sum of active files.""" + """Get overall speed display from aggregate speeds reported by engine.""" def _fresh_speed(op_key: str) -> float: """Return speed if recently updated, else 0.""" if op_key not in self.speeds: @@ -134,8 +134,14 @@ class InstallationProgress: if time.time() - updated_at > 2.0: return 0.0 return max(0.0, self.speeds.get(op_key, 0.0)) - - # Prefer aggregate speeds that match the current phase + + # CRITICAL FIX: Use aggregate speeds from engine status lines + # The engine reports accurate total speeds in lines like: + # "[00:00:10] Downloading Mod Archives (17/214) - 6.8MB/s" + # These aggregate speeds are stored in self.speeds dict and are the source of truth + # DO NOT sum individual file speeds - that inflates the total incorrectly + + # Try to get speed for current phase first phase_operation_map = { InstallationPhase.DOWNLOAD: 'download', InstallationPhase.EXTRACT: 'extract', @@ -147,22 +153,13 @@ class InstallationProgress: op_speed = _fresh_speed(active_op) if op_speed > 0: return FileProgress._format_bytes(int(op_speed)) + "/s" - + # Otherwise check other operations in priority order for op_key in ['download', 'extract', 'validate', 'install']: op_speed = _fresh_speed(op_key) if op_speed > 0: return FileProgress._format_bytes(int(op_speed)) + "/s" - - # If engine didn't report aggregate speed, fall back to summing active file speeds - if self.active_files: - total_speed = sum( - fp.speed - for fp in self.active_files - if fp.speed > 0 and not fp.is_complete - ) - if total_speed > 0: - return FileProgress._format_bytes(int(total_speed)) + "/s" + return "" def get_phase_label(self) -> str: