Make the AudioPublicationManifestAugmentor asynchronous (#627)

Author: grighakobian

Package.resolved

@@ -56,7 +56,7 @@ public final class AudioParser: PublicationParser {
         }
 
         let container = SingleResourceContainer(publication: asset)
-        return makeBuilder(
+        return await makeBuilder(
             container: container,
             readingOrder: [(container.entry, asset.format)],
             title: nil
@@ -72,8 +72,8 @@ public final class AudioParser: PublicationParser {
         }
 
         return await makeReadingOrder(for: asset.container)
-            .flatMap { readingOrder in
-                makeBuilder(
+            .asyncFlatMap { readingOrder in
+                await makeBuilder(
                     container: asset.container,
                     readingOrder: readingOrder,
                     title: asset.container.guessTitle(ignoring: ignores)
@@ -132,7 +132,7 @@ public final class AudioParser: PublicationParser {
         container: Container,
         readingOrder: [(AnyURL, Format)],
         title: String?
-    ) -> Result<Publication.Builder, PublicationParseError> {
+    ) async -> Result<Publication.Builder, PublicationParseError> {
         guard !readingOrder.isEmpty else {
             return .failure(.reading(.decoding("No audio resources found in the publication")))
         }
@@ -150,7 +150,7 @@ public final class AudioParser: PublicationParser {
             }
         )
 
-        let augmented = manifestAugmentor.augment(manifest, using: container)
+        let augmented = await manifestAugmentor.augment(manifest, using: container)
 
         return .success(Publication.Builder(
             manifest: augmented.manifest,

Sources/Streamer/Parser/Audio/AudioParser.swift

@@ -12,12 +12,17 @@ import UIKit
 /// Implements a strategy to augment a `Manifest` of an audio publication with additional metadata and
 /// cover, for example by looking into the audio files metadata.
 public protocol AudioPublicationManifestAugmentor {
-    func augment(_ baseManifest: Manifest, using container: Container) -> AudioPublicationAugmentedManifest
+    func augment(_ baseManifest: Manifest, using container: Container) async -> AudioPublicationAugmentedManifest
 }
 
 public struct AudioPublicationAugmentedManifest {
-    var manifest: Manifest
-    var cover: UIImage?
+    public var manifest: Manifest
+    public var cover: UIImage?
+
+    public init(manifest: Manifest, cover: UIImage? = nil) {
+        self.manifest = manifest
+        self.cover = cover
+    }
 }
 
 /// An `AudioPublicationManifestAugmentor` using AVFoundation to retrieve the audio metadata.
@@ -26,7 +31,7 @@ public struct AudioPublicationAugmentedManifest {
 public final class AVAudioPublicationManifestAugmentor: AudioPublicationManifestAugmentor {
     public init() {}
 
-    public func augment(_ manifest: Manifest, using container: Container) -> AudioPublicationAugmentedManifest {
+    public func augment(_ manifest: Manifest, using container: Container) async -> AudioPublicationAugmentedManifest {
         let avAssets = manifest.readingOrder.map { link in
             container[link.url()]?.sourceURL?.fileURL
                 .map { AVURLAsset(url: $0.url, options: [AVURLAssetPreferPreciseDurationAndTimingKey: true]) }