Merge pull request #415 from appwrite/feat-resumable-upload-swift

Feat resumable upload swift

Author: abnegate

templates/swift/Sources/Client.swift.twig

@@ -21,10 +21,11 @@ open class Client {
     open var headers: [String: String] = [
         "content-type": "",
         "x-sdk-version": "{{spec.title | caseDash}}:{{ language.name | caseLower }}:{{ sdk.version }}"{% if spec.global.defaultHeaders | length > 0 %},{% endif %}
+
 {% for key,header in spec.global.defaultHeaders %}
         "{{key}}": "{{header}}"{% if not loop.last %},{% endif %}
-{% endfor %}
 
+{% endfor %}
     ]
 
     open var config: [String: String] = [:]
@@ -228,7 +229,7 @@ open class Client {
         headers: [String: String] = [:],
         params: [String: Any?] = [:],
         sink: ((ByteBuffer) -> Void)? = nil,
-        convert: (([String: Any]) -> T)? = nil,
+        converter: (([String: Any]) -> T)? = nil,
         completion: ((Result<T, {{ spec.title | caseUcfirst }}Error>) -> Void)? = nil
     ) {
         let validParams = params.filter { $0.value != nil }
@@ -259,7 +260,7 @@ open class Client {
         request.addDomainCookies()
 
         if "GET" == method {
-            execute(request, convert: convert, completion: completion)
+            execute(request, converter: converter, completion: completion)
             return
         }
 
@@ -272,7 +273,7 @@ open class Client {
             return
         }
 
-        execute(request, withSink: sink, convert: convert, completion: completion)
+        execute(request, withSink: sink, converter: converter, completion: completion)
     }
 
     private func buildBody(
@@ -289,7 +290,7 @@ open class Client {
     private func execute<T>(
         _ request: HTTPClient.Request,
         withSink bufferSink: ((ByteBuffer) -> Void)? = nil,
-        convert: (([String: Any]) -> T)? = nil,
+        converter: (([String: Any]) -> T)? = nil,
         completion: ((Result<T, {{ spec.title | caseUcfirst}}Error>) -> Void)? = nil
     ) {
         if bufferSink == nil {
@@ -341,7 +342,7 @@ open class Client {
                         let dict = try! JSONSerialization
                             .jsonObject(with: response.body!) as? [String: Any]
 
-                        completion(.success(convert?(dict!) ?? dict! as! T))
+                        completion(.success(converter?(dict!) ?? dict! as! T))
                     }
                 default:
                     var message = ""
@@ -384,7 +385,8 @@ open class Client {
         headers: inout [String: String],
         params: inout [String: Any?],
         paramName: String,
-        convert: (([String: Any]) -> T)? = nil,
+        idParamName: String? = nil,
+        converter: (([String: Any]) -> T)? = nil,
         onProgress: ((UploadProgress) -> Void)? = nil,
         completion: ((Result<T, {{ spec.title | caseUcfirst }}Error>) -> Void)? = nil
     ) {
@@ -397,20 +399,44 @@ open class Client {
                 path: path,
                 headers: headers,
                 params: params,
-                convert: convert,
+                converter: converter,
                 completion: completion
             )
             return
         }
 
-        var input = file.buffer
+        let input = file.buffer
         var offset = 0
         var result = [String:Any]()
         let group = DispatchGroup()
 
+        if idParamName != nil && params[idParamName!] as! String != "unique()" {
+            // Make a request to check if a file already exists
+            group.enter()
+            call(
+                method: "GET",
+                path: path + "/" + (params[idParamName!] as! String),
+                headers: headers,
+                params: [:],
+                converter: { return $0 }
+            ) { response in
+                switch response {
+                case let .success(map):
+                    let chunksUploaded = map["chunksUploaded"] as! Int
+                    offset = min(size, (chunksUploaded * Client.chunkSize))
+                    group.leave()
+                case let .failure(error):
+                    completion?(.failure(error))
+                    group.leave()
+                    return
+                }
+            }
+            group.wait()
+        }
+
         while offset < size {
-            let slice = input.readSlice(length: Client.chunkSize)
-                ?? input.readSlice(length: Int(size - offset))
+            let slice = input.getSlice(at: offset, length: Client.chunkSize)
+                ?? input.getSlice(at: offset, length: Int(size - offset))
 
             params[paramName] = File(
                 name: file.name,
@@ -426,7 +452,7 @@ open class Client {
                 path: path,
                 headers: headers,
                 params: params,
-                convert: { return $0 }
+                converter: { return $0 }
             ) { response in
                 switch response {
                 case let .success(map):
@@ -451,7 +477,7 @@ open class Client {
             ))
         }
 
-        completion?(.success(convert!(result)))
+        completion?(.success(converter!(result)))
     }
 
 

templates/swift/Sources/Services/Service.swift.twig

@@ -37,14 +37,12 @@ open class {{ service.name | caseUcfirst }}: Service {
         completion: ((Result<{{ _self.resultType(spec, method) }}, {{ spec.title | caseUcfirst}}Error>) -> Void)? = nil
     ) {
 {% if method.parameters.path %}        var{% else %}        let{% endif %} path: String = "{{ method.path }}"
-
 {% for parameter in method.parameters.path %}
         path = path.replacingOccurrences(
           of: "{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}",
           with: {% if method.parameters.path %}{{ parameter.name | caseCamel | escapeKeyword }}{% else %}""{% endif %}
 
         )
-
 {% endfor %}
 {% if method.parameters.query or method.parameters.body or method.parameters.formData or _self.methodNeedsSecurityParameters(method) %}
         {% if 'multipart/form-data' in method.consumes %}var{% else %}let{% endif %} params: [String: Any?] = [
@@ -66,7 +64,6 @@ open class {{ service.name | caseUcfirst }}: Service {
 {% if method.parameters.query or method.parameters.body or method.parameters.formData or _self.methodNeedsSecurityParameters(method) %}
         ]
 {% endif %}
-
 {% if method.type == 'webAuth' %}
         let query = "?\(client.parametersToQueryString(params: params))"
         let url = URL(string: client.endPoint + path + query)!
@@ -89,31 +86,31 @@ open class {{ service.name | caseUcfirst }}: Service {
         {% if 'multipart/form-data' in method.consumes %}var{% else %}let{% endif %} headers: [String: String] = [
 {{ method.headers|map((header, key) => "            \"#{key}\": \"#{header}\"")|join(',\n')|raw }}
         ]
-
 {% if method.responseModel %}
-        let convert: ([String: Any]) -> {{ _self.resultType(spec, method) }} = { dict in
+        let converter: ([String: Any]) -> {{ _self.resultType(spec, method) }} = { dict in
 {% if method.responseModel == 'any' %}
             return dict
 {% else %}
             return {{ spec.title | caseUcfirst}}Models.{{method.responseModel | caseUcfirst}}.from(map: dict)
 {% endif %}
         }
-
 {% endif %}
 {% if 'multipart/form-data' in method.consumes %}
+        let idParamName: String? = {% if method.parameters.all | filter(p => p.isUploadID) | length > 0 %}{% for parameter in method.parameters.all | filter(parameter => parameter.isUploadID) %}"{{ parameter.name }}"{% endfor %}{% else %}nil{% endif %}
+
 {% for parameter in method.parameters.all %}
 {% if parameter.type == 'file' %}
         let paramName = "{{ parameter.name }}"
-
 {% endif %}
 {% endfor %}
         client.chunkedUpload(
             path: path,
             headers: &headers,
             params: &params,
             paramName: paramName,
+            idParamName: idParamName,
 {% if method.responseModel %}
-            convert: convert,
+            converter: converter,
 {% endif %}
             onProgress: onProgress,
             completion: completion
@@ -125,7 +122,7 @@ open class {{ service.name | caseUcfirst }}: Service {
             headers: headers,
             params: params,
 {% if method.responseModel %}
-            convert: convert,
+            converter: converter,
 {% endif %}
             completion: completion
         )