Input file test fixes

Author: abnegate

templates/swift/Sources/Client.swift.twig

@@ -342,7 +342,7 @@ open class Client {
 
         switch(input.sourceType) {
         case "path":
-            input.data = ByteBuffer(data: try! Data(contentsOf: URL(fileURLWithPath: FileManager.default.currentDirectoryPath + input.path)))
+            input.data = ByteBuffer(data: try! Data(contentsOf: URL(fileURLWithPath: input.path)))
         case "data":
             input.data = ByteBuffer(data: input.data as! Data)
         default:
@@ -352,6 +352,7 @@ open class Client {
         let size = (input.data as! ByteBuffer).readableBytes
 
         if size < Client.chunkSize {
+            params[paramName] = input
             return try await call(
                 method: "POST",
                 path: path,
@@ -377,13 +378,11 @@ open class Client {
             offset = min(size, (chunksUploaded * Client.chunkSize))
         }
 
-        let cachedInput = input
-
         while offset < size {
-            input.data = (cachedInput.data as! ByteBuffer).getSlice(at: offset, length: Client.chunkSize)
-                ?? (cachedInput.data as! ByteBuffer).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] = input
+            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(

tests/languages/swift-server/Tests.swift

@@ -75,50 +75,53 @@ class Tests: XCTestCase {
         } 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)
-//         }
-//         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()
-//         } catch let error as AppwriteError {
-//             print(error.message)
-//         }
-//
-//         do {
-//             try await general.error500()
-//         } catch {
-//             print(error.localizedDescription)
-//         }
-//
-//         do {
-//             try await general.error502()
-//         } catch {
-//             print(String(describing: error))
-//         }
-//
-//         try! await general.empty()
+
+        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)
+        }
+
+        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()
+        } catch let error as AppwriteError {
+            print(error.message)
+        }
+
+        do {
+            try await general.error500()
+        } catch {
+            print(error.localizedDescription)
+        }
+
+        do {
+            try await general.error502()
+        } catch {
+            print(String(describing: error))
+        }
+
+        try! await general.empty()
     }
 }