Merge pull request #412 from appwrite/feat-resumable-upload-android

Feat resumable upload android

Author: abnegate

templates/android/library/src/main/java/io/appwrite/Client.kt.twig

@@ -23,6 +23,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.BufferedInputStream
 import java.io.BufferedReader
 import java.io.File
+import java.io.RandomAccessFile
 import java.io.IOException
 import java.net.CookieManager
 import java.net.CookiePolicy
@@ -225,7 +226,7 @@ class Client @JvmOverloads constructor(
         headers:  Map<String, String> = mapOf(), 
         params: Map<String, Any?> = mapOf(),
         responseType: Class<T>,
-        convert: ((Map<String, Any,>) -> T)? = null
+        converter: ((Map<String, Any,>) -> T)? = null
     ): T {
         val filteredParams = params.filterValues { it != null }
 
@@ -261,7 +262,7 @@ class Client @JvmOverloads constructor(
                 .get()
                 .build()
 
-            return awaitResponse(request, responseType, convert)
+            return awaitResponse(request, responseType, converter)
         }
 
         val body = if (MultipartBody.FORM.toString() == headers["content-type"]) {
@@ -298,7 +299,7 @@ class Client @JvmOverloads constructor(
             .method(method, body)
             .build()
 
-        return awaitResponse(request, responseType, convert)
+        return awaitResponse(request, responseType, converter)
     }
 
     /**
@@ -316,8 +317,9 @@ class Client @JvmOverloads constructor(
         headers:  MutableMap<String, String>,
         params: MutableMap<String, Any?>,
         responseType: Class<T>,
-        convert: ((Map<String, Any,>) -> T),
+        converter: ((Map<String, Any,>) -> T),
         paramName: String,
+        idParamName: String? = null,
         onProgress: ((UploadProgress) -> Unit)? = null,
     ): T {
         val file = params[paramName] as File
@@ -330,74 +332,84 @@ class Client @JvmOverloads constructor(
                 file.asRequestBody()
             )
             return call(
-                "POST",
+                method = "POST",
                 path,
                 headers,
                 params,
                 responseType,
-                convert
+                converter
             )
         }
 
-        val input = file.inputStream().buffered()
+        val input = RandomAccessFile(file, "r")
         val buffer = ByteArray(CHUNK_SIZE)
         var offset = 0L
         var result: Map<*, *>? = null
 
-        generateSequence {
-            val readBytes = input.read(buffer)
-            if (readBytes >= 0) {
-                buffer.copyOf(readBytes)
-            } else {
-                input.close()
-                null
-            }
-        }.forEach {
+        if (idParamName?.isNotEmpty() == true && params[idParamName] != "unique()") {
+            // Make a request to check if a file already exists
+            val current = call(
+                method = "GET",
+                path = "$path/${params[idParamName]}",
+                headers = headers,
+                params = emptyMap(),
+                responseType = Map::class.java,
+            )
+            val chunksUploaded = current["chunksUploaded"] as Long
+            offset = (chunksUploaded * CHUNK_SIZE).coerceAtMost(size)
+        }
+
+        while (offset < size) {
+            input.seek(offset)
+            input.read(buffer)
+
             params[paramName] = MultipartBody.Part.createFormData(
                 paramName,
                 file.name,
-                it.toRequestBody()
+                buffer.toRequestBody()
             )
 
             headers["Content-Range"] =
                 "bytes $offset-${((offset + CHUNK_SIZE) - 1).coerceAtMost(size)}/$size"
 
             result = call(
-                "POST",
+                method = "POST",
                 path,
                 headers,
                 params,
-                Map::class.java
+                responseType = Map::class.java
             )
 
             offset += CHUNK_SIZE
-            headers["x-{{ spec.title | caseLower }}-id"] = result!!["\$id"].toString()
-            onProgress?.invoke(UploadProgress(
-                id = result!!["\$id"].toString(),
-                progress = offset.coerceAtMost(size).toDouble()/size * 100,
-                sizeUploaded = offset.coerceAtMost(size),
-                chunksTotal = result!!["chunksTotal"].toString().toInt(),
-                chunksUploaded = result!!["chunksUploaded"].toString().toInt(),
-            ))
+            headers["x-appwrite-id"] = result!!["\$id"].toString()
+            onProgress?.invoke(
+                UploadProgress(
+                    id = result!!["\$id"].toString(),
+                    progress = offset.coerceAtMost(size).toDouble() / size * 100,
+                    sizeUploaded = offset.coerceAtMost(size),
+                    chunksTotal = result!!["chunksTotal"].toString().toInt(),
+                    chunksUploaded = result!!["chunksUploaded"].toString().toInt(),
+                )
+            )
         }
 
-        return convert(result as Map<String, Any>)
+        return converter(result as Map<String, Any>)
     }
 
     /**
      * Await Response
      *
      * @param request
      * @param responseType
-     * @param convert
+     * @param converter
      *
      * @return [T]
      */
     @Throws({{ spec.title | caseUcfirst }}Exception::class)
     private suspend fun <T> awaitResponse(
         request: Request,
         responseType: Class<T>,
-        convert: ((Map<String, Any,>) -> T)? = null
+        converter: ((Map<String, Any,>) -> T)? = null
     ) = suspendCancellableCoroutine<T> {
         http.newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
@@ -463,7 +475,7 @@ class Client @JvmOverloads constructor(
                     object : TypeToken<Map<String, Any>>(){}.type
                 )
                 it.resume(
-                    convert?.invoke(map) ?: map as T
+                    converter?.invoke(map) ?: map as T
                 )
             }
         })

templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig

@@ -114,7 +114,7 @@ class {{ service.name | caseUcfirst }}(client: Client) : Service(client) {
 {{ method.headers|map((header, key) => "            \"#{key}\" to \"#{header}\"")|join(',\n')|raw }}
         )
 {% if method.responseModel %}
-        val convert: (Map<String, Any>) -> {{ _self.resultType(sdk.namespace, method) }} = {
+        val converter: (Map<String, Any>) -> {{ _self.resultType(sdk.namespace, method) }} = {
 {% if method.responseModel == 'any' %}
             it
 {% else %}
@@ -123,20 +123,26 @@ class {{ service.name | caseUcfirst }}(client: Client) : Service(client) {
         }
 {% endif %}
 {% if 'multipart/form-data' in method.consumes %}
+        val 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 %}null{% endif %}
+    
 {% for parameter in method.parameters.all %}
 {% if parameter.type == 'file' %}
         val paramName = "{{ parameter.name }}"
 {% endif %}
+{% if parameter.isUploadID %}
+        idParamName = "{{ parameter.name }}"
+{% endif %}
 {% endfor %}
         return client.chunkedUpload(
             path,
             headers,
             params,
             responseType = {{ _self.resultType(sdk.namespace, method) }}::class.java,
 {% if method.responseModel %}
-            convert = convert,
+            converter,
 {% endif %}
             paramName,
+            idParamName,
             onProgress,
         )
 {% else %}
@@ -147,7 +153,7 @@ class {{ service.name | caseUcfirst }}(client: Client) : Service(client) {
             params,
             responseType = {{ _self.resultType(sdk.namespace, method) }}::class.java,
 {% if method.responseModel %}
-            convert = convert,
+            converter,
 {% endif %}
         )
 {% endif %}