Fix tests

readium · Jul 10, 2024 · 5b41ea9 · 5b41ea9
1 parent ce78cb3
commit 5b41ea9
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 566 deletions.
diff --git a/Sources/Shared/Toolkit/File/FileContainer.swift b/Sources/Shared/Toolkit/File/FileContainer.swift
@@ -16,7 +16,7 @@ public final class FileContainer: Container, Loggable {
     /// Provides access to a collection of local files.
     public init(files: [RelativeURL: FileURL]) {
         self.files = files
-        entries = Set(files.keys.map(\.anyURL))
+        entries = Set(files.keys.map(\.anyURL.normalized))
     }
 
     /// Provides access to the given local `file` at `href`.
@@ -26,7 +26,7 @@ public final class FileContainer: Container, Loggable {
 
     public subscript(url: any URLConvertible) -> Resource? {
         guard
-            let url = url.relativeURL,
+            let url = url.relativeURL?.normalized,
             let file = files[url]
         else {
             return nil

diff --git a/Sources/Streamer/Parser/Audio/AudioParser.swift b/Sources/Streamer/Parser/Audio/AudioParser.swift
@@ -76,7 +76,7 @@ public final class AudioParser: PublicationParser {
                 makeBuilder(
                     container: asset.container,
                     readingOrder: readingOrder,
-                    title: asset.container.guessTitle()
+                    title: asset.container.guessTitle(ignoring: ignores)
                 )
             }
     }

diff --git a/Sources/Streamer/Parser/Image/ImageParser.swift b/Sources/Streamer/Parser/Image/ImageParser.swift
@@ -71,7 +71,7 @@ public final class ImageParser: PublicationParser {
                 makeBuilder(
                     container: asset.container,
                     readingOrder: readingOrder,
-                    title: asset.container.guessTitle()
+                    title: asset.container.guessTitle(ignoring: ignores)
                 )
             }
     }

diff --git a/Sources/Streamer/Toolkit/Extensions/Container.swift b/Sources/Streamer/Toolkit/Extensions/Container.swift
@@ -64,11 +64,11 @@ extension Container {
     ///
     /// If the HREFs contain a single root directory, we assume it is the
     /// title. This is often the case for example with CBZ files.
-    func guessTitle() -> String? {
+    func guessTitle(ignoring: (AnyURL) -> Bool = { _ in false }) -> String? {
         var title: String?
 
         for url in entries {
-            if url.lastPathSegment?.hasPrefix(".") == true || url.lastPathSegment == "Thumbs.db" {
+            if ignoring(url) {
                 continue
             }
             let segments = url.pathSegments

diff --git a/Tests/SharedTests/Fetcher/ArchiveFetcherTests.swift b/Tests/SharedTests/Fetcher/ArchiveFetcherTests.swift
diff --git a/Tests/SharedTests/Fetcher/FileFetcherTests.swift b/Tests/SharedTests/Fetcher/FileFetcherTests.swift
diff --git a/Tests/SharedTests/Fixtures/Fetcher/directory/subdirectory/hello.mp3 b/Tests/SharedTests/Fixtures/Fetcher/directory/subdirectory/hello.mp3
diff --git a/Tests/SharedTests/Fixtures/Fetcher/directory/subdirectory/text2.txt b/Tests/SharedTests/Fixtures/Fetcher/directory/subdirectory/text2.txt
diff --git a/Tests/SharedTests/Fixtures/Fetcher/directory/text1.txt b/Tests/SharedTests/Fixtures/Fetcher/directory/text1.txt
diff --git a/Tests/SharedTests/Fixtures/Fetcher/text.txt b/Tests/SharedTests/Fixtures/Fetcher/text.txt
diff --git a/Tests/SharedTests/ProxyContainer.swift b/Tests/SharedTests/ProxyContainer.swift
@@ -15,6 +15,7 @@ final class ProxyContainer: Container {
         self.retrieve = retrieve
     }
 
+    let sourceURL: AbsoluteURL? = nil
     let entries: Set<AnyURL>
 
     subscript(url: any URLConvertible) -> (any Resource)? {

diff --git a/Tests/SharedTests/Publication/Asset/FileAssetTests.swift b/Tests/SharedTests/Publication/Asset/FileAssetTests.swift