mirror of
https://github.com/InsanusMokrassar/SauceNaoAPI.git
synced 2025-09-16 13:39:18 +00:00
add microutils and support of native platforms
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package dev.inmo.saucenaoapi
|
||||
|
||||
import dev.inmo.micro_utils.common.MPPFile
|
||||
import dev.inmo.micro_utils.ktor.common.input
|
||||
import dev.inmo.saucenaoapi.exceptions.TooManyRequestsException
|
||||
import dev.inmo.saucenaoapi.exceptions.sauceNaoAPIException
|
||||
import dev.inmo.saucenaoapi.models.*
|
||||
@@ -189,7 +191,7 @@ data class SauceNaoAPI(
|
||||
resultsCount: Int? = null,
|
||||
minSimilarity: Float? = null
|
||||
): SauceNaoAnswer = request(
|
||||
file.input,
|
||||
file.input(),
|
||||
file.contentType,
|
||||
resultsCount,
|
||||
minSimilarity
|
||||
@@ -206,7 +208,7 @@ data class SauceNaoAPI(
|
||||
resultsCount: Int? = null,
|
||||
minSimilarity: Float? = null
|
||||
): SauceNaoAnswer = requestByDBs(
|
||||
file.input,
|
||||
file.input(),
|
||||
file.contentType,
|
||||
db,
|
||||
dbs,
|
||||
@@ -228,7 +230,7 @@ data class SauceNaoAPI(
|
||||
resultsCount: Int? = null,
|
||||
minSimilarity: Float? = null
|
||||
): SauceNaoAnswer = requestByMasks(
|
||||
file.input,
|
||||
file.input(),
|
||||
file.contentType,
|
||||
mask,
|
||||
excludedMask,
|
||||
|
@@ -1,9 +1,26 @@
|
||||
package dev.inmo.saucenaoapi.utils
|
||||
|
||||
import dev.inmo.micro_utils.common.MPPFile
|
||||
import dev.inmo.micro_utils.common.filename
|
||||
import dev.inmo.micro_utils.ktor.common.input
|
||||
import dev.inmo.micro_utils.mime_types.KnownMimeTypes
|
||||
import dev.inmo.micro_utils.mime_types.getMimeType
|
||||
import io.ktor.http.ContentType
|
||||
import io.ktor.utils.io.core.Input
|
||||
|
||||
expect class MPPFile
|
||||
@Deprecated(
|
||||
"MPPFile from microutils is preferable since 0.16.0",
|
||||
ReplaceWith("MPPFile", "dev.inmo.micro_utils.common.MPPFile")
|
||||
)
|
||||
typealias MPPFile = MPPFile
|
||||
|
||||
expect val MPPFile.input: Input
|
||||
expect val MPPFile.contentType: ContentType
|
||||
@Deprecated(
|
||||
"input() from microutils is preferable since 0.16.0",
|
||||
ReplaceWith("this.input()", "dev.inmo.micro_utils.ktor.common.input")
|
||||
)
|
||||
val MPPFile.input: Input
|
||||
get() = input()
|
||||
val MPPFile.contentType: ContentType
|
||||
get() = ContentType.parse(
|
||||
getMimeType(stringWithExtension = filename.extension) ?.raw ?: KnownMimeTypes.Any.raw
|
||||
)
|
||||
|
@@ -1,18 +0,0 @@
|
||||
package dev.inmo.saucenaoapi.utils
|
||||
|
||||
import io.ktor.http.ContentType
|
||||
import io.ktor.utils.io.core.ByteReadPacket
|
||||
import io.ktor.utils.io.core.Input
|
||||
import org.khronos.webgl.Int8Array
|
||||
import org.w3c.files.File
|
||||
import org.w3c.files.FileReaderSync
|
||||
|
||||
actual typealias MPPFile = File
|
||||
|
||||
actual val MPPFile.input: Input
|
||||
get() {
|
||||
val reader = FileReaderSync()
|
||||
return ByteReadPacket(Int8Array(reader.readAsArrayBuffer(this)) as ByteArray)
|
||||
}
|
||||
actual val MPPFile.contentType: ContentType
|
||||
get() = ContentType.parse(type)
|
@@ -1,14 +0,0 @@
|
||||
package dev.inmo.saucenaoapi.utils
|
||||
|
||||
import io.ktor.http.ContentType
|
||||
import io.ktor.utils.io.core.Input
|
||||
import io.ktor.utils.io.streams.asInput
|
||||
import java.io.File
|
||||
import java.nio.file.Files
|
||||
|
||||
actual typealias MPPFile = File
|
||||
|
||||
actual val MPPFile.input: Input
|
||||
get() = inputStream().asInput()
|
||||
actual val MPPFile.contentType: ContentType
|
||||
get() = ContentType.parse(Files.probeContentType(toPath()))
|
Reference in New Issue
Block a user