Merge pull request #378 from appwrite/feat-php-resumable-support

lohanidamodar · web-flow · commit 8b68b8457134 · 2022-03-21T12:46:05.000+05:45
diff --git a/src/SDK/Language/Dart.php b/src/SDK/Language/Dart.php
@@ -217,7 +217,7 @@ public function getParamExample(array $param)
         if(empty($example) && $example !== 0 && $example !== false) {
             switch ($type) {
                 case self::TYPE_FILE:
-                    $output .= 'await MultipartFile.fromPath(\''.$param['name'].'\', \'./path-to-files/image.jpg\', \'image.jpg\')';
+                    $output .= 'InputFile(path: \'./path-to-files/image.jpg\', filename: \'image.jpg\')';
                     break;
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
diff --git a/src/SDK/SDK.php b/src/SDK/SDK.php
@@ -605,6 +605,7 @@ public function generate($target)
                     foreach ($this->spec->getServices() as $key => $service) {
                         $methods = $this->spec->getMethods($key);
                         $params['service'] = [
+                            'description' => $service['description'] ?? '',
                             'name' => $key,
                             'features' => [
                                 'upload' => $this->hasUploads($methods),
diff --git a/templates/dart/lib/services/service.dart.twig b/templates/dart/lib/services/service.dart.twig
@@ -6,6 +6,9 @@ part of {{ language.params.packageName }};
 {% endmacro %}
 {% macro map_parameter(parameter) %}'{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},{% endmacro %}
 
+{%if service.description %}
+{{ service.description|dartComment}}
+{% endif %}
 class {{ service.name | caseUcfirst }} extends Service {
     {{ service.name | caseUcfirst }}(Client client): super(client);
 {% for method in service.methods %}
diff --git a/templates/dart/lib/src/chunked_upload_io.dart.twig b/templates/dart/lib/src/chunked_upload_io.dart.twig
@@ -26,7 +26,7 @@ Future<Response> chunkedUpload({
 
   late Response res;
   if (size <= Client.CHUNK_SIZE) {
-    params[paramName] = await http.MultipartFile.fromPath(paramName, file.path!, filename: file.fileName);
+    params[paramName] = await http.MultipartFile.fromPath(paramName, file.path!, filename: file.filename);
     return client.call(
       HttpMethod.post,
       path: path,
@@ -55,7 +55,7 @@ Future<Response> chunkedUpload({
     raf.setPositionSync(offset);
     final chunk = raf.readSync(Client.CHUNK_SIZE);
     params[paramName] =
-        http.MultipartFile.fromBytes(paramName, chunk, filename: file.fileName);
+        http.MultipartFile.fromBytes(paramName, chunk, filename: file.filename);
     headers['content-range'] =
         'bytes $offset-${min<int>(((offset + Client.CHUNK_SIZE) - 1), size)}/$size';
     res = await client.call(HttpMethod.post,
@@ -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,
     );
diff --git a/templates/dart/lib/src/input_file.dart.twig b/templates/dart/lib/src/input_file.dart.twig
@@ -3,7 +3,7 @@ import 'package:http/http.dart' show MultipartFile;
 class InputFile {
   final MultipartFile? file;
   final String? path;
-  final String? fileName;
+  final String? filename;
 
-  InputFile({this.file, this.path, this.fileName});
+  InputFile({this.file, this.path, this.filename});
 }
diff --git a/templates/dart/lib/src/models/model.dart.twig b/templates/dart/lib/src/models/model.dart.twig
@@ -23,7 +23,7 @@ class {{ definition.name | caseUcfirst | overrideIdentifier }} {
     factory {{ definition.name | caseUcfirst | overrideIdentifier}}.fromMap(Map<String, dynamic> map) {
         return {{ definition.name | caseUcfirst | overrideIdentifier }}(
 {% for property in definition.properties %}
-            {{ property.name | escapeKeyword }}: {% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst | overrideIdentifier}}>.from(map['{{property.name | escapeDollarSign }}'].map((p) => {{property.sub_schema | caseUcfirst | overrideIdentifier}}.fromMap(p))){% else %}{{property.sub_schema | caseUcfirst | overrideIdentifier}}.fromMap(map['{{property.name | escapeDollarSign }}']){% endif %}{% else %}map['{{property.name | escapeDollarSign }}']{% if property.type == "number" %}.toDouble(){% endif %}{% if property.type == "string" %}.toString(){% endif %}{% endif %},
+            {{ property.name | escapeKeyword }}: {% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst | overrideIdentifier}}>.from(map['{{property.name | escapeDollarSign }}'].map((p) => {{property.sub_schema | caseUcfirst | overrideIdentifier}}.fromMap(p))){% else %}{{property.sub_schema | caseUcfirst | overrideIdentifier}}.fromMap(map['{{property.name | escapeDollarSign }}']){% endif %}{% else %}map['{{property.name | escapeDollarSign }}']{% if property.type == "number" %}{% if not property.required %}?{% endif %}.toDouble(){% endif %}{% if property.type == "string" %}{% if not property.required %}?{% endif %}.toString(){% endif %}{% endif %},
 {% endfor %}
 {% if definition.additionalProperties %}
             data: map,
diff --git a/templates/flutter/lib/package.dart.twig b/templates/flutter/lib/package.dart.twig
@@ -2,7 +2,6 @@ library {{ language.params.packageName }};
 
 import 'dart:async';
 import 'dart:typed_data';
-import 'package:http/http.dart' as http;
 import 'package:flutter/foundation.dart';
 import 'src/chunked_upload_stub.dart'
     if (dart.library.io) 'src/chunked_upload_io.dart';
diff --git a/templates/flutter/lib/services/service.dart.twig b/templates/flutter/lib/services/service.dart.twig
@@ -5,6 +5,10 @@ part of {{ language.params.packageName }};
 {% if parameters.all|length > 0 %}{{ '{' }}{% for parameter in parameters.all %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, Function(UploadProgress)? onProgress{% endif %}{{ '}' }}{% endif %}
 {% endmacro %}
 {% macro map_parameter(parameter) %}'{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},{% endmacro %}
+
+{%if service.description %}
+{{ service.description|dartComment}}
+{% endif %}
 class {{ service.name | caseUcfirst }} extends Service {
     {{ service.name | caseUcfirst }}(Client client): super(client);
 {% for method in service.methods %}
diff --git a/templates/flutter/lib/src/chunked_upload_io.dart.twig b/templates/flutter/lib/src/chunked_upload_io.dart.twig
@@ -26,7 +26,7 @@ Future<Response> chunkedUpload({
 
   late Response res;
   if (size <= Client.CHUNK_SIZE) {
-    params[paramName] = await http.MultipartFile.fromPath(paramName, file.path!, filename: file.fileName);
+    params[paramName] = await http.MultipartFile.fromPath(paramName, file.path!, filename: file.filename);
     return client.call(
       HttpMethod.post,
       path: path,
@@ -55,7 +55,7 @@ Future<Response> chunkedUpload({
     raf.setPositionSync(offset);
     final chunk = raf.readSync(Client.CHUNK_SIZE);
     params[paramName] =
-        http.MultipartFile.fromBytes(paramName, chunk, filename: file.fileName);
+        http.MultipartFile.fromBytes(paramName, chunk, filename: file.filename);
     headers['content-range'] =
         'bytes $offset-${min<int>(((offset + Client.CHUNK_SIZE) - 1), size)}/$size';
     res = await client.call(HttpMethod.post,
diff --git a/templates/flutter/lib/src/chunked_upload_stub.dart.twig b/templates/flutter/lib/src/chunked_upload_stub.dart.twig
@@ -7,6 +7,7 @@ Future<Response> chunkedUpload({
   required String path,
   required Map<String, dynamic> params,
   required String paramName,
+  required String idParamName,
   required Map<String, String> headers,
   Function(UploadProgress)? onProgress,
 }) =>
diff --git a/templates/flutter/lib/src/input_file.dart.twig b/templates/flutter/lib/src/input_file.dart.twig
@@ -3,7 +3,7 @@ import 'package:http/http.dart' show MultipartFile;
 class InputFile {
   final MultipartFile? file;
   final String? path;
-  final String? fileName;
+  final String? filename;
 
-  InputFile({this.file, this.path, this.fileName});
+  InputFile({this.file, this.path, this.filename});
 }
diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.twig
@@ -19,6 +19,6 @@ dependencies:
   web_socket_channel: ^2.1.0
 
 dev_dependencies:
+  flutter_lints: ^1.0.4
   flutter_test:
     sdk: flutter
-  lints: ^1.0.1
diff --git a/templates/php/src/Services/Service.php.twig b/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 %}
diff --git a/templates/swift/Sources/Extensions/HTTPClientRequest+Cookies.swift.twig b/templates/swift/Sources/Extensions/HTTPClientRequest+Cookies.swift.twig
@@ -15,8 +15,12 @@ extension HTTPHeaders {
         let cookies: [HTTPClient.Cookie?]? = try? cookieJson?.fromJson(to: [HTTPClient.Cookie].self)
             ?? [(try? cookieJson?.fromJson(to: HTTPClient.Cookie.self))]
 
-        if let authCookie = cookies?.first(where: { $0?.name.starts(with: "a_session_") == true } ) {
-            add(name: "cookie", value: "\(authCookie!.name)=\(authCookie!.value)")
+        var cookiesValue = ""
+        for cookie in cookies ?? [] {
+            if let cookie = cookie {
+                cookiesValue += "\(cookie.name)=\(cookie.value);"
+            }
         }
-    }
+        add(name: "Cookie", value: cookiesValue)
+}
 }
diff --git a/templates/web/src/sdk.ts.twig b/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
                     });
diff --git a/tests/languages/dart/tests.dart b/tests/languages/dart/tests.dart
@@ -52,12 +52,12 @@ void main() async {
   print(res['result']);
 
   var file = InputFile(path: '../../resources/file.png',
-      fileName: 'file.png');
+      filename: 'file.png');
   response = await general.upload(
       x: 'string', y: 123, z: ['string in array'], file: file);
   print(response.result);
 
-  file = InputFile(path: '../../resources/large_file.mp4', fileName: 'large_file.mp4');
+  file = InputFile(path: '../../resources/large_file.mp4', filename: 'large_file.mp4');
   response = await general.upload(
       x: 'string', y: 123, z: ['string in array'], file: file);
   print(response.result);
diff --git a/tests/languages/flutter/tests.dart b/tests/languages/flutter/tests.dart
@@ -65,12 +65,12 @@ void main() async {
   final res = await general.redirect();
   print(res['result']);
 
-  var file = InputFile(path: '../../resources/file.png', fileName: 'file.png');
+  var file = InputFile(path: '../../resources/file.png', filename: 'file.png');
   response = await general.upload(
       x: 'string', y: 123, z: ['string in array'], file: file);
   print(response.result);
 
-  file = InputFile(path: '../../resources/large_file.mp4', fileName: 'large_file.mp4');
+  file = InputFile(path: '../../resources/large_file.mp4', filename: 'large_file.mp4');
   response = await general.upload(
       x: 'string', y: 123, z: ['string in array'], file: file);
   print(response.result);

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import 'package:http/http.dart' show MultipartFile;`
`3`	`3`	`class InputFile {`
`4`	`4`	`final MultipartFile? file;`
`5`	`5`	`final String? path;`
`6`		`- final String? fileName;`
	`6`	`+ final String? filename;`
`7`	`7`
`8`		`- InputFile({this.file, this.path, this.fileName});`
	`8`	`+ InputFile({this.file, this.path, this.filename});`
`9`	`9`	`}`