change repository

Update dependency junit:junit to v4.13

CHANGELOG.md

@@ -1,5 +1,21 @@
 # SauceNaoAPI Changelog
 
+### 0.6.0
+
+**MAIN PACKAGE WAS CHANGED: `com.github.insanusmokrassar` -> `com.insanusmokrassar`**
+
+* All known fields were added to `ResultData`
+* Versions updates:
+    * `Kotlin`: `1.3.72` -> `1.4.0`
+    * `Coroutines`: `1.3.8` -> `1.3.9`
+    * `Serialization`: `0.20.0` -> `1.0.0-RC`
+    * `Klock`: `1.11.14` -> `1.12.0`
+    * `Ktor`: `1.3.2` -> `1.4.0`
+
+## 0.5.0
+
+* Versions updates
+
 ## 0.4.0
 
 * Update libraries versions
@@ -12,6 +28,18 @@
 * Now `SauceNaoAPI` working with synchronous queue
 * `SauceNaoAPI` now will wait for some time when one of limits will be achieved
 
+### 0.4.4
+
+* Uploading of file
+* Updates of versions
+* Now `SauceNaoAPI` do not require api key
+* `SauceNaoAPI` instances now can return `limitsState` object, which will contains `LimitsState` with currently known
+state of limits
+
+### 0.4.3
+
+Hotfix for serializer of `SauceNaoAnswer`
+
 ### 0.4.2
 
 Hotfix for autostop for some time when there is no remaining quotas for requests

build.gradle

@@ -1,6 +1,3 @@
-project.version = "0.4.2"
-project.group = "com.github.insanusmokrassar"
-
 buildscript {
     repositories {
         mavenLocal()
@@ -15,8 +12,13 @@ buildscript {
     }
 }
 
-apply plugin: 'kotlin'
-apply plugin: 'kotlinx-serialization'
+plugins {
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
+    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+}
+
+project.version = "0.6.0"
+project.group = "com.insanusmokrassar"
 
 apply from: "publish.gradle"
 
@@ -25,17 +27,48 @@ repositories {
     jcenter()
     mavenCentral()
     maven { url "https://kotlin.bintray.com/kotlinx" }
-    maven { url "https://dl.bintray.com/kotlin/ktor" }
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version"
-    implementation "joda-time:joda-time:$joda_time_version"
-    implementation "io.ktor:ktor-client-core:$ktor_version"
-    implementation "io.ktor:ktor-client-okhttp:$ktor_version"
+kotlin {
+    jvm()
+    js(BOTH) {
+        browser()
+        nodejs()
+    }
 
-    // Use JUnit test framework
-    testImplementation 'junit:junit:4.12'
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialisation_runtime_version"
+                api "com.soywiz.korlibs.klock:klock:$klock_version"
+                api "io.ktor:ktor-client-core:$ktor_version"
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+            }
+        }
+        jvmMain {
+            dependencies {
+                implementation kotlin('stdlib')
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation "io.ktor:ktor-client-okhttp:$ktor_version"
+            }
+        }
+        jsMain {
+            dependencies {
+                implementation kotlin('test-js')
+            }
+        }
+    }
 }

gradle.properties

@@ -1,11 +1,8 @@
 kotlin.code.style=official
-kotlin_version=1.3.50
-kotlin_coroutines_version=1.3.2
-kotlin_serialisation_runtime_version=0.13.0
-joda_time_version=2.10.4
-ktor_version=1.2.5
+kotlin_version=1.4.0
+kotlin_coroutines_version=1.3.9
+kotlin_serialisation_runtime_version=1.0.0-RC
+klock_version=1.12.0
+ktor_version=1.4.0
 
-project_public_name=SauceNao API
-project_public_description=SauceNao API library
-
-gradle_bintray_plugin_version=1.8.4
+gradle_bintray_plugin_version=1.8.5

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip

maven.publish.gradle

@@ -1,63 +1,53 @@
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
 
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-
-task javadocJar(type: Jar) {
-    from javadoc
+task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
 
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-            groupId "${project.group}"
-            artifactId "${project.name}"
-            version "${project.version}"
-
-            artifact sourcesJar
-            artifact javadocJar
-
-            pom.withXml {
-                asNode().children().last() + {
-                    resolveStrategy = Closure.DELEGATE_FIRST
-                    name "${project_public_name}"
-                    description "${project_public_description}"
-                    url "https://insanusmokrassar.github.io/${project.name}"
-
-                    scm {
-                        connection "scm:git:git://github.com/insanusmokrassar/${project.name}.git"
-                        developerConnection "scm:git:[fetch=]https://github.com/insanusmokrassar/${project.name}.git[push=]ssh:git@github.com:insanusmokrassar/${project.name}.git"
-                        url "https://github.com/insanusmokrassar/${project.name}"
-
-                    }
-
-                    developers {
-                        developer {
-                            id "InsanusMokrassar"
-                            name "Ovsyannikov Alexey"
-                            email "ovsyannikov.alexey95@gmail.com"
-                        }
-                    }
-
-                    licenses {
-                        license {
-                            name 'The Apache Software License, Version 2.0'
-                            url 'https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE'
-                            distribution 'repo'
-                        }
-                    }
-                }
-            }
+afterEvaluate {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
+        if (it.name.contains('kotlinMultiplatform')) {
+            artifactId = "${project.name}"
+        } else {
+            artifactId = "${project.name}-$name"
         }
     }
 }
 
-signing {
-    useGpgCmd()
-    sign publishing.publications.maven
-}
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "SauceNao API library"
+            name = "SauceNao API"
+            url = "https://insanusmokrassar.github.io/${project.name}"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://github.com/insanusmokrassar/${project.name}.git[push=]https://github.com/insanusmokrassar/${project.name}.git"
+                url = "https://github.com/insanusmokrassar/${project.name}.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsyannikov Alexey"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                    }
+                
+            }
+        }
+    }
+}

publication.kpsb

@@ -0,0 +1 @@
+{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}-mpp","packageVcs":"https://github.com/InsanusMokrassar/${project.name}"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"SauceNao API","description":"SauceNao API library","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/insanusmokrassar/${project.name}.git","developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

publish.gradle

@@ -1,33 +1,55 @@
 apply plugin: 'com.jfrog.bintray'
 
-ext {
-    projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}"
-}
+apply from: "maven.publish.gradle"
 
 bintray {
     user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    publications = ["maven"]
     filesSpec {
-        into "$projectBintrayDir"
-        from("build/libs") {
-            include "**/*.asc"
-        }
-        from("build/publications/maven") {
-            rename 'pom-default.xml(.*)', "${project.name}-${project.version}.pom\$1"
+        from "${buildDir}/publications/"
+        eachFile {
+            String directorySubname = it.getFile().parentFile.name
+            if (it.getName() == "module.json") {
+                if (directorySubname == "kotlinMultiplatform") {
+                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
+                } else {
+                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
+                }
+            } else {
+                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
+                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
+                } else {
+                    it.exclude()
+                }
+            }
         }
+        into "${project.group}".replace(".", "/")
     }
     pkg {
-        repo = 'StandardRepository'
-        name = "${project.name}"
+        repo = "InsanusMokrassar"
+        name = "${project.name}-mpp"
         vcsUrl = "https://github.com/InsanusMokrassar/${project.name}"
-        licenses = ['Apache-2.0']
+        licenses = ["Apache-2.0"]
         version {
             name = "${project.version}"
             released = new Date()
-            vcsTag = name
+            vcsTag = "${project.version}"
+            gpg {
+                sign = true
+                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
+            }
         }
     }
 }
 
-apply from: "maven.publish.gradle"
+bintrayUpload.doFirst {
+    publications = publishing.publications.collect {
+        if (it.name.contains('kotlinMultiplatform')) {
+            null
+        } else {
+            it.name
+        }
+    } - null
+}
+
+bintrayUpload.dependsOn publishToMavenLocal

renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/OutputType.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.SauceNaoAPI
+package com.insanusmokrassar.SauceNaoAPI
 
 sealed class OutputType {
     abstract val typeCode: Int

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt

@@ -1,28 +1,28 @@
-package com.github.insanusmokrassar.SauceNaoAPI
+package com.insanusmokrassar.SauceNaoAPI
 
-import com.github.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
-import com.github.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
-import com.github.insanusmokrassar.SauceNaoAPI.exceptions.TooManyRequestsException
-import com.github.insanusmokrassar.SauceNaoAPI.exceptions.sauceNaoAPIException
-import com.github.insanusmokrassar.SauceNaoAPI.models.SauceNaoAnswer
-import com.github.insanusmokrassar.SauceNaoAPI.utils.*
-import com.github.insanusmokrassar.SauceNaoAPI.utils.calculateSleepTime
+import com.insanusmokrassar.SauceNaoAPI.exceptions.TooManyRequestsException
+import com.insanusmokrassar.SauceNaoAPI.exceptions.sauceNaoAPIException
+import com.insanusmokrassar.SauceNaoAPI.models.*
+import com.insanusmokrassar.SauceNaoAPI.utils.*
 import io.ktor.client.HttpClient
-import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.features.ClientRequestException
 import io.ktor.client.request.*
-import io.ktor.client.response.readText
+import io.ktor.client.request.forms.MultiPartFormDataContent
+import io.ktor.client.request.forms.formData
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.readText
+import io.ktor.http.*
+import io.ktor.utils.io.core.Input
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
-import kotlinx.io.core.Closeable
 import kotlinx.serialization.json.Json
-import org.joda.time.DateTime
-import java.util.logging.Logger
 import kotlin.coroutines.*
 
 private const val API_TOKEN_FIELD = "api_key"
 private const val OUTPUT_TYPE_FIELD = "output_type"
 private const val URL_FIELD = "url"
+private const val FILE_FIELD = "file"
+private const val FILENAME_FIELD = "filename"
 private const val DB_FIELD = "db"
 private const val DBMASK_FIELD = "dbmask"
 private const val DBMASKI_FIELD = "dbmaski"
@@ -31,34 +31,43 @@ private const val MINIMAL_SIMILARITY_FIELD = "minsim"
 
 private const val SEARCH_URL = "https://saucenao.com/search.php"
 
-data class SauceNaoAPI(
-    private val apiToken: String,
-    private val outputType: OutputType = JsonOutputType,
-    private val client: HttpClient = HttpClient(OkHttp),
-    private val searchUrl: String = SEARCH_URL,
-    private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
-) : Closeable {
-    private val logger = Logger.getLogger("SauceNaoAPI")
+val defaultSauceNaoParser = Json {
+    allowSpecialFloatingPointValues = true
+    allowStructuredMapKeys = true
+    ignoreUnknownKeys = true
+    useArrayPolymorphism = true
+}
 
+data class SauceNaoAPI(
+    private val apiToken: String? = null,
+    private val outputType: OutputType = JsonOutputType,
+    private val client: HttpClient = HttpClient(),
+    private val searchUrl: String = SEARCH_URL,
+    private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    private val parser: Json = defaultSauceNaoParser
+) : SauceCloseable {
     private val requestsChannel = Channel<Pair<Continuation<SauceNaoAnswer>, HttpRequestBuilder>>(Channel.UNLIMITED)
     private val timeManager = TimeManager(scope)
     private val quotaManager = RequestQuotaManager(scope)
 
+    val limitsState: LimitsState
+        get() = quotaManager.limitsState
+
     private val requestsJob = scope.launch {
         for ((callback, requestBuilder) in requestsChannel) {
             quotaManager.getQuota()
             launch {
                 try {
                     val answer = makeRequest(requestBuilder)
-                    callback.resumeWith(Result.success(answer))
+                    callback.resume(answer)
 
                     quotaManager.updateQuota(answer.header, timeManager)
                 } catch (e: TooManyRequestsException) {
-                    quotaManager.happenTooManyRequests(timeManager)
+                    quotaManager.happenTooManyRequests(timeManager, e)
                     requestsChannel.send(callback to requestBuilder)
                 } catch (e: Exception) {
                     try {
-                        callback.resumeWith(Result.failure(e))
+                        callback.resumeWithException(e)
                     } catch (e: IllegalStateException) { // may happen when already resumed and api was closed
                         // do nothing
                     }
@@ -72,7 +81,18 @@ data class SauceNaoAPI(
         resultsCount: Int? = null,
         minSimilarity: Float? = null
     ): SauceNaoAnswer? = makeRequest(
-        url,
+        url.asSauceRequestSubject,
+        resultsCount = resultsCount,
+        minSimilarity = minSimilarity
+    )
+
+    suspend fun request(
+        mediaInput: Input,
+        mimeType: ContentType,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer? = makeRequest(
+        mediaInput.asSauceRequestSubject(mimeType),
         resultsCount = resultsCount,
         minSimilarity = minSimilarity
     )
@@ -83,7 +103,7 @@ data class SauceNaoAPI(
         resultsCount: Int? = null,
         minSimilarity: Float? = null
     ): SauceNaoAnswer? = makeRequest(
-        url,
+        url.asSauceRequestSubject,
         db = db,
         resultsCount = resultsCount,
         minSimilarity = minSimilarity
@@ -95,7 +115,7 @@ data class SauceNaoAPI(
         resultsCount: Int? = null,
         minSimilarity: Float? = null
     ): SauceNaoAnswer? = makeRequest(
-        url,
+        url.asSauceRequestSubject,
         dbmask = dbmask,
         resultsCount = resultsCount,
         minSimilarity = minSimilarity
@@ -107,7 +127,7 @@ data class SauceNaoAPI(
         resultsCount: Int? = null,
         minSimilarity: Float? = null
     ): SauceNaoAnswer? = makeRequest(
-        url,
+        url.asSauceRequestSubject,
         dbmaski = dbmaski,
         resultsCount = resultsCount,
         minSimilarity = minSimilarity
@@ -117,21 +137,20 @@ data class SauceNaoAPI(
         builder: HttpRequestBuilder
     ): SauceNaoAnswer {
         return try {
-            val call = client.execute(builder)
-            val answerText = call.response.readText()
-            logger.info(answerText)
+            val call = client.request<HttpResponse>(builder)
+            val answerText = call.readText()
             timeManager.addTimeAndClear()
-            Json.nonstrict.parse(
-                SauceNaoAnswer.serializer(),
+            parser.decodeFromString(
+                SauceNaoAnswerSerializer,
                 answerText
             )
         } catch (e: ClientRequestException) {
-            throw e.sauceNaoAPIException
+            throw e.sauceNaoAPIException()
         }
     }
 
     private suspend fun makeRequest(
-        url: String,
+        request: SauceRequestSubject,
         db: Int? = null,
         dbmask: Int? = null,
         dbmaski: Int? = null,
@@ -142,14 +161,45 @@ data class SauceNaoAPI(
             requestsChannel.offer(
                 it to HttpRequestBuilder().apply {
                     url(searchUrl)
-                    parameter(URL_FIELD, url)
-                    parameter(API_TOKEN_FIELD, apiToken)
+
+                    apiToken ?.also { parameter(API_TOKEN_FIELD, it) }
                     parameter(OUTPUT_TYPE_FIELD, outputType.typeCode)
                     db ?.also { parameter(DB_FIELD, it) }
                     dbmask ?.also { parameter(DBMASK_FIELD, it) }
                     dbmaski ?.also { parameter(DBMASKI_FIELD, it) }
                     resultsCount ?.also { parameter(RESULTS_COUNT_FIELD, it) }
                     minSimilarity ?.also { parameter(MINIMAL_SIMILARITY_FIELD, it) }
+
+                    when (request) {
+                        is UrlSauceRequestSubject -> {
+                            parameter(URL_FIELD, request.url)
+                        }
+                        is InputRequestSubject -> {
+                            val mimeType = request.mimeType
+
+                            method = HttpMethod.Post
+                            body = MultiPartFormDataContent(formData {
+                                    appendInput(
+                                        FILE_FIELD,
+                                        Headers.build {
+                                            append(HttpHeaders.ContentType, mimeType.toString())
+
+                                            val fakeFilename = "filename=file" + when (mimeType) {
+                                                ContentType.Image.GIF -> ".gif"
+                                                ContentType.Image.JPEG -> ".jpeg"
+                                                ContentType.Image.PNG -> ".png"
+                                                ContentType.Image.SVG -> ".svg"
+                                                else -> throw IllegalArgumentException(
+                                                    "Currently supported formats for uploading in sauce: gif, jpeg, png, svg"
+                                                )
+                                            }
+                                            append(HttpHeaders.ContentDisposition, "filename=$fakeFilename")
+                                        },
+                                        block = request::input
+                                    )
+                            })
+                        }
+                    }
                 }
             )
         }

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/SauceRequestSubject.kt

@@ -0,0 +1,16 @@
+package com.insanusmokrassar.SauceNaoAPI
+
+import io.ktor.http.ContentType
+import io.ktor.utils.io.core.Input
+
+internal sealed class SauceRequestSubject
+
+internal data class UrlSauceRequestSubject(val url: String) : SauceRequestSubject()
+
+internal data class InputRequestSubject(val input: Input, val mimeType: ContentType) : SauceRequestSubject()
+
+internal val String.asSauceRequestSubject
+    get() = UrlSauceRequestSubject(this)
+
+internal fun Input.asSauceRequestSubject(mimeType: ContentType)
+    = InputRequestSubject(this, mimeType)

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/additional/AdaptedAnswer.kt

@@ -0,0 +1,23 @@
+package com.insanusmokrassar.SauceNaoAPI.additional
+
+import com.insanusmokrassar.SauceNaoAPI.additional.header.ResultMetaInfo
+import com.insanusmokrassar.SauceNaoAPI.additional.header.adapted
+import com.insanusmokrassar.SauceNaoAPI.additional.results.AdaptedResult
+import com.insanusmokrassar.SauceNaoAPI.additional.results.adapted
+import com.insanusmokrassar.SauceNaoAPI.models.SauceNaoAnswer
+
+val SauceNaoAnswer.adapted: AdaptedAnswer
+    get() = header.adapted.let { resultMetainfo ->
+        val adaptedResults = results.map {
+            it.adapted(resultMetainfo)
+        }
+        AdaptedAnswer(
+            resultMetainfo,
+            adaptedResults
+        )
+    }
+
+data class AdaptedAnswer(
+    val resultMetaInfo: ResultMetaInfo,
+    val results: List<AdaptedResult>
+)

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/additional/Utils.kt

@@ -0,0 +1,11 @@
+package com.insanusmokrassar.SauceNaoAPI.additional
+
+import com.soywiz.klock.TimeSpan
+
+typealias AccountType = Int
+const val defaultAccountType: AccountType = 1 // "basic"
+
+typealias UserId = Int
+
+val SHORT_TIME_RECALCULATING_MILLIS = TimeSpan(30.0 * 1000)
+val LONG_TIME_RECALCULATING_MILLIS = TimeSpan(24.0 * 60 * 60 * 1000)

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/additional/header/AccountInfo.kt

@@ -1,7 +1,7 @@
-package com.github.insanusmokrassar.SauceNaoAPI.additional.header
+package com.insanusmokrassar.SauceNaoAPI.additional.header
 
-import com.github.insanusmokrassar.SauceNaoAPI.additional.*
-import com.github.insanusmokrassar.SauceNaoAPI.models.Header
+import com.insanusmokrassar.SauceNaoAPI.additional.*
+import com.insanusmokrassar.SauceNaoAPI.models.Header
 
 val Header.shortLimitStatus: LimitStatus
     get() = LimitStatus(

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/additional/header/IndexInfo.kt

@@ -1,6 +1,6 @@
-package com.github.insanusmokrassar.SauceNaoAPI.additional.header
+package com.insanusmokrassar.SauceNaoAPI.additional.header
 
-import com.github.insanusmokrassar.SauceNaoAPI.models.Header
+import com.insanusmokrassar.SauceNaoAPI.models.Header
 
 data class IndexInfo(
     val id: Int,

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt

@@ -1,6 +1,6 @@
-package com.github.insanusmokrassar.SauceNaoAPI.additional.header
+package com.insanusmokrassar.SauceNaoAPI.additional.header
 
-import com.github.insanusmokrassar.SauceNaoAPI.models.Header
+import com.insanusmokrassar.SauceNaoAPI.models.Header
 
 val Header.queryPreview
     get() = QueryResultPreview(

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/additional/header/ResultMetaInfo.kt

@@ -1,6 +1,6 @@
-package com.github.insanusmokrassar.SauceNaoAPI.additional.header
+package com.insanusmokrassar.SauceNaoAPI.additional.header
 
-import com.github.insanusmokrassar.SauceNaoAPI.models.Header
+import com.insanusmokrassar.SauceNaoAPI.models.Header
 
 data class ResultMetaInfo(
     val accountInfo: AccountInfo = AccountInfo(),

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/additional/results/AdaptedResult.kt

@@ -1,9 +1,9 @@
-package com.github.insanusmokrassar.SauceNaoAPI.additional.results
+package com.insanusmokrassar.SauceNaoAPI.additional.results
 
-import com.github.insanusmokrassar.SauceNaoAPI.additional.header.IndexInfo
-import com.github.insanusmokrassar.SauceNaoAPI.additional.header.ResultMetaInfo
-import com.github.insanusmokrassar.SauceNaoAPI.models.Result
-import com.github.insanusmokrassar.SauceNaoAPI.models.ResultData
+import com.insanusmokrassar.SauceNaoAPI.additional.header.IndexInfo
+import com.insanusmokrassar.SauceNaoAPI.additional.header.ResultMetaInfo
+import com.insanusmokrassar.SauceNaoAPI.models.Result
+import com.insanusmokrassar.SauceNaoAPI.models.ResultData
 
 fun Result.adapted(
     resultMetaInfo: ResultMetaInfo

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/additional/results/ResultHeader.kt

@@ -0,0 +1,9 @@
+package com.insanusmokrassar.SauceNaoAPI.additional.results
+
+import com.insanusmokrassar.SauceNaoAPI.additional.header.IndexInfo
+
+data class ResultHeader(
+    val similarity: Float,
+    val thumbnail: String,
+    val index: IndexInfo
+)

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt

@@ -0,0 +1,35 @@
+package com.insanusmokrassar.SauceNaoAPI.exceptions
+
+import com.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
+import com.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
+import com.soywiz.klock.TimeSpan
+import io.ktor.client.features.ClientRequestException
+import io.ktor.client.statement.readText
+import io.ktor.http.HttpStatusCode.Companion.TooManyRequests
+import io.ktor.utils.io.errors.IOException
+
+internal suspend fun ClientRequestException.sauceNaoAPIException(): Exception  {
+    val response = response ?: return this
+        return when (response.status) {
+            TooManyRequests -> {
+                val answerContent = response.readText()
+                when {
+                    answerContent.contains("daily limit") -> TooManyRequestsLongException(answerContent)
+                    else -> TooManyRequestsShortException(answerContent)
+                }
+            }
+            else -> this
+        }
+    }
+
+sealed class TooManyRequestsException(message: String, cause: Throwable? = null) : IOException(message, cause) {
+    abstract val answerContent: String
+    abstract val waitTime: TimeSpan
+}
+
+class TooManyRequestsShortException(override val answerContent: String) : TooManyRequestsException("Too many requests were sent in the short period") {
+    override val waitTime: TimeSpan = SHORT_TIME_RECALCULATING_MILLIS
+}
+class TooManyRequestsLongException(override val answerContent: String) : TooManyRequestsException("Too many requests were sent in the long period") {
+    override val waitTime: TimeSpan = LONG_TIME_RECALCULATING_MILLIS
+}

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/models/Header.kt

@@ -1,9 +1,13 @@
-package com.github.insanusmokrassar.SauceNaoAPI.models
+package com.insanusmokrassar.SauceNaoAPI.models
 
-import com.github.insanusmokrassar.SauceNaoAPI.utils.JsonObjectSerializer
+import com.insanusmokrassar.SauceNaoAPI.defaultSauceNaoParser
 import kotlinx.serialization.*
-import kotlinx.serialization.internal.StringDescriptor
-import kotlinx.serialization.json.Json
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonObject
 
 @Serializable
 data class Header(
@@ -38,22 +42,25 @@ data class Header(
     val userId: Int? = null
 )
 
-object IndexesSerializer : KSerializer<List<HeaderIndex?>> {
-    override val descriptor: SerialDescriptor = StringDescriptor
+internal object IndexesSerializer : KSerializer<List<HeaderIndex?>> {
+    override val descriptor: SerialDescriptor = String.serializer().descriptor
 
     override fun deserialize(decoder: Decoder): List<HeaderIndex?> {
-        val json = decoder.decodeSerializableValue(JsonObjectSerializer)
+        val json = JsonObject.serializer().deserialize(decoder)
         val parsed = json.keys.mapNotNull { it.toIntOrNull() }.sorted().mapNotNull {
-            val jsonObject = json.getObjectOrNull(it.toString()) ?: return@mapNotNull null
-            val index = Json.nonstrict.parse(HeaderIndex.serializer(), Json.stringify(JsonObjectSerializer, jsonObject))
+            val jsonObject = json[it.toString()] ?.jsonObject ?: return@mapNotNull null
+            val index = defaultSauceNaoParser.decodeFromString(
+                HeaderIndex.serializer(),
+                defaultSauceNaoParser.encodeToString(JsonObject.serializer(), jsonObject)
+            )
             it to index
         }.toMap()
-        return Array<HeaderIndex?>(parsed.keys.max() ?: 0) {
+        return Array<HeaderIndex?>(parsed.keys.maxOrNull() ?: 0) {
             parsed[it]
         }.toList()
     }
 
-    override fun serialize(encoder: Encoder, obj: List<HeaderIndex?>) {
+    override fun serialize(encoder: Encoder, value: List<HeaderIndex?>) {
         TODO()
     }
 }

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/models/HeaderIndex.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.SauceNaoAPI.models
+package com.insanusmokrassar.SauceNaoAPI.models
 
 import kotlinx.serialization.Serializable
 

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/models/LimitsState.kt

@@ -0,0 +1,11 @@
+package com.insanusmokrassar.SauceNaoAPI.models
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LimitsState(
+    val maxShortQuota: Int,
+    val maxLongQuota: Int,
+    val knownShortQuota: Int,
+    val knownLongQuota: Int
+)

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/models/Result.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.SauceNaoAPI.models
+package com.insanusmokrassar.SauceNaoAPI.models
 
 import kotlinx.serialization.Serializable
 

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/models/ResultData.kt

@@ -0,0 +1,161 @@
+package com.insanusmokrassar.SauceNaoAPI.models
+
+import com.insanusmokrassar.SauceNaoAPI.utils.CommonMultivariantStringSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResultData(
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("danbooru_id")
+    val danbooruId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("gelbooru_id")
+    val gelbooruId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("drawr_id")
+    val drawrId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("pixiv_id")
+    val pixivId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("seiga_id")
+    val seigaId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("yandere_id")
+    val yandereId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("konachan_id")
+    val konachanId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("sankaku_id")
+    val sankakuId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("anime-pictures_id")
+    val animePicturesId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("e621_id")
+    val e621Id: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("idol_id")
+    val idolId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("imdb_id")
+    val imdbId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("anidb_aid")
+    val anidbAId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("bcy_id")
+    val bcyId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("ddb_id")
+    val ddbId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("nijie_id")
+    val nijieId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("getchu_id")
+    val getchuId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("shutterstock_id")
+    val shutterstockId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("contributor_id")
+    val contributorId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("est_time")
+    val estTime: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("bcy_type")
+    val bcyType: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("da_id")
+    val daId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("pg_id")
+    val pgId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("mal_id")
+    val malId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("md_id")
+    val mdId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("mu_id")
+    val muId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("pawoo_id")
+    val pawooId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("pawoo_user_acct")
+    val pawooUserAcct: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("pawoo_user_username")
+    val pawooUserUsername: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("pawoo_user_display_name")
+    val pawooUserDisplayname: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val title: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("jp_title")
+    val titleJp: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("eng_title")
+    val titleEng: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("alt_titles")
+    val titleAlt: List<String> = emptyList(),
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("jp_name")
+    val nameJp: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("eng_name")
+    val nameEng: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val creator: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val material: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("member_name")
+    val memberName: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("member_id")
+    val memberId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val part: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("part_name")
+    val partName: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val date: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val company: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val file: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val year: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("member_link_id")
+    val memberLinkId: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("author_name")
+    val authorName: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("author_url")
+    val authorUrl: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val characters: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val source: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val url: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    val type: String? = null,
+    @Serializable(CommonMultivariantStringSerializer::class)
+    @SerialName("created_at")
+    val createdAt: String? = null,
+    @SerialName("ext_urls")
+    val extUrls: List<String> = emptyList()
+)

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/models/ResultHeader.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.SauceNaoAPI.models
+package com.insanusmokrassar.SauceNaoAPI.models
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt

@@ -0,0 +1,56 @@
+package com.insanusmokrassar.SauceNaoAPI.models
+
+import com.insanusmokrassar.SauceNaoAPI.defaultSauceNaoParser
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.buildJsonObject
+
+@Serializable
+private data class TemporalSauceNaoAnswerRepresentation(
+    val header: Header,
+    val results: List<Result> = emptyList(),
+)
+
+@Serializable(SauceNaoAnswerSerializer::class)
+data class SauceNaoAnswer internal constructor(
+    val header: Header,
+    val results: List<Result> = emptyList(),
+    val raw: JsonObject = JsonObject(emptyMap())
+)
+
+@Serializer(SauceNaoAnswer::class)
+object SauceNaoAnswerSerializer : KSerializer<SauceNaoAnswer> {
+    private val resultsSerializer = ListSerializer(Result.serializer())
+    private const val headerField = "header"
+    private const val resultsField = "results"
+    private val serializer = defaultSauceNaoParser
+
+    override fun deserialize(decoder: Decoder): SauceNaoAnswer {
+        val raw = JsonObject.serializer().deserialize(decoder)
+
+        return serializer.decodeFromJsonElement(
+            TemporalSauceNaoAnswerRepresentation.serializer(),
+            raw
+        ).let {
+            SauceNaoAnswer(
+                it.header,
+                it.results,
+                raw
+            )
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: SauceNaoAnswer) {
+        val resultObject = buildJsonObject {
+            value.raw.forEach {
+                put(it.key, it.value)
+            }
+            put(headerField, serializer.encodeToJsonElement(Header.serializer(), value.header))
+            put(resultsField, serializer.encodeToJsonElement(resultsSerializer, value.results))
+        }
+        JsonObject.serializer().serialize(encoder, resultObject)
+    }
+}

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt

@@ -0,0 +1,22 @@
+package com.insanusmokrassar.SauceNaoAPI.utils
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.json.*
+
+
+@Serializer(String::class)
+object CommonMultivariantStringSerializer : KSerializer<String> by String.serializer() {
+    private val stringArraySerializer = ListSerializer(String.serializer())
+
+    override fun deserialize(decoder: Decoder): String {
+        return when (val parsed = JsonElement.serializer().deserialize(decoder)) {
+            is JsonPrimitive -> parsed.content
+            is JsonArray -> parsed.joinToString { it.jsonPrimitive.content }
+            else -> error("Unexpected answer object has been received: $parsed")
+        }
+    }
+}

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/RequestQuotaManager.kt

@@ -1,24 +1,34 @@
-package com.github.insanusmokrassar.SauceNaoAPI.utils
+package com.insanusmokrassar.SauceNaoAPI.utils
 
-import com.github.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
-import com.github.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
-import com.github.insanusmokrassar.SauceNaoAPI.models.Header
+import com.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
+import com.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
+import com.insanusmokrassar.SauceNaoAPI.exceptions.TooManyRequestsException
+import com.insanusmokrassar.SauceNaoAPI.exceptions.TooManyRequestsLongException
+import com.insanusmokrassar.SauceNaoAPI.models.Header
+import com.insanusmokrassar.SauceNaoAPI.models.LimitsState
+import com.soywiz.klock.DateTime
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
-import kotlinx.io.core.Closeable
-import org.joda.time.DateTime
 import kotlin.coroutines.suspendCoroutine
 import kotlin.math.max
 import kotlin.math.min
 
-class RequestQuotaManager (
-    private val scope: CoroutineScope
-) : Closeable {
+internal class RequestQuotaManager (
+    scope: CoroutineScope
+) : SauceCloseable {
     private var longQuota = 1
     private var shortQuota = 1
     private var longMaxQuota = 1
     private var shortMaxQuota = 1
 
+    val limitsState: LimitsState
+        get() = LimitsState(
+            shortMaxQuota,
+            longMaxQuota,
+            shortQuota,
+            longQuota
+        )
+
     private val quotaActions = Channel<suspend () -> Unit>(Channel.UNLIMITED)
 
     private val quotaJob = scope.launch {
@@ -43,11 +53,11 @@ class RequestQuotaManager (
                 shortQuota = min(newShortQuota, shortMaxQuota)
 
                 when {
-                    longQuota < 1 -> (timeManager.getMostOldestInLongPeriod() ?: DateTime.now()).millis + LONG_TIME_RECALCULATING_MILLIS
-                    shortQuota < 1 -> (timeManager.getMostOldestInShortPeriod() ?: DateTime.now()).millis + SHORT_TIME_RECALCULATING_MILLIS
+                    longQuota < 1 -> (timeManager.getMostOldestInLongPeriod() ?: DateTime.now()) + LONG_TIME_RECALCULATING_MILLIS
+                    shortQuota < 1 -> (timeManager.getMostOldestInShortPeriod() ?: DateTime.now()) + SHORT_TIME_RECALCULATING_MILLIS
                     else -> null
                 } ?.also {
-                    delay(it - DateTime.now().millis)
+                    delay((it - DateTime.now()).millisecondsLong)
                     shortQuota = max(shortQuota, 1)
                     longQuota = max(longQuota, 1)
                 }
@@ -64,8 +74,8 @@ class RequestQuotaManager (
         timeManager
     )
 
-    suspend fun happenTooManyRequests(timeManager: TimeManager) = updateQuota(
-        1,
+    suspend fun happenTooManyRequests(timeManager: TimeManager, e: TooManyRequestsException) = updateQuota(
+        if (e is TooManyRequestsLongException) 0 else 1,
         0,
         null,
         null,

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/SauceCloseable.kt

@@ -0,0 +1,21 @@
+package com.insanusmokrassar.SauceNaoAPI.utils
+
+import kotlinx.coroutines.supervisorScope
+
+interface SauceCloseable {
+    fun close()
+}
+
+fun <T> SauceCloseable.use(block: (SauceCloseable) -> T): T = try {
+    block(this)
+} finally {
+    close()
+}
+
+suspend fun <T> SauceCloseable.useSafe(block: suspend (SauceCloseable) -> T): T = try {
+    supervisorScope {
+        block(this@useSafe)
+    }
+} finally {
+    close()
+}

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/SleepCalculations.kt

@@ -0,0 +1,18 @@
+package com.insanusmokrassar.SauceNaoAPI.utils
+
+import com.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
+import com.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
+import com.insanusmokrassar.SauceNaoAPI.models.Header
+import com.soywiz.klock.DateTime
+
+internal suspend fun calculateSleepTime(
+    header: Header,
+    mostOldestInShortPeriodGetter: suspend () -> DateTime?,
+    mostOldestInLongPeriodGetter: suspend () -> DateTime?
+): DateTime? {
+    return when {
+        header.longRemaining < 1 -> mostOldestInLongPeriodGetter() ?.plus(LONG_TIME_RECALCULATING_MILLIS)
+        header.shortRemaining < 1 -> mostOldestInShortPeriodGetter() ?.plus(SHORT_TIME_RECALCULATING_MILLIS)
+        else -> null
+    }
+}

src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/TimeManager.kt

@@ -1,17 +1,16 @@
-package com.github.insanusmokrassar.SauceNaoAPI.utils
+package com.insanusmokrassar.SauceNaoAPI.utils
 
-import com.github.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
-import com.github.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
+import com.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
+import com.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
+import com.soywiz.klock.DateTime
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
-import kotlinx.io.core.Closeable
-import org.joda.time.DateTime
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.suspendCoroutine
 
 private fun MutableList<DateTime>.clearTooOldTimes(relatedTo: DateTime = DateTime.now()) {
-    val limitValue = relatedTo.minusMillis(LONG_TIME_RECALCULATING_MILLIS)
+    val limitValue = relatedTo - LONG_TIME_RECALCULATING_MILLIS
 
     removeAll {
         it < limitValue
@@ -43,7 +42,7 @@ private data class TimeManagerMostOldestInLongGetter(
 ) : TimeManagerAction {
     override suspend fun makeChangeWith(times: MutableList<DateTime>) {
         times.clearTooOldTimes()
-        continuation.resumeWith(Result.success(times.min()))
+        continuation.resumeWith(Result.success(times.minOrNull()))
     }
 }
 
@@ -55,21 +54,21 @@ private data class TimeManagerMostOldestInShortGetter(
 
         val now = DateTime.now()
 
-        val limitTime = now.minusMillis(SHORT_TIME_RECALCULATING_MILLIS)
+        val limitTime = now - SHORT_TIME_RECALCULATING_MILLIS
 
         continuation.resumeWith(
             Result.success(
                 times.asSequence().filter {
                     limitTime < it
-                }.min()
+                }.minOrNull()
             )
         )
     }
 }
 
-class TimeManager(
+internal class TimeManager(
     scope: CoroutineScope
-) : Closeable {
+) : SauceCloseable {
     private val actionsChannel = Channel<TimeManagerAction>(Channel.UNLIMITED)
 
     private val timeUpdateJob = scope.launch {

src/jvmTest/kotlin/Launcher.kt

@@ -0,0 +1,30 @@
+import com.insanusmokrassar.SauceNaoAPI.SauceNaoAPI
+import com.insanusmokrassar.SauceNaoAPI.utils.useSafe
+import io.ktor.http.ContentType
+import io.ktor.utils.io.streams.asInput
+import kotlinx.coroutines.*
+import java.io.File
+import java.nio.file.Files
+
+suspend fun main(vararg args: String) {
+    val (key, requestSubject) = args
+
+    val scope = CoroutineScope(Dispatchers.Default)
+
+    val api = SauceNaoAPI(key, scope = scope)
+    api.useSafe { _ ->
+        println(
+            when {
+                requestSubject.startsWith("/") -> File(requestSubject).let {
+                    api.request(
+                        it.inputStream().asInput(),
+                        ContentType.parse(Files.probeContentType(it.toPath()))
+                    )
+                }
+                else -> api.request(requestSubject)
+            }
+        )
+    }
+
+    scope.cancel()
+}

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/Launcher.kt

@@ -1,14 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI
-
-import kotlinx.coroutines.*
-
-suspend fun main(vararg args: String) {
-    val (key, requestUrl) = args
-
-    val api = SauceNaoAPI(key, scope = GlobalScope)
-    api.use {
-        println(
-            it.request(requestUrl)
-        )
-    }
-}

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/AdaptedAnswer.kt

@@ -1,23 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.additional
-
-import com.github.insanusmokrassar.SauceNaoAPI.additional.header.ResultMetaInfo
-import com.github.insanusmokrassar.SauceNaoAPI.additional.header.adapted
-import com.github.insanusmokrassar.SauceNaoAPI.additional.results.AdaptedResult
-import com.github.insanusmokrassar.SauceNaoAPI.additional.results.adapted
-import com.github.insanusmokrassar.SauceNaoAPI.models.SauceNaoAnswer
-
-val SauceNaoAnswer.adapted: AdaptedAnswer
-    get() = header.adapted.let { resultMetainfo ->
-        val adaptedResults = results.map {
-            it.adapted(resultMetainfo)
-        }
-        AdaptedAnswer(
-            resultMetainfo,
-            adaptedResults
-        )
-    }
-
-data class AdaptedAnswer(
-    val resultMetaInfo: ResultMetaInfo,
-    val results: List<AdaptedResult>
-)

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/Utils.kt

@@ -1,9 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.additional
-
-typealias AccountType = Int
-const val defaultAccountType: AccountType = 1 // "basic"
-
-typealias UserId = Int
-
-const val SHORT_TIME_RECALCULATING_MILLIS = 30 * 1000
-const val LONG_TIME_RECALCULATING_MILLIS = 24 * 60 * 60 * 1000

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/ResultHeader.kt

@@ -1,9 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.additional.results
-
-import com.github.insanusmokrassar.SauceNaoAPI.additional.header.IndexInfo
-
-data class ResultHeader(
-    val similarity: Float,
-    val thumbnail: String,
-    val index: IndexInfo
-)

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt

@@ -1,13 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.exceptions
-
-import io.ktor.client.features.ClientRequestException
-import io.ktor.http.HttpStatusCode.Companion.TooManyRequests
-import kotlinx.io.IOException
-
-val ClientRequestException.sauceNaoAPIException: Exception
-    get() = when (response.status) {
-        TooManyRequests -> TooManyRequestsException()
-        else -> this
-    }
-
-class TooManyRequestsException : IOException()

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultData.kt

@@ -1,37 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.models
-
-import com.github.insanusmokrassar.SauceNaoAPI.utils.CommonMultivariantStringSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ResultData(
-    @Serializable(CommonMultivariantStringSerializer::class)
-    @SerialName("danbooru_id")
-    val danbooruId: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    @SerialName("gelbooru_id")
-    val gelbooruId: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    @SerialName("drawr_id")
-    val drawrId: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    @SerialName("pixiv_id")
-    val pixivId: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    val title: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    val creator: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    val material: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    @SerialName("member_name")
-    val memberName: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    @SerialName("member_id")
-    val memberId: String? = null,
-    @Serializable(CommonMultivariantStringSerializer::class)
-    val characters: String? = null,
-    @SerialName("ext_urls")
-    val extUrls: List<String> = emptyList()
-)

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt

@@ -1,40 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.models
-
-import kotlinx.serialization.*
-import kotlinx.serialization.internal.ArrayListSerializer
-import kotlinx.serialization.json.*
-
-@Serializable(SauceNaoAnswerSerializer::class)
-data class SauceNaoAnswer(
-    val header: Header,
-    val results: List<Result> = emptyList(),
-    val raw: JsonObject
-)
-
-@Serializer(SauceNaoAnswer::class)
-object SauceNaoAnswerSerializer : KSerializer<SauceNaoAnswer> {
-    private val resultsSerializer = ArrayListSerializer(Result.serializer())
-    private const val headerField = "header"
-    private const val resultsField = "results"
-    private val serializer = Json.nonstrict
-
-    override fun deserialize(decoder: Decoder): SauceNaoAnswer {
-        val raw = JsonObjectSerializer.deserialize(decoder)
-        val header = serializer.fromJson(Header.serializer(), raw.getObject(headerField))
-        val results = serializer.fromJson(resultsSerializer, raw.getArray(resultsField))
-
-        return SauceNaoAnswer(header, results, raw)
-    }
-
-    override fun serialize(encoder: Encoder, obj: SauceNaoAnswer) {
-        val resultObject = JsonObject(
-            obj.raw.content.let {
-                it + mapOf(
-                    headerField to serializer.toJson(Header.serializer(), obj.header),
-                    resultsField to serializer.toJson(resultsSerializer, obj.results)
-                )
-            }
-        )
-        JsonObject.serializer().serialize(encoder, resultObject)
-    }
-}

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt

@@ -1,19 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.utils
-
-import kotlinx.serialization.*
-import kotlinx.serialization.internal.ArrayListSerializer
-import kotlinx.serialization.internal.StringSerializer
-
-
-@Serializer(String::class)
-object CommonMultivariantStringSerializer : KSerializer<String> by StringSerializer {
-    private val stringArraySerializer = ArrayListSerializer(StringSerializer)
-
-    override fun deserialize(decoder: Decoder): String {
-        return try {
-            decoder.decodeSerializableValue(StringSerializer)
-        } catch (e: Exception) {
-            decoder.decodeSerializableValue(stringArraySerializer).joinToString()
-        }
-    }
-}

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/JSONSerializers.kt

@@ -1,162 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.utils
-
-import kotlinx.serialization.*
-import kotlinx.serialization.internal.*
-import kotlinx.serialization.json.*
-
-
-@Serializer(forClass = JsonElement::class)
-internal object JsonElementSerializer : KSerializer<JsonElement> {
-    override val descriptor: SerialDescriptor = object : SerialClassDescImpl("JsonElementSerializer") {
-        override val kind: SerialKind
-            get() = UnionKind.SEALED
-
-        init {
-            addElement("JsonElement")
-        }
-    }
-
-    override fun serialize(encoder: Encoder, obj: JsonElement) {
-        when (obj) {
-            is JsonPrimitive -> JsonPrimitiveSerializer.serialize(encoder, obj)
-            is JsonObject -> JsonObjectSerializer.serialize(encoder, obj)
-            is JsonArray -> JsonArraySerializer.serialize(encoder, obj)
-        }
-    }
-
-    override fun deserialize(decoder: Decoder): JsonElement {
-        val input = decoder as? JsonInput ?: error("JsonElement is deserializable only when used by Json")
-        return input.decodeJson()
-    }
-}
-
-@Serializer(forClass = JsonPrimitive::class)
-internal object JsonPrimitiveSerializer : KSerializer<JsonPrimitive> {
-    override val descriptor: SerialDescriptor =
-        JsonPrimitiveDescriptor
-
-    override fun serialize(encoder: Encoder, obj: JsonPrimitive) {
-        return if (obj is JsonNull) {
-            JsonNullSerializer.serialize(encoder, JsonNull)
-        } else {
-            JsonLiteralSerializer.serialize(encoder, obj as JsonLiteral)
-        }
-    }
-
-    override fun deserialize(decoder: Decoder): JsonPrimitive {
-        return if (decoder.decodeNotNullMark()) JsonPrimitive(decoder.decodeString())
-        else JsonNullSerializer.deserialize(decoder)
-    }
-
-    private object JsonPrimitiveDescriptor : SerialClassDescImpl("JsonPrimitive") {
-        override val kind: SerialKind
-            get() = PrimitiveKind.STRING
-
-        override val isNullable: Boolean
-            get() = true
-
-        init {
-            JsonPrimitiveSerializer.JsonPrimitiveDescriptor.addElement("JsonPrimitive")
-        }
-    }
-}
-
-@Serializer(forClass = JsonNull::class)
-internal object JsonNullSerializer : KSerializer<JsonNull> {
-    override val descriptor: SerialDescriptor =
-        JsonNullDescriptor
-
-    override fun serialize(encoder: Encoder, obj: JsonNull) {
-        encoder.encodeNull()
-    }
-
-    override fun deserialize(decoder: Decoder): JsonNull {
-        decoder.decodeNull()
-        return JsonNull
-    }
-
-    private object JsonNullDescriptor : SerialClassDescImpl("JsonNull") {
-        override val kind: SerialKind
-            get() = UnionKind.OBJECT
-
-        override val isNullable: Boolean
-            get() = true
-
-        init {
-            JsonNullSerializer.JsonNullDescriptor.addElement("JsonNull")
-        }
-    }
-}
-
-@Serializer(forClass = JsonLiteral::class)
-internal object JsonLiteralSerializer : KSerializer<JsonLiteral> {
-
-    override val descriptor: SerialDescriptor =
-        JsonLiteralDescriptor
-
-    override fun serialize(encoder: Encoder, obj: JsonLiteral) {
-        if (obj.isString) {
-            return encoder.encodeString(obj.content)
-        }
-
-        val integer = obj.intOrNull
-        if (integer != null) {
-            return encoder.encodeInt(integer)
-        }
-
-        val double = obj.doubleOrNull
-        if (double != null) {
-            return encoder.encodeDouble(double)
-        }
-
-        val boolean = obj.booleanOrNull
-        if (boolean != null) {
-            return encoder.encodeBoolean(boolean)
-        }
-
-        encoder.encodeString(obj.content)
-    }
-
-    override fun deserialize(decoder: Decoder): JsonLiteral {
-        return JsonLiteral(decoder.decodeString())
-    }
-
-    private object JsonLiteralDescriptor : SerialClassDescImpl("JsonLiteral") {
-        override val kind: SerialKind
-            get() = PrimitiveKind.STRING
-
-        init {
-            JsonLiteralSerializer.JsonLiteralDescriptor.addElement("JsonLiteral")
-        }
-    }
-}
-
-@Serializer(forClass = JsonObject::class)
-internal object JsonObjectSerializer : KSerializer<JsonObject> {
-    override val descriptor: SerialDescriptor =
-        NamedMapClassDescriptor("JsonObject", StringSerializer.descriptor,
-            JsonElementSerializer.descriptor)
-
-    override fun serialize(encoder: Encoder, obj: JsonObject) {
-        LinkedHashMapSerializer(StringSerializer, JsonElementSerializer).serialize(encoder, obj.content)
-    }
-
-    override fun deserialize(decoder: Decoder): JsonObject {
-        return JsonObject(LinkedHashMapSerializer(StringSerializer, JsonElementSerializer).deserialize(decoder))
-    }
-}
-
-@Serializer(forClass = JsonArray::class)
-internal object JsonArraySerializer : KSerializer<JsonArray> {
-
-    override val descriptor: SerialDescriptor = NamedListClassDescriptor("JsonArray",
-        JsonElementSerializer.descriptor)
-
-    override fun serialize(encoder: Encoder, obj: JsonArray) {
-        ArrayListSerializer(JsonElementSerializer).serialize(encoder, obj)
-    }
-
-    override fun deserialize(decoder: Decoder): JsonArray {
-        return JsonArray(ArrayListSerializer(JsonElementSerializer).deserialize(decoder))
-    }
-}

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/SleepCalculations.kt

@@ -1,18 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.utils
-
-import com.github.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
-import com.github.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
-import com.github.insanusmokrassar.SauceNaoAPI.models.Header
-import org.joda.time.DateTime
-
-internal suspend fun calculateSleepTime(
-    header: Header,
-    mostOldestInShortPeriodGetter: suspend () -> DateTime?,
-    mostOldestInLongPeriodGetter: suspend () -> DateTime?
-): DateTime? {
-    return when {
-        header.longRemaining < 1 -> mostOldestInLongPeriodGetter() ?.plusMillis(LONG_TIME_RECALCULATING_MILLIS)
-        header.shortRemaining < 1 -> mostOldestInShortPeriodGetter() ?.plusMillis(SHORT_TIME_RECALCULATING_MILLIS)
-        else -> null
-    }
-}