Merge pull request #1029 from nethraravindran/totalDownload-branch

Author: swift-ci

Foundation/NSURLSession/NSURLSessionTask.swift

@@ -27,10 +27,8 @@ import Dispatch
 open class URLSessionTask : NSObject, NSCopying {
     /// How many times the task has been suspended, 0 indicating a running task.
     internal var suspendCount = 1
-    internal var totalDownloaded = 0
     internal var session: URLSessionProtocol! //change to nil when task completes
     internal let body: _Body
-    internal let tempFileURL: URL
     fileprivate var _protocol: URLProtocol! = nil
 
     /// All operations must run on this queue.
@@ -52,9 +50,6 @@ open class URLSessionTask : NSObject, NSCopying {
         originalRequest = nil
         body = .none
         workQueue = DispatchQueue(label: "URLSessionTask.notused.0")
-        let fileName = NSTemporaryDirectory() + NSUUID().uuidString + ".tmp"
-        _ = FileManager.default.createFile(atPath: fileName, contents: nil)
-        self.tempFileURL = URL(fileURLWithPath: fileName)
         super.init()
     }
     /// Create a data task. If there is a httpBody in the URLRequest, use that as a parameter
@@ -71,9 +66,6 @@ open class URLSessionTask : NSObject, NSCopying {
         self.taskIdentifier = taskIdentifier
         self.originalRequest = request
         self.body = body
-        let fileName = NSTemporaryDirectory() + NSUUID().uuidString + ".tmp"
-        _ = FileManager.default.createFile(atPath: fileName, contents: nil)
-        self.tempFileURL = URL(fileURLWithPath: fileName)
         super.init()
         if session.configuration.protocolClasses != nil {
             guard let protocolClasses = session.configuration.protocolClasses else { fatalError() }

Foundation/NSURLSession/http/HTTPURLProtocol.swift

@@ -13,16 +13,24 @@ import Dispatch
 internal class _HTTPURLProtocol: URLProtocol {
 
     fileprivate var easyHandle: _EasyHandle!
+    fileprivate var totalDownloaded = 0
+    fileprivate var tempFileURL: URL
 
     public override required init(task: URLSessionTask, cachedResponse: CachedURLResponse?, client: URLProtocolClient?) {
         self.internalState = _InternalState.initial
+        let fileName = NSTemporaryDirectory() + NSUUID().uuidString + ".tmp"
+        _ = FileManager.default.createFile(atPath: fileName, contents: nil)
+        self.tempFileURL = URL(fileURLWithPath: fileName)
         super.init(request: task.originalRequest!, cachedResponse: cachedResponse, client: client)
         self.task = task
         self.easyHandle = _EasyHandle(delegate: self)
     }
 
     public override required init(request: URLRequest, cachedResponse: CachedURLResponse?, client: URLProtocolClient?) {
         self.internalState = _InternalState.initial
+        let fileName = NSTemporaryDirectory() + NSUUID().uuidString + ".tmp"
+        _ = FileManager.default.createFile(atPath: fileName, contents: nil)
+        self.tempFileURL = URL(fileURLWithPath: fileName)
         super.init(request: request, cachedResponse: cachedResponse, client: client)
         self.easyHandle = _EasyHandle(delegate: self)
     }
@@ -399,8 +407,8 @@ internal extension _HTTPURLProtocol {
             return .inMemory(nil)
         case .downloadCompletionHandler:
             // Data needs to be written to a file (i.e. a download task).
-            let fileHandle = try! FileHandle(forWritingTo: task.tempFileURL)
-            return .toFile(task.tempFileURL, fileHandle)
+            let fileHandle = try! FileHandle(forWritingTo: self.tempFileURL)
+            return .toFile(self.tempFileURL, fileHandle)
         }
     }
 }
@@ -453,19 +461,19 @@ extension _HTTPURLProtocol: _EasyHandleDelegate {
             let downloadDelegate = delegate as? URLSessionDownloadDelegate,
             let task = self.task as? URLSessionDownloadTask {
             guard let s = self.task?.session as? URLSession else { fatalError() }
-            let fileHandle = try! FileHandle(forWritingTo: task.tempFileURL)
+            let fileHandle = try! FileHandle(forWritingTo: self.tempFileURL)
             _ = fileHandle.seekToEndOfFile()
             fileHandle.write(data)
-            self.task?.totalDownloaded += data.count
+            self.totalDownloaded += data.count
 
             s.delegateQueue.addOperation {
-                downloadDelegate.urlSession(s, downloadTask: task, didWriteData: Int64(data.count), totalBytesWritten: Int64(t.totalDownloaded),
+                downloadDelegate.urlSession(s, downloadTask: task, didWriteData: Int64(data.count), totalBytesWritten: Int64(self.totalDownloaded),
                                             totalBytesExpectedToWrite: Int64(self.easyHandle.fileLength))
             }
-            if Int(self.easyHandle.fileLength) == self.task?.totalDownloaded {
+            if Int(self.easyHandle.fileLength) == self.totalDownloaded {
                 fileHandle.closeFile()
                 s.delegateQueue.addOperation {
-                    downloadDelegate.urlSession(s, downloadTask: task, didFinishDownloadingTo: t.tempFileURL)
+                    downloadDelegate.urlSession(s, downloadTask: task, didFinishDownloadingTo: self.tempFileURL)
                 }
             }
         }