Pass progress info

Author: danieleggert

CoreFoundation/URL.subproj/CFURLSessionInterface.c

@@ -92,6 +92,9 @@ CFURLSession_EasyCode CFURLSession_easy_setopt_sc(CFURLSessionEasyHandle _Nonnul
 CFURLSession_EasyCode CFURLSession_easy_setopt_seek(CFURLSessionEasyHandle _Nonnull curl, CFURLSession_Option option, CFURLSessionSeekCallback * _Nullable a) {
     return (CFURLSession_EasyCode) curl_easy_setopt(curl, option, a);
 }
+CFURLSession_EasyCode CFURLSession_easy_setopt_tc(CFURLSessionEasyHandle _Nonnull curl, CFURLSession_Option option, CFURLSessionTransferInfoCallback * _Nullable a) {
+    return (CFURLSession_EasyCode) curl_easy_setopt(curl, option, a);
+}
 CFURLSession_EasyCode CFURLSession_easy_getinfo_long(CFURLSessionEasyHandle _Nonnull curl, CFURLSession_Info info, long *_Nonnull a) {
     return (CFURLSession_EasyCode) curl_easy_getinfo(curl, info, a);
 }

CoreFoundation/URL.subproj/CFURLSessionInterface.h

@@ -728,6 +728,8 @@ typedef int (CFURLSessionSocketOptionCallback)(void *_Nullable clientp, int fd,
 CF_EXPORT CFURLSession_EasyCode CFURLSession_easy_setopt_sc(CFURLSessionEasyHandle _Nonnull curl, CFURLSession_Option option, CFURLSessionSocketOptionCallback * _Nullable a);
 typedef int (CFURLSessionSeekCallback)(void *_Nullable userp, int64_t offset, int origin);
 CF_EXPORT CFURLSession_EasyCode CFURLSession_easy_setopt_seek(CFURLSessionEasyHandle _Nonnull curl, CFURLSession_Option option, CFURLSessionSeekCallback * _Nullable a);
+typedef int (CFURLSessionTransferInfoCallback)(void *_Nullable userp, int64_t dltotal, int64_t dlnow, int64_t ultotal, int64_t ulnow);
+CF_EXPORT CFURLSession_EasyCode CFURLSession_easy_setopt_tc(CFURLSessionEasyHandle _Nonnull curl, CFURLSession_Option option, CFURLSessionTransferInfoCallback * _Nullable a);
 
 CF_EXPORT CFURLSession_EasyCode CFURLSession_easy_getinfo_long(CFURLSessionEasyHandle _Nonnull curl, CFURLSession_Info info, long *_Nonnull a);
 CF_EXPORT CFURLSession_EasyCode CFURLSession_easy_getinfo_charp(CFURLSessionEasyHandle _Nonnull curl, CFURLSession_Info info, char *_Nonnull*_Nonnull a);

Foundation/NSURLSession+libcurl.swift

@@ -1227,6 +1227,8 @@ internal protocol EasyHandleDelegate: class {
     func transferCompleted(withErrorCode errorCode: Int?)
     /// Seek the input stream to the given position
     func seekInputStream(to position: UInt64) throws
+    /// Gets called during the transfer to update progress.
+    func updateProgressMeter(propgress: NSURLSessionTask.EasyHandle.Progress)
 }
 extension NSURLSessionTask.EasyHandle {
     func setVerboseModeOn(flag: Bool) {
@@ -1551,6 +1553,13 @@ private extension NSURLSessionTask.EasyHandle {
             let handle = Unmanaged<NSURLSessionTask.EasyHandle>.fromOpaque(data).takeUnretainedValue()
             return handle.seekInputStream(offset: offset, origin: origin)
         }).asError()
+        // progress
+        try! CFURLSession_easy_setopt_ptr(rawHandle, CFURLSession_OptionPROGRESSDATA, UnsafeMutablePointer<Void>(unsafeAddress(of: self))).asError()
+        try! CFURLSession_easy_setopt_tc(rawHandle, CFURLSession_OptionXFERINFOFUNCTION, { (data: UnsafeMutablePointer<Void>, dltotal :Int64, dlnow: Int64, ultotal: Int64, ulnow: Int64) -> Int32 in
+            let handle = Unmanaged<NSURLSessionTask.EasyHandle>.fromOpaque(data).takeUnretainedValue()
+            handle.updateProgressMeter(Progress(totalBytesSent: ulnow, totalBytesExpectedToSend: ultotal, totalBytesReceived: dlnow, totalBytesExpectedToReceive: dltotal))
+            return 0
+        })
     }
     /// This callback function gets called by libcurl when it receives body
     /// data.
@@ -1629,6 +1638,9 @@ private extension NSURLSessionTask.EasyHandle {
         //     <https://en.wikipedia.org/wiki/Type_of_service>
         //     <https://en.wikipedia.org/wiki/Quality_of_service>
     }
+    func updateProgressMeter(propgress: Progress) {
+        delegate.updateProgressMeter(propgress)
+    }
     func seekInputStream(offset offset: Int64, origin: CInt) -> CInt {
         printNSURLSessionDebug("[EasyHandle] -> seek callback \(offset) \(origin)")
         let d: CInt = {
@@ -1646,6 +1658,23 @@ private extension NSURLSessionTask.EasyHandle {
     }
 }
 
+extension NSURLSessionTask.EasyHandle {
+    /// The progress of a transfer.
+    ///
+    /// The number of bytes that we expect to download and upload, and the
+    /// number of bytes downloaded and uploaded so far.
+    ///
+    /// Unknown values will be set to zero. E.g. if the number of bytes
+    /// expected to be downloaded is unknown, `totalBytesExpectedToReceive`
+    /// will be zero.
+    struct Progress {
+        let totalBytesSent: Int64
+        let totalBytesExpectedToSend: Int64
+        let totalBytesReceived: Int64
+        let totalBytesExpectedToReceive: Int64
+    }
+}
+
 extension NSURLSessionTask.EasyHandle {
     /// A simple wrapper / helper for libcurl’s `slist`.
     ///

Foundation/NSURLSession.swift

@@ -1112,6 +1112,11 @@ extension NSURLSessionTask: EasyHandleDelegate {
         // We will reset the body sourse and seek forward.
         NSUnimplemented()
     }
+    func updateProgressMeter(propgress: NSURLSessionTask.EasyHandle.Progress) {
+        //TODO: Update progress. Note that a single NSURLSessionTask might
+        // perform multiple transfers. The values in `progress` are only for
+        // the current transfer.
+    }
 }
 
 /// State Transfers