v0.3.2: Fix CLI binary download - use ZIP packages with resources

- loader.py: Download ZIP instead of single file, extract with resources/
- build-csharp.yml: Upload MeowthBridge-{platform}.zip to Release
- Revert PublishSingleFile (breaks resources/ access)
- Fix syntax error and orphaned code in loader.py
- Bump version to 0.3.2

Author: booffaoex

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "meowth"
-version = "0.3.1"
+version = "0.3.2"
 description = "GBA Pokemon ROM translation tool with CLI and GUI support"
 requires-python = ">=3.10"
 dependencies = [

src/meowth/binaries/loader.py

@@ -13,25 +13,16 @@
 
 
 def get_meowth_version() -> str:
-    """Get the current meowth package version.
-
-    Returns:
-        Version string (e.g., "0.3.1")
-    """
+    """Get the current meowth package version."""
     try:
         import importlib.metadata
         return importlib.metadata.version("meowth")
     except Exception:
-        # Fallback for development mode
-        return "0.3.1"
+        return "0.3.2"
 
 
 def get_platform_name() -> str:
-    """Get the normalized platform name for binary selection.
-
-    Returns:
-        One of: "windows", "macos", "linux"
-    """
+    """Get the normalized platform name for binary selection."""
     system = platform.system().lower()
     if system == "darwin":
         return "macos"
@@ -40,16 +31,11 @@ def get_platform_name() -> str:
     elif system == "linux":
         return "linux"
     else:
-        # Fallback for unknown platforms
         return "linux"
 
 
 def get_executable_name() -> str:
-    """Get the executable name for the current platform.
-
-    Returns:
-        "MeowthBridge.exe" on Windows, "MeowthBridge" on Unix
-    """
+    """Get the executable name for the current platform."""
     return "MeowthBridge.exe" if platform.system() == "Windows" else "MeowthBridge"
 
 
@@ -60,12 +46,8 @@ def find_meowth_bridge() -> Path:
     1. Environment variable MEOWTH_BRIDGE_PATH (if set)
     2. Bundled binary in package (src/meowth/binaries/{platform}/)
     3. Development build (src/MeowthBridge/bin/Release or Debug)
-
-    Returns:
-        Path to the MeowthBridge executable
-
-    Raises:
-        FileNotFoundError: If MeowthBridge cannot be found
+    4. Cached download (~/.meowth/binaries/{platform}/)
+    5. Download from GitHub releases
     """
     exe_name = get_executable_name()
 
@@ -75,93 +57,64 @@ def find_meowth_bridge() -> Path:
         env_exe = Path(env_path)
         if env_exe.exists() and env_exe.is_file():
             return env_exe
-        # If MEOWTH_BRIDGE_PATH is a directory, look for executable inside
         if env_exe.is_dir():
             env_exe = env_exe / exe_name
             if env_exe.exists():
                 return env_exe
 
     # Strategy 2: Check bundled binary in package
-    # This is where the binary will be when installed via pip
     package_dir = Path(__file__).parent
     platform_name = get_platform_name()
     bundled_exe = package_dir / platform_name / exe_name
 
     if bundled_exe.exists():
-        # Make sure it's executable on Unix systems
         if platform.system() != "Windows":
             bundled_exe.chmod(0o755)
         return bundled_exe
 
     # Strategy 3: Check development build
-    # This is for developers working on the project
-    # Look for src/MeowthBridge/bin/{Release,Debug}/net8.0/MeowthBridge
     project_root = Path(__file__).parent.parent.parent.parent
     meowth_bridge_dir = project_root / "src" / "MeowthBridge"
 
-    # Try Release first, then Debug
     for build_config in ("Release", "Debug"):
         dev_exe = meowth_bridge_dir / "bin" / build_config / "net8.0" / exe_name
         if dev_exe.exists():
             return dev_exe
 
-    # Strategy 4: Check if it's in the old location (backward compatibility)
+    # Strategy 4: Check old location (backward compatibility)
     old_location = project_root / "MeowthBridge" / "bin"
     for build_config in ("Release", "Debug"):
         old_exe = old_location / build_config / "net8.0" / exe_name
         if old_exe.exists():
             return old_exe
 
-    # Not found in standard locations, try downloading from GitHub
+    # Strategy 5: Download from GitHub
     try:
         return _download_meowth_bridge()
     except Exception as download_error:
-        # If download fails, raise the original error
         raise FileNotFoundError(
             f"MeowthBridge executable not found. Tried:\n"
             f"  1. Environment variable MEOWTH_BRIDGE_PATH: {env_path or '(not set)'}\n"
             f"  2. Bundled binary: {bundled_exe}\n"
-            f"  3. Development build: {meowth_bridge_dir / 'bin' / '{Release,Debug}' / 'net8.0' / exe_name}\n"
+            f"  3. Development build: {meowth_bridge_dir / 'bin'}\n"
             f"  4. Download from GitHub: {download_error}\n"
             f"\n"
             f"To fix this:\n"
-            f"  - If developing: Build MeowthBridge with 'dotnet build src/MeowthBridge -c Release'\n"
-            f"  - If using pip: Check your internet connection or set MEOWTH_BRIDGE_PATH\n"
-            f"  - Set MEOWTH_BRIDGE_PATH environment variable to the executable path"
+            f"  - Set MEOWTH_BRIDGE_PATH environment variable to the executable path\n"
+            f"  - Or check your internet connection for auto-download"
         ) from download_error
 
 
-
-
 def _download_meowth_bridge() -> Path:
-    """Download MeowthBridge binary from GitHub release if not found locally.
-
-    Returns:
-        Path to the downloaded executable
-
-    Raises:
-        FileNotFoundError: If download fails
-    """
+    """Download MeowthBridge ZIP from GitHub release and extract it."""
     exe_name = get_executable_name()
     platform_name = get_platform_name()
-
-    # Get current version
     version = get_meowth_version()
 
-    # Determine the ZIP asset name based on platform
-    asset_name_map = {
-        "macos": "MeowthBridge-macos.zip",
-        "windows": "MeowthBridge-windows.zip",
-        "linux": "MeowthBridge-linux.zip",
-    }
-    asset_name = asset_name_map.get(platform_name)
-    if not asset_name:
-        raise FileNotFoundError(f"Unsupported platform: {platform_name}")
-
-    # URL to the GitHub release
+    asset_name = f"MeowthBridge-{platform_name}.zip"
     download_url = f"https://github.com/Olcmyk/Meowth-GBA-Translator/releases/download/v{version}/{asset_name}"
 
-    # Create cache directory
+    # Cache directory
     cache_dir = Path.home() / ".meowth" / "binaries" / platform_name
     cache_dir.mkdir(parents=True, exist_ok=True)
 
@@ -177,8 +130,8 @@ def _download_meowth_bridge() -> Path:
     print(f"🔽 First-time setup: Downloading MeowthBridge for {platform_name}...")
     print(f"   Source: {download_url}")
 
+    tmp_zip_path = None
     try:
-        # Download to temporary file
         with tempfile.NamedTemporaryFile(delete=False, suffix='.zip') as tmp_file:
             tmp_zip_path = Path(tmp_file.name)
 
@@ -201,6 +154,8 @@ def _download_meowth_bridge() -> Path:
         return exe_path
 
     except urllib.error.HTTPError as e:
+        if tmp_zip_path and tmp_zip_path.exists():
+            tmp_zip_path.unlink()
         if e.code == 404:
             raise FileNotFoundError(
                 f"MeowthBridge binary not found in release v{version}.\n"
@@ -209,97 +164,77 @@ def _download_meowth_bridge() -> Path:
                 f"  1. The release hasn't been published yet\n"
                 f"  2. The binary wasn't uploaded to the release\n\n"
                 f"Workaround:\n"
-                f"  Set MEOWTH_BRIDGE_PATH environment variable to a local binary:\n"
-              t MEOWTH_BRIDGE_PATH=/path/to/MeowthBridge"
+                f"  export MEOWTH_BRIDGE_PATH=/path/to/MeowthBridge"
             )
         else:
             raise FileNotFoundError(f"HTTP error {e.code} downloading from {download_url}: {e}")
     except Exception as e:
+        if tmp_zip_path and tmp_zip_path.exists():
+            tmp_zip_path.unlink()
         raise FileNotFoundError(f"Failed to download MeowthBridge: {e}")
 
 
 def _download_with_progress_and_retry(url: str, dest: Path, max_retries: int = 3):
-    """Download file with progress display and retry logic.
-
-    Args:
-        url: URL to download from
-        dest: Destination file path
-        max_retries: Maximum number of retry attempts
-
-    Raises:
-        Exception: If download fails after all retries
-    """
+    """Download file with progress display and retry logic."""
     for attempt in range(1, max_retries + 1):
         try:
             _download_with_progress(url, dest)
-            return  # Success
+            return
         except Exception as e:
             if attempt < max_retries:
                 print(f"   ⚠️  Download failed (attempt {attempt}/{max_retries}): {e}")
                 print(f"   🔄 Retrying in 2 seconds...")
                 time.sleep(2)
             else:
-                raise  # Final attempt failed
+                raise
 
 
 def _download_with_progress(url: str, dest: Path):
-    """Download file with progress display.
+    """Download file with progress display."""
+    tmp_path = None
+    try:
+        with tempfile.NamedTemporaryFile(delete=False) as tmp_file:
+            tmp_path = Path(tmp_file.name)
+
+        response = urllib.request.urlopen(url, timeout=60)
+        total_size = int(response.headers.get('content-length', 0))
+
+        downloaded = 0
+        chunk_size = 65536
+        last_percent = -1
+
+        with open(tmp_path, 'wb') as f:
+            while True:
+                chunk = response.read(chunk_size)
+                if not chunk:
+                    break
+                f.write(chunk)
+                downloaded += len(chunk)
+
+                if total_size > 0:
+                    percent = int((downloaded / total_size) * 100)
+                    if percent != last_percent and percent % 10 == 0:
+                        mb_downloaded = downloaded / (1024 * 1024)
+                        mb_total = total_size / (1024 * 1024)
+                        print(f"   [{percent:3d}%] {mb_downloaded:.1f} MB / {mb_total:.1f} MB")
+                        last_percent = percent
+
+        shutil.move(str(tmp_path), str(dest))
 
-    Args:
-        url: URL to download from
-        dest: Destination file path
-    """
-    with tempfile.NamedTemporaryFile(delete=False) as tmp_file:
-        tmp_path = Path(tmp_file.name)
+    except Exception:
+        if tmp_path and tmp_path.exists():
+            tmp_path.unlink()
+        raise
 
-        try:
-            response = urllib.request.urlopen(url, timeout=30)
-            total_size = int(response.headers.get('content-length', 0))
-
-            downloaded = 0
-            chunk_size = 8192
-            last_percent = -1
-
-            with open(tmp_path, 'wb') as f:
-                while True:
-                    chunk = response.read(chunk_size)
-                    if not chunk:
-                        break
-                    f.write(chunk)
-                    downloaded += len(chunk)
-
-                    # Show progress
-                    if total_size > 0:
-                        percent = int((downloaded / total_size) * 100)
-                        if percent != last_percent and percent % 10 == 0:
-                            mb_downloaded = downloaded / (1024 * 1024)
-                            mb_total = total_size / (1024 * 1024)
-                            print(f"   [{percent:3d}%] {mb_downloaded:.1f} MB / {mb_total:.1f} MB")
-                            last_percent = percent
-
-            # Move to final destination
-            shutil.move(str(tmp_path), str(dest))
 
-        except Exception as e:
-            # Clean up temp file on error
-            if tmp_path.exists():
-                tmp_path.unlink()
-            raise
-    """Get information about the MeowthBridge binary.
-
-    Returns:
-        Dictionary with binary information:
-        - path: Path to the executable
-        - platform: Platform name (windows/macos/linux)
-        - source: Where the binary was found (env/bundled/dev)
-        - exists: Whether the binary exists
-    """
+def get_binary_info() -> dict:
+    """Get information about the MeowthBridge binary."""
     try:
         exe_path = find_meowth_bridge()
-
-        # Determine source
         if os.environ.get("MEOWTH_BRIDGE_PATH"):
             source = "environment"
+        elif ".meowth" in str(exe_path):
+            source = "downloaded"
         elif "binaries" in str(exe_path):
             source = "bundled"
         else: