simplify

Author: NicoHinderling

src/launchpad/artifacts/providers/zip_provider.py

@@ -1,7 +1,9 @@
 import zipfile
 
 from pathlib import Path
-from typing import List, Set
+from typing import List
+
+import zipfile_zstd  # noqa: F401 - Import registers zstd handler with zipfile
 
 from launchpad.utils.file_utils import cleanup_directory, create_temp_directory
 from launchpad.utils.logging import get_logger
@@ -11,9 +13,6 @@
 DEFAULT_MAX_FILE_COUNT = 100000
 DEFAULT_MAX_UNCOMPRESSED_SIZE = 10 * 1024 * 1024 * 1024
 
-# Compression method constants
-COMPRESSION_ZSTD = 93  # Zstandard compression method
-
 
 class UnreasonableZipError(ValueError):
     """Raised when a zip file exceeds reasonable limits."""
@@ -99,39 +98,12 @@ def extract_to_temp_directory(self) -> Path:
 
         return temp_dir
 
-    def _detect_compression_methods(self, zip_path: str) -> Set[int]:
-        """Detect compression methods used in the zip file.
-
-        Args:
-            zip_path: Path to the zip file
-
-        Returns:
-            Set of compression method integers used in the zip file
-        """
-        with zipfile.ZipFile(zip_path, "r") as zf:
-            return {info.compress_type for info in zf.infolist()}
-
     def _safe_extract(self, zip_path: str, extract_path: str):
         """Extract the zip contents to a temporary directory, ensuring that the paths are safe from path traversal attacks.
 
         Supports both standard compression methods and Zstandard compression.
         """
         base_dir = Path(extract_path)
-
-        # Detect if zstandard compression is used
-        compression_methods = self._detect_compression_methods(zip_path)
-        uses_zstd = COMPRESSION_ZSTD in compression_methods
-
-        if uses_zstd:
-            logger.debug("Detected Zstandard compression in zip file")
-            try:
-                import zipfile_zstd  # noqa: F401
-            except ImportError:
-                raise RuntimeError(
-                    "Zstandard-compressed zip file detected, but zipfile-zstd package is not installed. "
-                    "Install it with: pip install zipfile-zstd"
-                )
-
         with zipfile.ZipFile(zip_path, "r") as zip_ref:
             check_reasonable_zip(zip_ref)
             for member in zip_ref.namelist():

tests/unit/artifacts/providers/test_zip_provider.py

@@ -6,7 +6,6 @@
 import pytest
 
 from launchpad.artifacts.providers.zip_provider import (
-    COMPRESSION_ZSTD,
     UnreasonableZipError,
     UnsafePathError,
     ZipProvider,
@@ -89,37 +88,6 @@ def test_invalid_zip_file(self) -> None:
             with pytest.raises(zipfile.BadZipFile):
                 provider.extract_to_temp_directory()
 
-    def test_detect_compression_methods(self, hackernews_xcarchive: Path) -> None:
-        provider = ZipProvider(hackernews_xcarchive)
-        methods = provider._detect_compression_methods(str(hackernews_xcarchive))
-
-        # Verify detection works and standard zips use deflate compression, not zstd
-        assert zipfile.ZIP_DEFLATED in methods
-        assert COMPRESSION_ZSTD not in methods
-
-    def test_extract_zstd_zip(self) -> None:
-        """Test that zstd-compressed zips can be extracted when zipfile-zstd is available."""
-        try:
-            import zipfile_zstd  # noqa: F401
-        except ImportError:
-            pytest.skip("zipfile-zstd not installed")
-
-        with tempfile.NamedTemporaryFile(suffix=".zip", delete=False) as temp_file:
-            temp_path = Path(temp_file.name)
-
-            with zipfile.ZipFile(temp_path, "w") as zf:
-                zf.writestr("test.txt", "content", compress_type=COMPRESSION_ZSTD)
-
-            try:
-                provider = ZipProvider(temp_path)
-                temp_dir = provider.extract_to_temp_directory()
-
-                assert temp_dir.exists()
-                assert (temp_dir / "test.txt").exists()
-                assert (temp_dir / "test.txt").read_text() == "content"
-            finally:
-                temp_path.unlink(missing_ok=True)
-
 
 class TestIsSafePath:
     def test_valid_paths(self) -> None:
@@ -157,3 +125,22 @@ def test_max_file_size(self, hackernews_xcarchive: Path) -> None:
             # iOS fixture is ~32MB uncompressed, so limit of 10MB should fail
             with pytest.raises(UnreasonableZipError, match="exceeding the limit of 10.0MB"):
                 check_reasonable_zip(zf, max_uncompressed_size=10 * 1024 * 1024)
+
+    def test_extract_zstd_zip(self) -> None:
+        """Test that zstd-compressed zips can be extracted."""
+        with tempfile.NamedTemporaryFile(suffix=".zip", delete=False) as temp_file:
+            temp_path = Path(temp_file.name)
+
+            # Create a zstd-compressed zip (compression method 93)
+            with zipfile.ZipFile(temp_path, "w") as zf:
+                zf.writestr("test.txt", "content", compress_type=93)
+
+            try:
+                provider = ZipProvider(temp_path)
+                temp_dir = provider.extract_to_temp_directory()
+
+                assert temp_dir.exists()
+                assert (temp_dir / "test.txt").exists()
+                assert (temp_dir / "test.txt").read_text() == "content"
+            finally:
+                temp_path.unlink(missing_ok=True)