Fix normalization of URLs in MinizipContainer (#553)

readium · Feb 11, 2025 · 00efcc9 · 00efcc9
1 parent 8219531
commit 00efcc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Sources/Shared/Publication/Link.swift b/Sources/Shared/Publication/Link.swift
@@ -167,7 +167,7 @@ public struct Link: JSONEquatable, Hashable, Sendable {
         if href.isEmpty {
             href = "#"
         }
-        return (AnyURL(string: href) ?? AnyURL(legacyHREF: href))!
+        return (AnyURL(string: href) ?? AnyURL(legacyHREF: href))!.normalized
     }
 
     /// Returns the URL represented by this link's HREF, resolved to the given
@@ -180,7 +180,7 @@ public struct Link: JSONEquatable, Hashable, Sendable {
         parameters: [String: LosslessStringConvertible] = [:]
     ) -> AnyURL {
         let url = url(parameters: parameters)
-        return baseURL?.anyURL.resolve(url) ?? url
+        return baseURL?.anyURL.resolve(url)?.normalized ?? url
     }
 
     // MARK: URI Template

diff --git a/Sources/Shared/Toolkit/ZIP/Minizip/MinizipContainer.swift b/Sources/Shared/Toolkit/ZIP/Minizip/MinizipContainer.swift
@@ -60,7 +60,7 @@ final class MinizipContainer: Container, Loggable {
 
     subscript(url: any URLConvertible) -> (any Resource)? {
         guard
-            let url = url.relativeURL,
+            let url = url.relativeURL?.normalized,
             let metadata = entriesMetadata[url]
         else {
             return nil