mirror of
https://github.com/InsanusMokrassar/SauceNaoAPI.git
synced 2024-09-30 06:06:08 +00:00
Compare commits
No commits in common. "master" and "v0.15.1" have entirely different histories.
31
CHANGELOG.md
31
CHANGELOG.md
@ -1,36 +1,5 @@
|
|||||||
# SauceNaoAPI Changelog
|
# SauceNaoAPI Changelog
|
||||||
|
|
||||||
## 0.17.2
|
|
||||||
|
|
||||||
* Versions:
|
|
||||||
* `Coroutines`: `1.7.3`
|
|
||||||
* `Ktor`: `2.3.4`
|
|
||||||
* `MicroUtils`: `0.19.9`
|
|
||||||
|
|
||||||
## 0.17.1
|
|
||||||
|
|
||||||
* Versions:
|
|
||||||
* `Coroutines`: `1.7.2`
|
|
||||||
* `Ktor`: `2.3.2`
|
|
||||||
* `MicroUtils`: `0.19.7`
|
|
||||||
|
|
||||||
## 0.17.0
|
|
||||||
|
|
||||||
* Versions:
|
|
||||||
* `Kotlin`: `1.8.22`
|
|
||||||
* `Serialization`: `1.5.1`
|
|
||||||
* `Ktor`: `2.3.1`
|
|
||||||
* `MicroUtils`: `0.19.2`
|
|
||||||
* `Klock`: `4.0.3`
|
|
||||||
|
|
||||||
## 0.16.0
|
|
||||||
|
|
||||||
Add `MicroUtils` as used micro utils
|
|
||||||
|
|
||||||
* Versions:
|
|
||||||
* `Kotlin`: `1.8.21`
|
|
||||||
* `Ktor`: `2.3.0`
|
|
||||||
|
|
||||||
## 0.15.1
|
## 0.15.1
|
||||||
|
|
||||||
* Versions:
|
* Versions:
|
||||||
|
18
build.gradle
18
build.gradle
@ -28,19 +28,11 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm()
|
||||||
compilations.main {
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
js(IR) {
|
js(IR) {
|
||||||
browser()
|
browser()
|
||||||
nodejs()
|
nodejs()
|
||||||
}
|
}
|
||||||
linuxX64()
|
|
||||||
mingwX64()
|
|
||||||
|
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
@ -52,9 +44,6 @@ kotlin {
|
|||||||
api libs.kt.serialization
|
api libs.kt.serialization
|
||||||
api libs.klock
|
api libs.klock
|
||||||
api libs.ktor.client
|
api libs.ktor.client
|
||||||
api libs.microutils.common
|
|
||||||
api libs.microutils.ktor.common
|
|
||||||
api libs.microutils.mimetypes
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
commonTest {
|
commonTest {
|
||||||
@ -76,8 +65,3 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
|
||||||
}
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
|
|
||||||
library_version=0.17.2
|
library_version=0.15.1
|
||||||
|
@ -1,13 +1,11 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kt = "1.8.22"
|
kt = "1.8.10"
|
||||||
kt-serialization = "1.5.1"
|
kt-serialization = "1.5.0"
|
||||||
kt-coroutines = "1.7.3"
|
kt-coroutines = "1.6.4"
|
||||||
|
|
||||||
klock = "4.0.3"
|
klock = "3.4.0"
|
||||||
ktor = "2.3.4"
|
ktor = "2.2.4"
|
||||||
|
|
||||||
microutils = "0.19.9"
|
|
||||||
|
|
||||||
gh-release = "2.4.1"
|
gh-release = "2.4.1"
|
||||||
|
|
||||||
@ -22,10 +20,6 @@ klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }
|
|||||||
ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
|
ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
|
||||||
ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
|
ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
|
||||||
|
|
||||||
microutils-common = { module = "dev.inmo:micro_utils.common", version.ref = "microutils" }
|
|
||||||
microutils-ktor-common = { module = "dev.inmo:micro_utils.ktor.common", version.ref = "microutils" }
|
|
||||||
microutils-mimetypes = { module = "dev.inmo:micro_utils.mime_types", version.ref = "microutils" }
|
|
||||||
|
|
||||||
buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" }
|
buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" }
|
||||||
buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
|
buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
|
||||||
buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
|
buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
package dev.inmo.saucenaoapi
|
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.TooManyRequestsException
|
||||||
import dev.inmo.saucenaoapi.exceptions.sauceNaoAPIException
|
import dev.inmo.saucenaoapi.exceptions.sauceNaoAPIException
|
||||||
import dev.inmo.saucenaoapi.models.*
|
import dev.inmo.saucenaoapi.models.*
|
||||||
@ -191,7 +189,7 @@ data class SauceNaoAPI(
|
|||||||
resultsCount: Int? = null,
|
resultsCount: Int? = null,
|
||||||
minSimilarity: Float? = null
|
minSimilarity: Float? = null
|
||||||
): SauceNaoAnswer = request(
|
): SauceNaoAnswer = request(
|
||||||
file.input(),
|
file.input,
|
||||||
file.contentType,
|
file.contentType,
|
||||||
resultsCount,
|
resultsCount,
|
||||||
minSimilarity
|
minSimilarity
|
||||||
@ -208,7 +206,7 @@ data class SauceNaoAPI(
|
|||||||
resultsCount: Int? = null,
|
resultsCount: Int? = null,
|
||||||
minSimilarity: Float? = null
|
minSimilarity: Float? = null
|
||||||
): SauceNaoAnswer = requestByDBs(
|
): SauceNaoAnswer = requestByDBs(
|
||||||
file.input(),
|
file.input,
|
||||||
file.contentType,
|
file.contentType,
|
||||||
db,
|
db,
|
||||||
dbs,
|
dbs,
|
||||||
@ -230,7 +228,7 @@ data class SauceNaoAPI(
|
|||||||
resultsCount: Int? = null,
|
resultsCount: Int? = null,
|
||||||
minSimilarity: Float? = null
|
minSimilarity: Float? = null
|
||||||
): SauceNaoAnswer = requestByMasks(
|
): SauceNaoAnswer = requestByMasks(
|
||||||
file.input(),
|
file.input,
|
||||||
file.contentType,
|
file.contentType,
|
||||||
mask,
|
mask,
|
||||||
excludedMask,
|
excludedMask,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.saucenaoapi.additional
|
package dev.inmo.saucenaoapi.additional
|
||||||
|
|
||||||
import korlibs.time.TimeSpan
|
import com.soywiz.klock.TimeSpan
|
||||||
|
|
||||||
typealias AccountType = Int
|
typealias AccountType = Int
|
||||||
const val defaultAccountType: AccountType = 1 // "basic"
|
const val defaultAccountType: AccountType = 1 // "basic"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.saucenaoapi.exceptions
|
package dev.inmo.saucenaoapi.exceptions
|
||||||
|
|
||||||
import korlibs.time.TimeSpan
|
import com.soywiz.klock.TimeSpan
|
||||||
import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
|
import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
|
||||||
import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
|
import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
|
||||||
import io.ktor.client.plugins.ClientRequestException
|
import io.ktor.client.plugins.ClientRequestException
|
||||||
|
@ -1,26 +1,9 @@
|
|||||||
package dev.inmo.saucenaoapi.utils
|
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.http.ContentType
|
||||||
import io.ktor.utils.io.core.Input
|
import io.ktor.utils.io.core.Input
|
||||||
|
|
||||||
@Deprecated(
|
expect class MPPFile
|
||||||
"MPPFile from microutils is preferable since 0.16.0",
|
|
||||||
ReplaceWith("MPPFile", "dev.inmo.micro_utils.common.MPPFile")
|
|
||||||
)
|
|
||||||
typealias MPPFile = MPPFile
|
|
||||||
|
|
||||||
@Deprecated(
|
expect val MPPFile.input: Input
|
||||||
"input() from microutils is preferable since 0.16.0",
|
expect val MPPFile.contentType: ContentType
|
||||||
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,6 +1,6 @@
|
|||||||
package dev.inmo.saucenaoapi.utils
|
package dev.inmo.saucenaoapi.utils
|
||||||
|
|
||||||
import korlibs.time.DateTime
|
import com.soywiz.klock.DateTime
|
||||||
import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
|
import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
|
||||||
import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
|
import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
|
||||||
import dev.inmo.saucenaoapi.exceptions.TooManyRequestsException
|
import dev.inmo.saucenaoapi.exceptions.TooManyRequestsException
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package dev.inmo.saucenaoapi.utils
|
package dev.inmo.saucenaoapi.utils
|
||||||
|
|
||||||
import korlibs.time.DateTime
|
import com.soywiz.klock.DateTime
|
||||||
import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
|
import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
|
||||||
import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
|
import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
|
@ -0,0 +1,18 @@
|
|||||||
|
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)
|
@ -0,0 +1,14 @@
|
|||||||
|
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()))
|
Loading…
Reference in New Issue
Block a user