Merge remote-tracking branch 'origin/0.14.x' into feat-resumable-upload-kotlin

Author: abnegate

templates/dart/lib/src/chunked_upload_io.dart.twig

@@ -66,8 +66,8 @@ Future<Response> chunkedUpload({
     }
     final progress = UploadProgress(
       $id: res.data['\$id'] ?? '',
-      progress: min(offset,size)/size * 100,
-      sizeUploaded: min(offset,size),
+      progress: min(offset-1,size)/size * 100,
+      sizeUploaded: min(offset-1,size),
       chunksTotal: res.data['chunksTotal'] ?? 0,
       chunksUploaded: res.data['chunksUploaded'] ?? 0,
     );

templates/php/src/Services/Service.php.twig

@@ -72,36 +72,51 @@ class {{ service.name | caseUcfirst }} extends Service
                 '{{ key }}' => '{{ header }}',
 {% endfor %}
                 ], $params);
-        } else {
-            $id = '';
-            $handle = @fopen(${{ parameter.name | caseCamel }}, "rb");
-            $counter = 0;
-            $headers = ['content-type' => 'multipart/form-data'];
-            while (!feof($handle)) {
-                $params['{{ parameter.name }}'] = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(@fread($handle, Client::CHUNK_SIZE)), $mimeType, $postedName);
-                $headers['content-range'] = 'bytes ' . ($counter * Client::CHUNK_SIZE) . '-' . min(((($counter * Client::CHUNK_SIZE) + Client::CHUNK_SIZE) - 1), $size) . '/' . $size;
-                if(!empty($id)) {
-                    $headers['x-{{spec.title | caseLower }}-id'] = $id;
-                }
-                $response = $this->client->call(Client::METHOD_POST, $path, $headers, $params);
-                $counter++;
-                if(empty($id)) {
-                    $id = $response['$id'];
-                }
-                if($onProgress !== null) {
-                    $end = min(((($counter * Client::CHUNK_SIZE) + Client::CHUNK_SIZE) - 1), $size);
-                    $onProgress([
-                        '$id' => $response['$id'],
-                        'progress' => min(($counter+1) * Client::CHUNK_SIZE, $size) / $size * 100,
-                        'sizeUploaded' => $end + 1,
-                        'chunksTotal' => $response['chunksTotal'],
-                        'chunksUploaded' => $response['chunksUploaded']
-                    ]);
+        }
+
+        $id = '';
+        $counter = 0;
+
+{% for parameter in method.parameters.all %}
+{% if parameter.isUploadID %}
+            if(${{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') {
+                try {
+                    $response = $this->client->call(Client::METHOD_GET, new URL($path . '/' . {{ parameter.name }}), headers);
+                    $counter = $response['chunksUploaded'] ?? 0;
+                } catch(\Exception $e) {
                 }
             }
-            @fclose($handle);
-            return $response;
+{% endif %}
+{% endfor %}
+
+        $headers = ['content-type' => 'multipart/form-data'];
+        $handle = @fopen(${{ parameter.name | caseCamel }}, "rb");
+        $start = $counter * Client::CHUNK_SIZE;
+        while ($start < $size) {
+            fseek($handle, $start);
+            $params['{{ parameter.name }}'] = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(@fread($handle, Client::CHUNK_SIZE)), $mimeType, $postedName);
+            $headers['content-range'] = 'bytes ' . ($counter * Client::CHUNK_SIZE) . '-' . min(((($counter * Client::CHUNK_SIZE) + Client::CHUNK_SIZE) - 1), $size) . '/' . $size;
+            if(!empty($id)) {
+                $headers['x-{{spec.title | caseLower }}-id'] = $id;
+            }
+            $response = $this->client->call(Client::METHOD_POST, $path, $headers, $params);
+            $counter++;
+            $start += Client::CHUNK_SIZE;
+            if(empty($id)) {
+                $id = $response['$id'];
+            }
+            if($onProgress !== null) {
+                $onProgress([
+                    '$id' => $response['$id'],
+                    'progress' => min(((($counter * Client::CHUNK_SIZE) + Client::CHUNK_SIZE) - 1), $size) / $size * 100,
+                    'sizeUploaded' => min($counter * Client::CHUNK_SIZE),
+                    'chunksTotal' => $response['chunksTotal'],
+                    'chunksUploaded' => $response['chunksUploaded'], 
+                ]);
+            }
         }
+        @fclose($handle);
+        return $response;
 {% endif %}
 {% endfor %}
 {% else %}

templates/web/src/sdk.ts.twig

@@ -575,8 +575,8 @@ class {{ spec.title | caseUcfirst }} {
                 if (onProgress) {
                     onProgress({
                         $id: response.$id,
-                        progress: Math.min((counter + 1) * Appwrite.CHUNK_SIZE, size) / size * 100,
-                        sizeUploaded: end+1,
+                        progress: Math.min((counter + 1) * {{ spec.title | caseUcfirst }}.CHUNK_SIZE - 1, size) / size * 100,
+                        sizeUploaded: end,
                         chunksTotal: response.chunksTotal,
                         chunksUploaded: response.chunksUploaded
                     });