Merge pull request #53 from divThis/master

Add data chunk to HTTPProgress when Type == .Download
dduan · Oct 29, 2016 · d26b36c · d26b36c
2 parents 91902f0 + cd5d749
commit d26b36c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Docs/QuickStart.playground/Contents.swift b/Docs/QuickStart.playground/Contents.swift
@@ -231,6 +231,7 @@ Just.post(
         p.type // either .Upload or .Download
         p.bytesProcessed
         p.bytesExpectedToProcess
+        p.chunk // present when type == .Download
         p.percent
     }
 ) { r in

diff --git a/Sources/Just/Just.swift b/Sources/Just/Just.swift
@@ -368,6 +368,7 @@ public struct HTTPProgress {
   public let type: Type
   public let bytesProcessed: Int64
   public let bytesExpectedToProcess: Int64
+  public var chunk: Data?
   public var percent: Float {
     return Float(bytesProcessed) / Float(bytesExpectedToProcess)
   }
@@ -1062,7 +1063,8 @@ extension HTTP: URLSessionTaskDelegate, URLSessionDataDelegate {
         HTTPProgress(
           type: .upload,
           bytesProcessed: totalBytesSent,
-          bytesExpectedToProcess: totalBytesExpectedToSend
+          bytesExpectedToProcess: totalBytesExpectedToSend,
+          chunk: nil
         )
       )
     }
@@ -1076,7 +1078,8 @@ extension HTTP: URLSessionTaskDelegate, URLSessionDataDelegate {
         HTTPProgress(
           type: .download,
           bytesProcessed: dataTask.countOfBytesReceived,
-          bytesExpectedToProcess: dataTask.countOfBytesExpectedToReceive
+          bytesExpectedToProcess: dataTask.countOfBytesExpectedToReceive,
+          chunk: data
         )
       )
     }