Merge pull request #471 from appwrite/feat-swift-input-file

lohanidamodar · web-flow · commit 6b14c1f7dcdb · 2022-06-28T15:42:26.000+05:45
diff --git a/src/SDK/Language/Swift.php b/src/SDK/Language/Swift.php
@@ -155,7 +155,7 @@ public function getFiles()
             [
                 'scope'         => 'default',
                 'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/File.swift',
-                'template'      => 'swift/Sources/Models/File.swift.twig',
+                'template'      => 'swift/Sources/Models/InputFile.swift.twig',
                 'minify'        => false,
             ],
             [
@@ -188,6 +188,12 @@ public function getFiles()
                 'template'      => 'swift/Sources/Extensions/HTTPClientRequest+Cookies.swift.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/String+MimeTypes.swift',
+                'template'      => 'swift/Sources/Extensions/String+MimeTypes.swift.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/StreamingDelegate.swift',
@@ -301,7 +307,7 @@ public function getTypeName($type)
             case self::TYPE_STRING:
                 return 'String';
             case self::TYPE_FILE:
-                return 'File';
+                return 'InputFile';
             case self::TYPE_BOOLEAN:
                 return 'Bool';
             case self::TYPE_ARRAY:
@@ -390,7 +396,7 @@ public function getParamExample(array $param)
         if(empty($example) && $example !== 0 && $example !== false) {
             switch ($type) {
                 case self::TYPE_FILE:
-                    $output .= 'File(name: "image.jpg", buffer: yourByteBuffer)';
+                    $output .= 'InputFile.fromPath("file.png")';
                     break;
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
diff --git a/templates/swift/Sources/Client.swift.twig b/templates/swift/Sources/Client.swift.twig
@@ -338,10 +338,21 @@ open class Client {
         converter: (([String: Any]) -> T)? = nil,
         onProgress: ((UploadProgress) -> Void)? = nil
     ) async throws -> T {
-        let file = params[paramName] as! File
-        let size = file.buffer.readableBytes
+        let input = params[paramName] as! InputFile
+
+        switch(input.sourceType) {
+        case "path":
+            input.data = ByteBuffer(data: try! Data(contentsOf: URL(fileURLWithPath: input.path)))
+        case "data":
+            input.data = ByteBuffer(data: input.data as! Data)
+        default:
+            break
+        }
+
+        let size = (input.data as! ByteBuffer).readableBytes
 
         if size < Client.chunkSize {
+            params[paramName] = input
             return try await call(
                 method: "POST",
                 path: path,
@@ -351,7 +362,6 @@ open class Client {
             )
         }
 
-        let input = file.buffer
         var offset = 0
         var result = [String:Any]()
 
@@ -369,14 +379,10 @@ open class Client {
         }
 
         while offset < size {
-            let slice = input.getSlice(at: offset, length: Client.chunkSize)
-                ?? input.getSlice(at: offset, length: Int(size - offset))
+            let slice = (input.data as! ByteBuffer).getSlice(at: offset, length: Client.chunkSize)
+                ?? (input.data as! ByteBuffer).getSlice(at: offset, length: Int(size - offset))
             
-            params[paramName] = File(
-                name: file.name,
-                buffer: slice!
-            )
-
+            params[paramName] = InputFile.fromBuffer(slice!, filename: input.filename, mimeType: input.mimeType)
             headers["content-range"] = "bytes \(offset)-\(min((offset + Client.chunkSize) - 1, size))/\(size)"
 
             result = try await call(
@@ -429,12 +435,15 @@ open class Client {
             bodyBuffer.writeString(CRLF)
             bodyBuffer.writeString("Content-Disposition: form-data; name=\"\(name)\"")
 
-            if let file = value as? File {
-                bodyBuffer.writeString("; filename=\"\(file.name)\"")
+            if let file = value as? InputFile {
+                bodyBuffer.writeString("; filename=\"\(file.filename)\"")
                 bodyBuffer.writeString(CRLF)
                 bodyBuffer.writeString("Content-Length: \(bodyBuffer.readableBytes)")
                 bodyBuffer.writeString(CRLF+CRLF)
-                bodyBuffer.writeBuffer(&file.buffer)
+
+                var buffer = file.data! as! ByteBuffer
+
+                bodyBuffer.writeBuffer(&buffer)
                 bodyBuffer.writeString(CRLF)
                 return
             }
diff --git a/templates/swift/Sources/Extensions/String+MimeTypes.swift.twig b/templates/swift/Sources/Extensions/String+MimeTypes.swift.twig
@@ -0,0 +1,130 @@
+import Foundation
+
+fileprivate let DEFAULT_MIME_TYPE = "application/octet-stream"
+
+fileprivate let mimeTypes = [
+    "md": "text/markdown",
+    "html": "text/html",
+    "htm": "text/html",
+    "shtml": "text/html",
+    "css": "text/css",
+    "xml": "text/xml",
+    "gif": "image/gif",
+    "jpeg": "image/jpeg",
+    "jpg": "image/jpeg",
+    "js": "application/javascript",
+    "atom": "application/atom+xml",
+    "rss": "application/rss+xml",
+    "mml": "text/mathml",
+    "txt": "text/plain",
+    "jad": "text/vnd.sun.j2me.app-descriptor",
+    "wml": "text/vnd.wap.wml",
+    "htc": "text/x-component",
+    "png": "image/png",
+    "tif": "image/tiff",
+    "tiff": "image/tiff",
+    "wbmp": "image/vnd.wap.wbmp",
+    "ico": "image/x-icon",
+    "jng": "image/x-jng",
+    "bmp": "image/x-ms-bmp",
+    "svg": "image/svg+xml",
+    "svgz": "image/svg+xml",
+    "webp": "image/webp",
+    "woff": "application/font-woff",
+    "jar": "application/java-archive",
+    "war": "application/java-archive",
+    "ear": "application/java-archive",
+    "json": "application/json",
+    "hqx": "application/mac-binhex40",
+    "doc": "application/msword",
+    "pdf": "application/pdf",
+    "ps": "application/postscript",
+    "eps": "application/postscript",
+    "ai": "application/postscript",
+    "rtf": "application/rtf",
+    "m3u8": "application/vnd.apple.mpegurl",
+    "xls": "application/vnd.ms-excel",
+    "eot": "application/vnd.ms-fontobject",
+    "ppt": "application/vnd.ms-powerpoint",
+    "wmlc": "application/vnd.wap.wmlc",
+    "kml": "application/vnd.google-earth.kml+xml",
+    "kmz": "application/vnd.google-earth.kmz",
+    "7z": "application/x-7z-compressed",
+    "cco": "application/x-cocoa",
+    "jardiff": "application/x-java-archive-diff",
+    "jnlp": "application/x-java-jnlp-file",
+    "run": "application/x-makeself",
+    "pl": "application/x-perl",
+    "pm": "application/x-perl",
+    "prc": "application/x-pilot",
+    "pdb": "application/x-pilot",
+    "rar": "application/x-rar-compressed",
+    "rpm": "application/x-redhat-package-manager",
+    "sea": "application/x-sea",
+    "swf": "application/x-shockwave-flash",
+    "sit": "application/x-stuffit",
+    "tcl": "application/x-tcl",
+    "tk": "application/x-tcl",
+    "der": "application/x-x509-ca-cert",
+    "pem": "application/x-x509-ca-cert",
+    "crt": "application/x-x509-ca-cert",
+    "xpi": "application/x-xpinstall",
+    "xhtml": "application/xhtml+xml",
+    "xspf": "application/xspf+xml",
+    "zip": "application/zip",
+    "bin": "application/octet-stream",
+    "exe": "application/octet-stream",
+    "dll": "application/octet-stream",
+    "deb": "application/octet-stream",
+    "dmg": "application/octet-stream",
+    "iso": "application/octet-stream",
+    "img": "application/octet-stream",
+    "msi": "application/octet-stream",
+    "msp": "application/octet-stream",
+    "msm": "application/octet-stream",
+    "docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    "xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    "pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+    "mid": "audio/midi",
+    "midi": "audio/midi",
+    "kar": "audio/midi",
+    "mp3": "audio/mpeg",
+    "ogg": "audio/ogg",
+    "m4a": "audio/x-m4a",
+    "ra": "audio/x-realaudio",
+    "3gpp": "video/3gpp",
+    "3gp": "video/3gpp",
+    "ts": "video/mp2t",
+    "mp4": "video/mp4",
+    "mpeg": "video/mpeg",
+    "mpg": "video/mpeg",
+    "mov": "video/quicktime",
+    "webm": "video/webm",
+    "flv": "video/x-flv",
+    "m4v": "video/x-m4v",
+    "mng": "video/x-mng",
+    "asx": "video/x-ms-asf",
+    "asf": "video/x-ms-asf",
+    "wmv": "video/x-ms-wmv",
+    "avi": "video/x-msvideo"
+]
+
+fileprivate func mimeFromExt(ext: String?) -> String {
+    let lower: String = ext!.lowercased()
+    if ext != nil && mimeTypes.contains(where: { $0.0 == lower }) {
+        return mimeTypes[lower]!
+    }
+    return DEFAULT_MIME_TYPE
+}
+
+extension NSString {
+    public func mimeType() -> String {
+        return mimeFromExt(ext: self.pathExtension)
+    }
+}
+
+extension String {
+    public func mimeType() -> String {
+        return (self as NSString).mimeType()
+    }
+}
diff --git a/templates/swift/Sources/Models/File.swift.twig b/templates/swift/Sources/Models/File.swift.twig
diff --git a/templates/swift/Sources/Models/InputFile.swift.twig b/templates/swift/Sources/Models/InputFile.swift.twig
@@ -0,0 +1,41 @@
+import Foundation
+import NIO
+
+open class InputFile {
+
+    public var path: String = ""
+    public var filename: String = ""
+    public var mimeType: String = ""
+    public var sourceType: String = ""
+    public var data: Any? = nil
+
+    internal init() {
+    }
+
+    public static func fromPath(_ path: String) -> InputFile {
+        let instance = InputFile()
+        instance.path = path
+        instance.filename = URL(fileURLWithPath: path, isDirectory: false).lastPathComponent
+        instance.mimeType = path.mimeType()
+        instance.sourceType = "path"
+        return instance
+    }
+
+    public static func fromData(_ data: Data, filename: String, mimeType: String) -> InputFile {
+        let instance = InputFile()
+        instance.filename = filename
+        instance.mimeType = mimeType
+        instance.sourceType = "data"
+        instance.data = data
+        return instance
+    }
+
+    public static func fromBuffer(_ buffer: ByteBuffer, filename: String, mimeType: String) -> InputFile {
+        let instance = InputFile()
+        instance.filename = filename
+        instance.mimeType = mimeType
+        instance.sourceType = "buffer"
+        instance.data = buffer
+        return instance
+    }
+}
diff --git a/tests/SwiftClient55Test.php b/tests/SwiftClient55Test.php
@@ -18,6 +18,8 @@ class SwiftClient55Test extends Base
         ...Base::BAR_RESPONSES,
         ...Base::GENERAL_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES,
         ...Base::REALTIME_RESPONSES,
         ...Base::COOKIE_RESPONSES,
diff --git a/tests/SwiftServer55Test.php b/tests/SwiftServer55Test.php
@@ -18,6 +18,8 @@ class SwiftServer55Test extends Base
         ...Base::BAR_RESPONSES,
         ...Base::GENERAL_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES,
     ];
 }
diff --git a/tests/languages/swift-client/Tests.swift b/tests/languages/swift-client/Tests.swift
@@ -78,17 +78,41 @@ class Tests: XCTestCase {
         let result = try await general.redirect()
         print((result as! [String: Any])["result"] as! String)
 
-        var url = URL(fileURLWithPath: "\(FileManager.default.currentDirectoryPath)/../../resources/file.png")
-        var buffer = ByteBuffer(data: try! Data(contentsOf: url))
-        var file = File(name: "file.png", buffer: buffer)
-        mock = try await general.upload(x: "string", y: 123, z: ["string in array"], file: file, onProgress: nil)
-        print(mock.result)
+        do {
+            var file = InputFile.fromPath("\(FileManager.default.currentDirectoryPath)/../../resources/file.png")
+            mock = try await general.upload(x: "string", y: 123, z: ["string in array"], file: file, onProgress: nil)
+            print(mock.result)
+        } catch let error as AppwriteError {
+            print(error.message)
+        }
+
+        do {
+            var file = InputFile.fromPath("\(FileManager.default.currentDirectoryPath)/../../resources/large_file.mp4")
+            mock = try await general.upload(x: "string", y: 123, z: ["string in array"], file: file, onProgress: nil)
+            print(mock.result)
+        } catch let error as AppwriteError {
+            print(error.message)
+        }
 
-        url = URL(fileURLWithPath: "\(FileManager.default.currentDirectoryPath)/../../resources/large_file.mp4")
-        buffer = ByteBuffer(data: try! Data(contentsOf: url))
-        file = File(name: "large_file.mp4", buffer: buffer)
-		mock = try await general.upload(x: "string", y: 123, z: ["string in array"], file: file, onProgress: nil)
-		print(mock.result)
+        do {
+            var url = URL(fileURLWithPath: "\(FileManager.default.currentDirectoryPath)/../../resources/file.png")
+            var buffer = ByteBuffer(data: try! Data(contentsOf: url))
+            var file = InputFile.fromBuffer(buffer, filename: "file.png", mimeType: "image/png")
+            mock = try await general.upload(x: "string", y: 123, z: ["string in array"], file: file, onProgress: nil)
+            print(mock.result)
+        } catch let error as AppwriteError {
+            print(error.message)
+        }
+
+        do {
+            var url = URL(fileURLWithPath: "\(FileManager.default.currentDirectoryPath)/../../resources/large_file.mp4")
+            var buffer = ByteBuffer(data: try! Data(contentsOf: url))
+            var file = InputFile.fromBuffer(buffer, filename: "large_file.mp4", mimeType: "video/mp4")
+            mock = try await general.upload(x: "string", y: 123, z: ["string in array"], file: file, onProgress: nil)
+            print(mock.result)
+        } catch let error as AppwriteError {
+            print(error.message)
+        }
 
         do {
             try await general.error400()
diff --git a/tests/languages/swift-server/Tests.swift b/tests/languages/swift-server/Tests.swift

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ class SwiftServer55Test extends Base`
`18`	`18`	`...Base::BAR_RESPONSES,`
`19`	`19`	`...Base::GENERAL_RESPONSES,`
`20`	`20`	`...Base::LARGE_FILE_RESPONSES,`
	`21`	`+ ...Base::LARGE_FILE_RESPONSES,`
	`22`	`+ ...Base::LARGE_FILE_RESPONSES,`
`21`	`23`	`...Base::EXCEPTION_RESPONSES,`
`22`	`24`	`];`
`23`	`25`	`}`