Merge 69edf01 into b6e7421

evandcoleman · Dec 1, 2021 · 2e47ea6 · 2e47ea6
2 parents b6e7421 + 69edf01
commit 2e47ea6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Sources/Scipio/main.swift b/Sources/Scipio/main.swift
@@ -10,7 +10,7 @@ extension Command {
       .init(
         commandName: "Scipio",
         abstract: "A program to pre-build and cache Swift packages",
-        version: "0.2.4",
+        version: "0.2.5",
         subcommands: [
             Command.Run.self,
             Command.Build.self,

diff --git a/Sources/ScipioKit/Cache Engines/CacheEngineDelegator.swift b/Sources/ScipioKit/Cache Engines/CacheEngineDelegator.swift
@@ -139,7 +139,7 @@ extension CacheEngineDelegator {
             .setFailureType(to: Error.self)
             .flatMap(maxPublishers: .max(1)) { artifact -> AnyPublisher<CachedArtifact, Error> in
                 return self.exists(artifact: artifact)
-                    .flatMap { exists -> AnyPublisher<CachedArtifact, Error> in
+                    .tryFlatMap { exists -> AnyPublisher<CachedArtifact, Error> in
                         if !exists || force {
                             log.info("☁️ Uploading \(artifact.name)...")
 
@@ -151,9 +151,15 @@ extension CacheEngineDelegator {
                                 return self.put(artifact: artifact)
                             }
                         } else {
-                            return Just(CachedArtifact(name: artifact.name, parentName: artifact.parentName, url: self.downloadUrl(for: artifact)))
-                                .setFailureType(to: Error.self)
-                                .eraseToAnyPublisher()
+                            if let compressed = artifact.base as? CompressedArtifact {
+                                return Just(try CachedArtifact(name: artifact.name, parentName: artifact.parentName, url: self.downloadUrl(for: artifact), localPath: compressed.path))
+                                    .setFailureType(to: Error.self)
+                                    .eraseToAnyPublisher()
+                            } else {
+                                return Just(CachedArtifact(name: artifact.name, parentName: artifact.parentName, url: self.downloadUrl(for: artifact)))
+                                    .setFailureType(to: Error.self)
+                                    .eraseToAnyPublisher()
+                            }
                         }
                     }
                     .eraseToAnyPublisher()