WIP

whyoleg · Oct 11, 2024 · 82659b7 · 82659b7
1 parent bfdaae0
commit 82659b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/testtool/client/src/commonMain/kotlin/TesttoolClient.kt b/testtool/client/src/commonMain/kotlin/TesttoolClient.kt
@@ -52,11 +52,13 @@ internal fun getData(path: String): Flow<Pair<String, ByteArray>> = flow {
         while (true) {
             val idLength = source.readInt()
             val id = source.readString(idLength.toLong())
-            val contentLength = source.readInt()
+            val contentLength = source.readLong().toInt()
             val content = source.readByteArray(contentLength)
             emit(id to content)
         }
     } catch (cause: EOFException) {
         // ignore
+    } finally {
+        source.close()
     }
 }
diff --git a/testtool/server/src/main/kotlin/compatibility.kt b/testtool/server/src/main/kotlin/compatibility.kt
@@ -4,6 +4,7 @@
 
 package dev.whyoleg.cryptography.testtool.server
 
+import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
@@ -62,8 +63,12 @@ private suspend fun ApplicationCall.saveFile(path: Path, name: String) {
     path.createDirectories().resolve(name).writeBytes(bytes, StandardOpenOption.CREATE_NEW)
 }
 
-private suspend fun ApplicationCall.getFiles(path: Path, get: Path.() -> Pair<String, Path>) = respondBytesWriter {
-    if (!path.exists()) return@respondBytesWriter
+private suspend fun ApplicationCall.getFiles(path: Path, get: Path.() -> Pair<String, Path>) {
+    if (!path.exists()) {
+        respond(HttpStatusCode.OK)
+    }
+
+    val output = Buffer()
 
     path.forEachDirectoryEntry { entry ->
         val (id, contentPath) = get(entry)
@@ -72,11 +77,11 @@ private suspend fun ApplicationCall.getFiles(path: Path, get: Path.() -> Pair<St
             return@forEachDirectoryEntry
         }
         val idBytes = id.encodeToByteArray()
-        val contentBytes = contentPath.readBytes()
-        writeInt(idBytes.size)
-        writeByteArray(idBytes)
-        writeInt(contentBytes.size)
-        writeByteArray(contentBytes)
-        flush()
+        output.writeInt(idBytes.size)
+        output.write(idBytes)
+        output.writeLong(contentPath.fileSize())
+        output.write(contentPath.inputStream(), contentPath.fileSize())
     }
+
+    respondSource(output)
 }