Merge pull request #28 from hartbit/downloader-improvements

Report Downloader progress as a number of bytes instead of percentage

Author: aciidgh

Sources/TSCUtility/Downloader.swift

@@ -30,22 +30,42 @@ public enum DownloaderError: Error {
 /// The `Downloader` protocol abstract away the download of a file with a progress report.
 public protocol Downloader {
 
+    /// The progress closure type. The first arguments contains the number of bytes downloaded, and the second argument
+    /// contains the total number of bytes to download, if known.
+    typealias Progress = (Int64, Int64?) -> Void
+
+    /// The completion closure type. The only argument contains the result type containing the
+    /// `DownloaderError` encountered on failure.
+    typealias Completion = (Result<Void, DownloaderError>) -> Void
+
     /// Downloads a file and keeps the caller updated on the progress and completion.
     ///
     /// - Parameters:
     ///   - url: The `URL` to the file to download.
     ///   - destination: The `AbsolutePath` to download the file to.
-    ///   - progress: A closure to receive the download's progress as a fractional value between `0.0` and `1.0`.
-    ///   - completion: A closure to be notifed of the completion of the download as a `Result` type containing the
-    ///   `DownloaderError` encountered on failure.
+    ///   - progress: A closure to receive the download's progress as number of bytes.
+    ///   - completion: A closure to be notifed of the completion of the download.
     func downloadFile(
         at url: Foundation.URL,
         to destination: AbsolutePath,
-        progress: @escaping (Double) -> Void,
-        completion: @escaping (Result<Void, DownloaderError>) -> Void
+        progress: @escaping Progress,
+        completion: @escaping Completion
     )
 }
 
+extension DownloaderError: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
+        case .clientError(let error):
+            return (error as? LocalizedError)?.errorDescription ?? error.localizedDescription
+        case .serverError(let statusCode):
+            return "invalid status code \(statusCode)"
+        case .fileSystemError(let error):
+            return (error as? LocalizedError)?.errorDescription ?? error.localizedDescription
+        }
+    }
+}
+
 /// A `Downloader` conformance that uses Foundation's `URLSession`.
 public final class FoundationDownloader: NSObject, Downloader {
 
@@ -56,8 +76,8 @@ public final class FoundationDownloader: NSObject, Downloader {
     fileprivate struct Download {
         let task: URLSessionDownloadTask
         let destination: AbsolutePath
-        let progress: (Double) -> Void
-        let completion: (Result<Void, DownloaderError>) -> Void
+        let progress: Downloader.Progress
+        let completion: Downloader.Completion
     }
 
     /// The `URLSession` used for all downloads.
@@ -89,8 +109,8 @@ public final class FoundationDownloader: NSObject, Downloader {
     public func downloadFile(
         at url: Foundation.URL,
         to destination: AbsolutePath,
-        progress: @escaping (Double) -> Void,
-        completion: @escaping (Result<Void, DownloaderError>) -> Void
+        progress: @escaping Downloader.Progress,
+        completion: @escaping Downloader.Completion
     ) {
         queue.addOperation {
             let task = self.session.downloadTask(with: url)
@@ -114,8 +134,9 @@ extension FoundationDownloader: URLSessionDownloadDelegate {
         totalBytesExpectedToWrite: Int64
     ) {
         let download = self.download(for: downloadTask)
-        let progress = Double(totalBytesWritten) / Double(totalBytesExpectedToWrite)
-        download.notifyProgress(progress)
+        let totalBytesToDownload = totalBytesExpectedToWrite != NSURLSessionTransferSizeUnknown ?
+            totalBytesExpectedToWrite : nil
+        download.notifyProgress(bytesDownloaded: totalBytesWritten, totalBytesToDownload: totalBytesToDownload)
     }
 
     public func urlSession(
@@ -162,9 +183,9 @@ extension FoundationDownloader {
 }
 
 extension FoundationDownloader.Download {
-    func notifyProgress(_ progress: Double) {
+    func notifyProgress(bytesDownloaded: Int64, totalBytesToDownload: Int64?) {
         DispatchQueue.global().async {
-            self.progress(progress)
+            self.progress(bytesDownloaded, totalBytesToDownload)
         }
     }
 

Tests/TSCUtilityTests/DownloaderTests.swift

@@ -35,12 +35,13 @@ class DownloaderTests: XCTestCase {
             let successExpectation = XCTestExpectation(description: "success")
             MockURLProtocol.notifyDidStartLoading(for: url, completion: { didStartLoadingExpectation.fulfill() })
 
-            downloader.downloadFile(at: url, to: destination, progress: { progress in
-                if progress.spm_isAlmostEqual(to: 0.5) {
+            downloader.downloadFile(at: url, to: destination, progress: { bytesDownloaded, totalBytesToDownload in
+                switch (bytesDownloaded, totalBytesToDownload) {
+                case (512, 1024):
                     progress50Expectation.fulfill()
-                } else if progress.spm_isAlmostEqual(to: 1) {
+                case (1024, 1024):
                     progress100Expectation.fulfill()
-                } else {
+                default:
                     XCTFail("unexpected progress")
                 }
             }, completion: { result in
@@ -85,10 +86,11 @@ class DownloaderTests: XCTestCase {
         let errorExpectation = XCTestExpectation(description: "error")
         MockURLProtocol.notifyDidStartLoading(for: url, completion: { didStartLoadingExpectation.fulfill() })
 
-        downloader.downloadFile(at: url, to: AbsolutePath("/"), progress: { progress in
-            if progress.spm_isAlmostEqual(to: 0.5) {
+        downloader.downloadFile(at: url, to: AbsolutePath("/"), progress: { bytesDownloaded, totalBytesToDownload in
+            switch (bytesDownloaded, totalBytesToDownload) {
+            case (512, 1024):
                 progress50Expectation.fulfill()
-            } else {
+            default:
                 XCTFail("unexpected progress")
             }
         }, completion: { result in
@@ -135,7 +137,7 @@ class DownloaderTests: XCTestCase {
         let errorExpectation = XCTestExpectation(description: "error")
         MockURLProtocol.notifyDidStartLoading(for: url, completion: { didStartLoadingExpectation.fulfill() })
 
-        downloader.downloadFile(at: url, to: AbsolutePath("/"), progress: { progress in
+        downloader.downloadFile(at: url, to: AbsolutePath("/"), progress: { _, _ in
             XCTFail("unexpected progress")
         }, completion: { result in
             switch result {
@@ -174,7 +176,7 @@ class DownloaderTests: XCTestCase {
         let errorExpectation = XCTestExpectation(description: "error")
         MockURLProtocol.notifyDidStartLoading(for: url, completion: { didStartLoadingExpectation.fulfill() })
 
-        downloader.downloadFile(at: url, to: AbsolutePath("/"), progress: { _ in }, completion: { result in
+        downloader.downloadFile(at: url, to: AbsolutePath("/"), progress: { _, _ in }, completion: { result in
             switch result {
             case .success:
                 XCTFail("unexpected success")