Restore Minizip in ReadiumShared (#551)

readium · Jan 30, 2025 · 464122d · 464122d
1 parent 9dc13a0
commit 464122d
Show file tree

Hide file tree

Showing 20 changed files with 401 additions and 401 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,4 @@
+github "dexman/Minizip" ~> 1.4.0
 github "krzyzanowskim/CryptoSwift" ~> 1.8.0
 github "ra1028/DifferenceKit" ~> 1.3.0
 github "readium/Fuzi" ~> 4.0.0

diff --git a/Package.swift b/Package.swift
@@ -21,7 +21,6 @@ let package = Package(
         // Adapters to third-party dependencies.
         .library(name: "ReadiumAdapterGCDWebServer", targets: ["ReadiumAdapterGCDWebServer"]),
         .library(name: "ReadiumAdapterLCPSQLite", targets: ["ReadiumAdapterLCPSQLite"]),
-        .library(name: "ReadiumAdapterMinizip", targets: ["ReadiumAdapterMinizip"]),
     ],
     dependencies: [
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.8.0"),
@@ -39,6 +38,7 @@ let package = Package(
             dependencies: [
                 "ReadiumInternal",
                 "SwiftSoup",
+                "Zip",
                 .product(name: "ReadiumFuzi", package: "Fuzi"),
                 .product(name: "ReadiumZIPFoundation", package: "ZIPFoundation"),
             ],
@@ -159,23 +159,6 @@ let package = Package(
             path: "Sources/Adapters/LCPSQLite"
         ),
 
-        .target(
-            name: "ReadiumAdapterMinizip",
-            dependencies: [
-                "ReadiumShared",
-                "Zip",
-            ],
-            path: "Sources/Adapters/Minizip"
-        ),
-        .testTarget(
-            name: "ReadiumAdapterMinizipTests",
-            dependencies: ["ReadiumAdapterMinizip"],
-            path: "Tests/Adapters/MinizipTests",
-            resources: [
-                .copy("Fixtures"),
-            ]
-        ),
-
         .target(
             name: "ReadiumInternal",
             path: "Sources/Internal"

diff --git a/README.md b/README.md
@@ -54,18 +54,18 @@ Note that Carthage will build all Readium modules and their dependencies, but yo
 
 Refer to the following table to know which dependencies are required for each Readium library.
 
-|                        |   `ReadiumShared`  |  `ReadiumStreamer` | `ReadiumNavigator` |    `ReadiumOPDS`   |    `ReadiumLCP`    | `ReadiumAdapterGCDWebServer` | `ReadiumAdapterLCPSQLite` | `ReadiumAdapterMinizip` |
-|------------------------|:------------------:|:------------------:|:------------------:|:------------------:|:------------------:|------------------------------|---------------------------|-------------------------|
-| **`ReadiumShared`**    |                    | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:           | :heavy_check_mark:        | :heavy_check_mark:      |
-| **`ReadiumInternal`**  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |                              |                           |                         |
-| `CryptoSwift`          |                    | :heavy_check_mark: |                    |                    | :heavy_check_mark: |                              |                           |                         |
-| `DifferenceKit`        |                    |                    | :heavy_check_mark: |                    |                    |                              |                           |                         |
-| `ReadiumFuzi`          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |                              |                           |                         |
-| `ReadiumGCDWebServer`  |                    |                    |                    |                    |                    | :heavy_check_mark:           |                           |                         |
-| `ReadiumZIPFoundation` | :heavy_check_mark: |                    |                    |                    | :heavy_check_mark: |                              |                           |                         |
-| `Minizip`              |                    |                    |                    |                    |                    |                              |                           | :heavy_check_mark:      |
-| `SQLite.swift`         |                    |                    |                    |                    |                    |                              | :heavy_check_mark:        |                         |
-| `SwiftSoup`            | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |                              |                           |                         |
+|                        |   `ReadiumShared`  |  `ReadiumStreamer` | `ReadiumNavigator` |    `ReadiumOPDS`   |    `ReadiumLCP`    | `ReadiumAdapterGCDWebServer` | `ReadiumAdapterLCPSQLite` |
+|------------------------|:------------------:|:------------------:|:------------------:|:------------------:|:------------------:|------------------------------|---------------------------|
+| **`ReadiumShared`**    |                    | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:           | :heavy_check_mark:        |
+| **`ReadiumInternal`**  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |                              |                           |
+| `CryptoSwift`          |                    | :heavy_check_mark: |                    |                    | :heavy_check_mark: |                              |                           |
+| `DifferenceKit`        |                    |                    | :heavy_check_mark: |                    |                    |                              |                           |
+| `ReadiumFuzi`          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |                              |                           |
+| `ReadiumGCDWebServer`  |                    |                    |                    |                    |                    | :heavy_check_mark:           |                           |
+| `ReadiumZIPFoundation` | :heavy_check_mark: |                    |                    |                    | :heavy_check_mark: |                              |                           |
+| `Minizip`              | :heavy_check_mark: |                    |                    |                    |                    |                              |                           |
+| `SQLite.swift`         |                    |                    |                    |                    |                    |                              | :heavy_check_mark:        |
+| `SwiftSoup`            | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |                              |                           |
 
 ### CocoaPods
 

diff --git a/...apters/Minizip/MinizipArchiveOpener.swift → ...it/ZIP/Minizip/MinizipArchiveOpener.swift b/...apters/Minizip/MinizipArchiveOpener.swift → ...it/ZIP/Minizip/MinizipArchiveOpener.swift
@@ -5,13 +5,10 @@
 //
 
 import Foundation
-import ReadiumShared
 
 /// An ``ArchiveOpener`` able to open ZIP archives using Minizip.
 ///
-/// Compared to the default ZIPFoundation implementation shipped with
-/// ReadiumShared, the ``MinizipArchiveOpener``:
-///
+/// Compared to the ``ZIPFoundationArchiveOpener`` it:
 /// - Does not support HTTP streaming of ZIP archives.
 /// - Has better performance when reading an LCP-protected package containing
 ///   large deflated ZIP entries (instead of stored).

diff --git a/...s/Adapters/Minizip/MinizipContainer.swift → ...oolkit/ZIP/Minizip/MinizipContainer.swift b/...s/Adapters/Minizip/MinizipContainer.swift → ...oolkit/ZIP/Minizip/MinizipContainer.swift
@@ -6,7 +6,6 @@
 
 import Foundation
 import Minizip
-import ReadiumShared
 
 /// A ZIP ``Container`` using the Minizip library.
 final class MinizipContainer: Container, Loggable {

diff --git a/Sources/Shared/Toolkit/ZIP/ZIPArchiveOpener.swift b/Sources/Shared/Toolkit/ZIP/ZIPArchiveOpener.swift
@@ -7,16 +7,11 @@
 import Foundation
 
 /// An ``ArchiveOpener`` for ZIP resources.
-public class ZIPArchiveOpener: ArchiveOpener {
-    private let opener = ZIPFoundationArchiveOpener()
-
-    public init() {}
-
-    public func open(resource: any Resource, format: Format) async -> Result<ContainerAsset, ArchiveOpenError> {
-        await opener.open(resource: resource, format: format)
-    }
-
-    public func sniffOpen(resource: any Resource) async -> Result<ContainerAsset, ArchiveSniffOpenError> {
-        await opener.sniffOpen(resource: resource)
+public class ZIPArchiveOpener: CompositeArchiveOpener {
+    public init() {
+        super.init([
+            MinizipArchiveOpener(),
+            ZIPFoundationArchiveOpener(),
+        ])
     }
 }