Use FileDownloadDelegate from the AHC package (#171)

`FileDownloadDelegate` was introduced in swift-server/async-http-client#275, which almost directly mirrors the implementation in `carton`. Now that it's available in a released version of AHC, let's delete some code here and replace it with the version from that package.
swiftwasm · Dec 1, 2020 · ef402e7 · ef402e7
1 parent 1c15282
commit ef402e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 84 deletions.
diff --git a/Package.swift b/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
   name: "carton",
   platforms: [.macOS(.v10_15)],
   dependencies: [
-    .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.1.1"),
+    .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.2.2"),
     .package(
       url: "https://github.com/apple/swift-argument-parser.git",
       .upToNextMinor(from: "0.3.0")

diff --git a/Sources/SwiftToolchain/FileDownloadDelegate.swift b/Sources/SwiftToolchain/FileDownloadDelegate.swift
diff --git a/Sources/SwiftToolchain/ToolchainInstallation.swift b/Sources/SwiftToolchain/ToolchainInstallation.swift
@@ -124,8 +124,8 @@ extension ToolchainSystem {
       },
       reportProgress: {
         subject.send(.init(
-          step: $1,
-          total: $0 ?? expectedArchiveSize,
+          step: $0.receivedBytes,
+          total: $0.totalBytes ?? expectedArchiveSize,
           text: "saving to \(path)"
         ))
       }