fix of build after migration (wat)

This commit is contained in:
2024-10-11 23:32:11 +06:00
parent fce7ec8912
commit 301cdaa2c2
28 changed files with 86 additions and 104 deletions

View File

@@ -5,6 +5,7 @@ import dev.inmo.micro_utils.common.filename
import dev.inmo.micro_utils.ktor.common.TemporalFileId
import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
import io.ktor.client.HttpClient
import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload
import io.ktor.client.request.forms.formData
import io.ktor.client.request.forms.submitFormWithBinaryData

View File

@@ -1,9 +1,8 @@
package dev.inmo.micro_utils.ktor.client
import dev.inmo.micro_utils.common.MPPFile
import dev.inmo.micro_utils.common.Progress
import io.ktor.client.HttpClient
import io.ktor.client.engine.mergeHeaders
import io.ktor.client.content.*
import io.ktor.client.plugins.onUpload
import io.ktor.client.request.HttpRequestBuilder
import io.ktor.client.request.forms.InputProvider
@@ -21,7 +20,6 @@ import kotlinx.serialization.DeserializationStrategy
import kotlinx.serialization.InternalSerializationApi
import kotlinx.serialization.SerializationStrategy
import kotlinx.serialization.StringFormat
import kotlinx.serialization.encodeToString
import kotlinx.serialization.serializer
/**
@@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
resultDeserializer: DeserializationStrategy<T>,
headers: Headers,
stringFormat: StringFormat,
onUpload: OnUploadCallback
onUpload: ProgressListener
): T? {
val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }
@@ -75,9 +73,7 @@ actual suspend fun <T> HttpClient.uniUpload(
headers {
appendAll(headers)
}
onUpload { bytesSentTotal, contentLength ->
onUpload(bytesSentTotal, contentLength)
}
onUpload(onUpload)
}
val response = if (withBinary) {