|
@@ -194,7 +194,8 @@ public class Network {
|
|
|
|
|
|
public func uploadHTTP(_ endUrl: String, files: [URL] = [], filename: [String] = [], parameters: [String : Any] = [:], completion: @escaping (Bool, Double, [String:Any]?)->()) -> UploadRequest {
|
|
|
|
|
|
- var filesIn = files
|
|
|
+ var filesIn = [URL]()
|
|
|
+ filesIn.append(contentsOf: files)
|
|
|
|
|
|
if !filename.isEmpty {
|
|
|
do {
|
|
@@ -220,23 +221,32 @@ public class Network {
|
|
|
|
|
|
for i in 0..<filesIn.count {
|
|
|
multipartFormData.append(filesIn[i], withName: "file\(i+1)", fileName: filesIn[i].lastPathComponent, mimeType: "application/octet-stream")
|
|
|
+ Nexilis.putUploadFile(forKey: filesIn[i].lastPathComponent, uploader: self)
|
|
|
//print(multipartFormData)
|
|
|
}
|
|
|
|
|
|
}, to: endUrl)
|
|
|
.responseJSON { result in
|
|
|
if let successResponse = result.value as? [String:Any] {
|
|
|
- //print("Response success")
|
|
|
+ print("Response success")
|
|
|
+ for url in filesIn {
|
|
|
+ Nexilis.removeUploadFile(forKey: url.lastPathComponent)
|
|
|
+ }
|
|
|
completion(true,100,successResponse)
|
|
|
+
|
|
|
}
|
|
|
else {
|
|
|
let statusCode = result.response?.statusCode
|
|
|
- //print("Response fail: \(statusCode)")
|
|
|
+ print("Response fail: \(statusCode)")
|
|
|
completion(false,0,nil)
|
|
|
}
|
|
|
}
|
|
|
.uploadProgress { progress in
|
|
|
- completion(!progress.isCancelled,progress.fractionCompleted*100,nil)
|
|
|
+ print("Response progress: \(progress.fractionCompleted*100)")
|
|
|
+ let frac = progress.fractionCompleted*100
|
|
|
+ if frac != 100.0 {
|
|
|
+ completion(!progress.isCancelled,frac,nil)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return uploadRequest
|