Merge pull request #401 from appwrite/feat-resumable-upload-cli

Feat: CLI resumable upload

Author: Meldiron

example.php

@@ -183,7 +183,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '0.12.0',
+            'X-Appwrite-Response-Format' => '0.13.0',
         ])
     ;
 

templates/cli/lib/commands/command.js.twig

@@ -106,46 +106,61 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
         const streamFilePath = payload['{{ parameter.name }}'];
         let id = undefined;
 
+        let counter = 0;
         const totalCounters = Math.ceil(size / libClient.CHUNK_SIZE);
 
-        for (let counter = 0; counter < totalCounters; counter++) {
-                const start = (counter * libClient.CHUNK_SIZE);
-                const end = Math.min((((counter * libClient.CHUNK_SIZE) + libClient.CHUNK_SIZE) - 1), size);
-                const headers = {
+        const headers = {
 {% for parameter in method.parameters.header %}
-                        '{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
+            '{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
 {% for key, header in method.headers %}
-                        '{{ key }}': '{{ header }}',
+            '{{ key }}': '{{ header }}',
+{% endfor %}
+        };
+
+{% for parameter in method.parameters.all %}
+{% if parameter.isUploadID %}
+        if({{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') {
+            try {
+                response = await client.call('get', path + '/' + {{ parameter.name }}, headers);
+                counter = response.chunksUploaded;
+            } catch(e) {
+            }
+        }
+{% endif %}
 {% endfor %}
-                        'content-range': 'bytes ' + start + '-' + end + '/' + size
-                };
 
-                if (id) {
-                        headers['x-appwrite-id'] = id;
-                }
+        for (counter; counter < totalCounters; counter++) {
+            const start = (counter * libClient.CHUNK_SIZE);
+            const end = Math.min((((counter * libClient.CHUNK_SIZE) + libClient.CHUNK_SIZE) - 1), size);
+
+            headers['content-range'] = 'bytes ' + start + '-' + end + '/' + size;
+
+            if (id) {
+                headers['x-appwrite-id'] = id;
+            }
+
+            const stream = fs.createReadStream(streamFilePath, {
+                start,
+                end
+            });
+            payload['{{ parameter.name }}'] = stream;
+
+            response = await client.call('{{ method.method | caseLower }}', path, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
+
+            if (!id) {
+                id = response['$id'];
+            }
 
-                const stream = fs.createReadStream(streamFilePath, {
-                        start,
-                        end
+            if (onProgress !== null) {
+                onProgress({
+                    $id: response['$id'],
+                    progress: Math.min((counter+1) * libClient.CHUNK_SIZE, size) / size * 100,
+                    sizeUploaded: end+1,
+                    chunksTotal: response['chunksTotal'],
+                    chunksUploaded: response['chunksUploaded']
                 });
-                payload['{{ parameter.name }}'] = stream;
-
-                response = await client.call('{{ method.method | caseLower }}', path, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
-
-                if (!id) {
-                        id = response['$id'];
-                }
-
-                if (onProgress !== null) {
-                    onProgress({
-                        $id: response['$id'],
-                        progress: Math.min((counter+1) * libClient.CHUNK_SIZE, size) / size * 100,
-                        sizeUploaded: end+1,
-                        chunksTotal: response['chunksTotal'],
-                        chunksUploaded: response['chunksUploaded']
-                    });
-                }
+            }
         }
     }
 {% endif %}

tests/resources/spec.json

@@ -15,7 +15,7 @@
       "url": "https://raw.githubusercontent.com/appwrite/appwrite/master/LICENSE"
     }
   },
-  "host": "appwrite.io",
+  "host": "demo.appwrite.io",
   "basePath": "/v1",
   "schemes": ["https"],
   "consumes": ["application/json", "multipart/form-data"],