diff --git a/CHANGELOG.md b/CHANGELOG.md index c37d395..db92ebc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ ### 0.6.0 * 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 diff --git a/build.gradle b/build.gradle index 56b653c..42073d5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,3 @@ -project.version = "0.6.0" -project.group = "com.github.insanusmokrassar" - buildscript { repositories { mavenLocal() @@ -15,9 +12,14 @@ buildscript { } } -apply plugin: 'kotlin' +plugins { + id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version" +} apply plugin: 'kotlinx-serialization' +project.version = "0.6.0" +project.group = "com.github.insanusmokrassar" + apply from: "publish.gradle" repositories { @@ -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 "com.soywiz.korlibs.klock:klock:$klock_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.13' + + 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') + } + } + } } diff --git a/gradle.properties b/gradle.properties index 2cf7165..ce49cf7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,8 @@ kotlin.code.style=official -kotlin_version=1.3.72 -kotlin_coroutines_version=1.3.8 -kotlin_serialisation_runtime_version=0.20.0 -klock_version=1.11.14 -ktor_version=1.3.2 +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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3d7bd11..340983a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip diff --git a/maven.publish.gradle b/maven.publish.gradle index 042777a..2acca31 100644 --- a/maven.publish.gradle +++ b/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" + } + + } + } + } +} \ No newline at end of file diff --git a/publication.kpsb b/publication.kpsb new file mode 100644 index 0000000..5779afd --- /dev/null +++ b/publication.kpsb @@ -0,0 +1 @@ +{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","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"} \ No newline at end of file diff --git a/publish.gradle b/publish.gradle index 6e8de12..b4dd71f 100644 --- a/publish.gradle +++ b/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' + repo = "StandardRepository" name = "${project.name}" 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 \ No newline at end of file diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/OutputType.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/OutputType.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/OutputType.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/OutputType.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt similarity index 94% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt index 2ff1e3b..db8e34c 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt @@ -5,20 +5,18 @@ import com.github.insanusmokrassar.SauceNaoAPI.exceptions.sauceNaoAPIException import com.github.insanusmokrassar.SauceNaoAPI.models.* import com.github.insanusmokrassar.SauceNaoAPI.utils.* import io.ktor.client.HttpClient -import io.ktor.client.call.call -import io.ktor.client.engine.okhttp.OkHttp import io.ktor.client.features.ClientRequestException import io.ktor.client.request.* import io.ktor.client.request.forms.* import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.readText import io.ktor.http.* +import io.ktor.utils.io.core.Closeable import io.ktor.utils.io.core.Input import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel import kotlinx.serialization.json.Json -import java.io.Closeable -import java.util.logging.Logger +import kotlinx.serialization.json.nonstrict import kotlin.Result import kotlin.coroutines.* @@ -35,15 +33,21 @@ private const val MINIMAL_SIMILARITY_FIELD = "minsim" private const val SEARCH_URL = "https://saucenao.com/search.php" +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(OkHttp), + private val client: HttpClient = HttpClient(), private val searchUrl: String = SEARCH_URL, - private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default) + private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default), + private val parser: Json = defaultSauceNaoParser ) : Closeable { - private val logger = Logger.getLogger("SauceNaoAPI") - private val requestsChannel = Channel, HttpRequestBuilder>>(Channel.UNLIMITED) private val timeManager = TimeManager(scope) private val quotaManager = RequestQuotaManager(scope) @@ -61,7 +65,6 @@ data class SauceNaoAPI( quotaManager.updateQuota(answer.header, timeManager) } catch (e: TooManyRequestsException) { - logger.warning("Exceed time limit. Answer was:\n${e.answerContent}") quotaManager.happenTooManyRequests(timeManager, e) requestsChannel.send(callback to requestBuilder) } catch (e: Exception) { @@ -87,7 +90,7 @@ data class SauceNaoAPI( suspend fun request( mediaInput: Input, - mimeType: ContentType = mediaInput.mimeType, + mimeType: ContentType, resultsCount: Int? = null, minSimilarity: Float? = null ): SauceNaoAnswer? = makeRequest( @@ -138,9 +141,8 @@ data class SauceNaoAPI( return try { val call = client.request(builder) val answerText = call.readText() - logger.info(answerText) timeManager.addTimeAndClear() - Json.nonstrict.parse( + parser.decodeFromString( SauceNaoAnswerSerializer, answerText ) diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceRequestSubject.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceRequestSubject.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceRequestSubject.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceRequestSubject.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/AdaptedAnswer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/AdaptedAnswer.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/AdaptedAnswer.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/AdaptedAnswer.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/Utils.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/Utils.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/Utils.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/Utils.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/AccountInfo.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/AccountInfo.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/AccountInfo.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/AccountInfo.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/IndexInfo.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/IndexInfo.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/IndexInfo.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/IndexInfo.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/ResultMetaInfo.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/ResultMetaInfo.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/ResultMetaInfo.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/header/ResultMetaInfo.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/AdaptedResult.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/AdaptedResult.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/AdaptedResult.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/AdaptedResult.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/ResultHeader.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/ResultHeader.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/ResultHeader.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/additional/results/ResultHeader.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt similarity index 79% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt index 6e450d8..7649f3d 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt @@ -9,6 +9,7 @@ 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() @@ -21,14 +22,14 @@ internal suspend fun ClientRequestException.sauceNaoAPIException(): Exception { } } -sealed class TooManyRequestsException : IOException() { +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() { +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() { +class TooManyRequestsLongException(override val answerContent: String) : TooManyRequestsException("Too many requests were sent in the long period") { override val waitTime: TimeSpan = LONG_TIME_RECALCULATING_MILLIS } diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Header.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Header.kt similarity index 63% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Header.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Header.kt index 5c20969..45482b4 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Header.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Header.kt @@ -1,9 +1,12 @@ package com.github.insanusmokrassar.SauceNaoAPI.models +import com.github.insanusmokrassar.SauceNaoAPI.defaultSauceNaoParser import kotlinx.serialization.* -import kotlinx.serialization.internal.StringDescriptor -import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonObjectSerializer +import kotlinx.serialization.builtins.serializer +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder +import kotlinx.serialization.json.* @Serializable data class Header( @@ -39,21 +42,24 @@ data class Header( ) internal object IndexesSerializer : KSerializer> { - override val descriptor: SerialDescriptor = StringDescriptor + override val descriptor: SerialDescriptor = String.serializer().descriptor override fun deserialize(decoder: Decoder): List { - val json = JsonObjectSerializer.deserialize(decoder) + 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(parsed.keys.max() ?: 0) { + return Array(parsed.keys.maxOrNull() ?: 0) { parsed[it] }.toList() } - override fun serialize(encoder: Encoder, obj: List) { + override fun serialize(encoder: Encoder, value: List) { TODO() } } diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/HeaderIndex.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/HeaderIndex.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/HeaderIndex.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/HeaderIndex.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/LimitsState.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/LimitsState.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/LimitsState.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/LimitsState.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Result.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Result.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Result.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Result.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultData.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultData.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultData.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultData.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultHeader.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultHeader.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultHeader.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/ResultHeader.kt diff --git a/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt new file mode 100644 index 0000000..234c332 --- /dev/null +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt @@ -0,0 +1,55 @@ +package com.github.insanusmokrassar.SauceNaoAPI.models + +import com.github.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.* + +@Serializable +private data class TemporalSauceNaoAnswerRepresentation( + val header: Header, + val results: List = emptyList(), +) + +@Serializable(SauceNaoAnswerSerializer::class) +data class SauceNaoAnswer internal constructor( + val header: Header, + val results: List = emptyList(), + val raw: JsonObject = JsonObject(emptyMap()) +) + +@Serializer(SauceNaoAnswer::class) +object SauceNaoAnswerSerializer : KSerializer { + 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) + } +} diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt similarity index 55% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt index 2a48ce0..cf0c7c7 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt @@ -3,6 +3,8 @@ package com.github.insanusmokrassar.SauceNaoAPI.utils import kotlinx.serialization.* import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.builtins.serializer +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.json.* @Serializer(String::class) @@ -10,10 +12,10 @@ object CommonMultivariantStringSerializer : KSerializer by String.serial private val stringArraySerializer = ListSerializer(String.serializer()) override fun deserialize(decoder: Decoder): String { - return try { - decoder.decodeSerializableValue(String.serializer()) - } catch (e: Exception) { - decoder.decodeSerializableValue(stringArraySerializer).joinToString() + 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") } } } diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/RequestQuotaManager.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/RequestQuotaManager.kt similarity index 98% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/RequestQuotaManager.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/RequestQuotaManager.kt index 5ce190b..f6fe356 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/RequestQuotaManager.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/RequestQuotaManager.kt @@ -7,9 +7,9 @@ import com.github.insanusmokrassar.SauceNaoAPI.exceptions.TooManyRequestsLongExc import com.github.insanusmokrassar.SauceNaoAPI.models.Header import com.github.insanusmokrassar.SauceNaoAPI.models.LimitsState import com.soywiz.klock.DateTime +import io.ktor.utils.io.core.Closeable import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel -import java.io.Closeable import kotlin.coroutines.suspendCoroutine import kotlin.math.max import kotlin.math.min diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/SleepCalculations.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/SleepCalculations.kt similarity index 100% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/SleepCalculations.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/SleepCalculations.kt diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/TimeManager.kt b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/TimeManager.kt similarity index 95% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/TimeManager.kt rename to src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/TimeManager.kt index 2b1d327..fa466a5 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/TimeManager.kt +++ b/src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/TimeManager.kt @@ -3,11 +3,10 @@ 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.soywiz.klock.DateTime -import com.soywiz.klock.TimeSpan +import io.ktor.utils.io.core.Closeable import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.launch -import java.io.Closeable import kotlin.coroutines.Continuation import kotlin.coroutines.suspendCoroutine @@ -44,7 +43,7 @@ private data class TimeManagerMostOldestInLongGetter( ) : TimeManagerAction { override suspend fun makeChangeWith(times: MutableList) { times.clearTooOldTimes() - continuation.resumeWith(Result.success(times.min())) + continuation.resumeWith(Result.success(times.minOrNull())) } } @@ -62,7 +61,7 @@ private data class TimeManagerMostOldestInShortGetter( Result.success( times.asSequence().filter { limitTime < it - }.min() + }.minOrNull() ) ) } diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/Launcher.kt b/src/jvmTest/kotlin/Launcher.kt similarity index 92% rename from src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/Launcher.kt rename to src/jvmTest/kotlin/Launcher.kt index 0de3855..99c50f3 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/Launcher.kt +++ b/src/jvmTest/kotlin/Launcher.kt @@ -1,5 +1,4 @@ -package com.github.insanusmokrassar.SauceNaoAPI - +import com.github.insanusmokrassar.SauceNaoAPI.SauceNaoAPI import io.ktor.http.ContentType import io.ktor.utils.io.streams.asInput import kotlinx.coroutines.* diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt b/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt deleted file mode 100644 index bb36673..0000000 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.github.insanusmokrassar.SauceNaoAPI.models - -import kotlinx.serialization.* -import kotlinx.serialization.builtins.ListSerializer -import kotlinx.serialization.json.* - -@Serializable -data class SauceNaoAnswer internal constructor( - val header: Header, - val results: List = emptyList(), - val raw: JsonObject = JsonObject(emptyMap()) -) - -@Serializer(SauceNaoAnswer::class) -object SauceNaoAnswerSerializer : KSerializer { - private val resultsSerializer = ListSerializer(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 stringRaw = serializer.stringify(JsonObjectSerializer, raw) - - return serializer.parse( - SauceNaoAnswer.serializer(), - stringRaw - ).copy( - raw = 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) - } -} diff --git a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/MimeTypeDecoder.kt b/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/MimeTypeDecoder.kt deleted file mode 100644 index 415909a..0000000 --- a/src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/MimeTypeDecoder.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.insanusmokrassar.SauceNaoAPI.utils - -import io.ktor.http.ContentType -import io.ktor.util.asStream -import io.ktor.utils.io.core.Input -import java.io.InputStream -import java.net.URLConnection - -val InputStream.mimeType: ContentType - get() { - val contentType = URLConnection.guessContentTypeFromStream(this) - return ContentType.parse(contentType) - } - -val Input.mimeType: ContentType - get() = asStream().mimeType