update dependencies

0.7.1

CHANGELOG.md

@@ -1,6 +1,46 @@
 # SauceNaoAPI Changelog
 
-### 0.6.0
+## 0.7.2
+
+* Versions updates:
+  * `Klock`: `2.0.2` -> `2.0.4`
+  * `Ktor`: `1.5.0` -> `1.5.1`
+
+## 0.7.1
+
+* Versions updates:
+  * `Kotlin`: `1.4.20` -> `1.4.21`
+  * `Klock`: `2.0.0` -> `2.0.2`
+  * `Ktor`: `1.4.3` -> `1.5.0`
+
+## 0.7.0
+
+**BREAKING CHANGES: PACKAGE HAS BEEN CHANGED FROM `com.insanusmokrassar` to `dev.inmo`**
+
+Migration:
+
+* Packages in the whole project were changed `com.insanusmokrassar.SauceNaoAPI` -> `dev.inmo.saucenaoapi`
+* Change implementation in your gradle files: `implementation "com.insanusmokrassar:SauceNaoAPI:*"` ->
+`implementation "dev.inmo:saucenaoapi:*"`
+
+## 0.6.2
+
+* Versions updates:
+  * `Kotlin`: `1.4.10` -> `1.4.20`
+  * `Kotlin Serialisation`: `1.0.0-RC2` -> `1.0.1`
+  * `Kotlin Coroutines`: `1.3.9` -> `1.4.2`
+  * `Klock`: `1.12.1` -> `2.0.0`
+  * `Ktor`: `1.4.1` -> `1.4.3`
+
+## 0.6.1
+
+* Versions updates:
+  * `Kotlin`: `1.4.0` -> `1.4.10`
+  * `Kotlin Serialisation`: `1.0.0-RC` -> `1.0.0-RC2`
+  * `Klock`: `1.12.0` -> `1.12.1`
+  * `Ktor`: `1.4.0` -> `1.4.1`
+
+## 0.6.0
 
 **MAIN PACKAGE WAS CHANGED: `com.github.insanusmokrassar` -> `com.insanusmokrassar`**
 
@@ -16,19 +56,7 @@
 
 * Versions updates
 
-## 0.4.0
-
-* Update libraries versions
-    * Kotlin `1.3.31` -> `1.3.50`
-    * Coroutines `1.2.1` -> `1.3.2`
-    * Serialization `0.11.0` -> `0.13.0`
-    * Joda Time `2.10.1` -> `2.10.4`
-    * Ktor `1.1.4` -> `1.2.5`
-* Now `SauceNaoAPI` is `Closeable`
-* Now `SauceNaoAPI` working with synchronous queue
-* `SauceNaoAPI` now will wait for some time when one of limits will be achieved
-
-### 0.4.4
+## 0.4.4
 
 * Uploading of file
 * Updates of versions
@@ -36,15 +64,15 @@
 * `SauceNaoAPI` instances now can return `limitsState` object, which will contains `LimitsState` with currently known
 state of limits
 
-### 0.4.3
+## 0.4.3
 
 Hotfix for serializer of `SauceNaoAnswer`
 
-### 0.4.2
+## 0.4.2
 
 Hotfix for autostop for some time when there is no remaining quotas for requests
 
-### 0.4.1 Managers experiments and row format in answer
+## 0.4.1 Managers experiments and row format in answer
 
 * Add `TimeManager` - it will manage work with requests times
 * Add `RequestQuotaMagager` - it will manage quota for requests and call suspend
@@ -53,6 +81,18 @@ if they will be over
 * Now `SauceNaoAnswer` have field `row` which contains `JsonObject` with
 all original answer fields
 
+## 0.4.0
+
+* Update libraries versions
+  * Kotlin `1.3.31` -> `1.3.50`
+  * Coroutines `1.2.1` -> `1.3.2`
+  * Serialization `0.11.0` -> `0.13.0`
+  * Joda Time `2.10.1` -> `2.10.4`
+  * Ktor `1.1.4` -> `1.2.5`
+* Now `SauceNaoAPI` is `Closeable`
+* Now `SauceNaoAPI` working with synchronous queue
+* `SauceNaoAPI` now will wait for some time when one of limits will be achieved
+
 ## 0.3.0
 
 * Now `results` field of `SauceNaoAnswer` is optional and is empty list by default

README.md

@@ -1,9 +1,19 @@
 # SauceNaoAPI
 
+ [ ![Download](https://api.bintray.com/packages/insanusmokrassar/SauceNaoAPI/saucenaoapi/images/download.svg) ](https://bintray.com/insanusmokrassar/SauceNaoAPI/saucenaoapi/_latestVersion)
+
 It is wrapper for [SauceNAO](https://saucenao.com/) API. For now, library is
 in preview state. It can be fully used, but some of info can be unavailable from
 wrapper classes, but now you can access them via `SauceNaoAnswer#row` field.
 
+## Including
+
+### Gradle
+
+```groovy
+implementation "dev.inmo:saucenaoapi:$saucenaoapi_version"
+```
+
 ## Requester
 
 For the requests we are using `SauceNaoAPI` object. Unfortunately, for now it

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
+        classpath "com.github.breadmoirai:github-release:$gradle_github_release_plugin_version"
     }
 }
 
@@ -17,10 +17,11 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
 }
 
-project.version = "0.6.0"
-project.group = "com.insanusmokrassar"
+project.version = "$library_version"
+project.group = "dev.inmo"
 
 apply from: "publish.gradle"
+apply from: "github_release.gradle"
 
 repositories {
     mavenLocal()
@@ -43,7 +44,7 @@ kotlin {
                 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 "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_version"
                 api "com.soywiz.korlibs.klock:klock:$klock_version"
                 api "io.ktor:ktor-client-core:$ktor_version"
             }
@@ -54,18 +55,13 @@ kotlin {
                 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 {
+        jsTest {
             dependencies {
                 implementation kotlin('test-js')
             }

changelog_parser.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+function parse() {
+    version=$1
+
+    while IFS= read -r line && [ -z "`echo $line | grep -e "^#\+ $version"`" ]
+    do
+        : # do nothing
+    done
+
+    while IFS= read -r line && [ -z "`echo $line | grep -e "^#\+"`" ]
+    do
+        echo "$line"
+    done
+}
+
+version=$1
+file=$2
+
+if [ -n "$file" ]; then
+  parse $version < "$file"
+else
+  parse $version
+fi

github_release.gradle

@@ -0,0 +1,28 @@
+private String getCurrentVersionChangelog() {
+    OutputStream changelogDataOS = new ByteArrayOutputStream()
+    exec {
+        standardOutput = changelogDataOS
+        commandLine 'chmod', "+x", './changelog_parser.sh'
+        commandLine './changelog_parser.sh', "$library_version", 'CHANGELOG.md'
+    }
+
+    return changelogDataOS.toString().trim()
+}
+
+if (new File(projectDir, "secret.gradle").exists()) {
+    apply from: './secret.gradle'
+    apply plugin: "com.github.breadmoirai.github-release"
+
+    githubRelease {
+        token "${project.property('GITHUB_RELEASE_TOKEN')}"
+
+        owner "InsanusMokrassar"
+        repo "${rootProject.name}"
+
+        tagName "${project.version}"
+        releaseName "${project.version}"
+        targetCommitish "${project.version}"
+
+        body getCurrentVersionChangelog()
+    }
+}

gradle.properties

@@ -1,8 +1,10 @@
 kotlin.code.style=official
-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
+kotlin_version=1.4.21
+kotlin_coroutines_version=1.4.2
+kotlin_serialisation_version=1.0.1
+klock_version=2.0.4
+ktor_version=1.5.1
 
-gradle_bintray_plugin_version=1.8.5
+gradle_github_release_plugin_version=2.2.12
+
+library_version=0.7.2

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.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip

maven.publish.gradle

@@ -1,53 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-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

@@ -1 +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"}
+{"bintrayConfig":{"repo":"SauceNaoAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/${project.name}","autoPublish":true,"overridePublish":true},"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"}]}}

publish.gradle

@@ -1,55 +1,69 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-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')
-    filesSpec {
-        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 = "InsanusMokrassar"
-        name = "${project.name}-mpp"
-        vcsUrl = "https://github.com/InsanusMokrassar/${project.name}"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
-        }
-    }
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+task sourceJar (type : Jar) {
+    classifier = 'sources'
 }
 
-bintrayUpload.doFirst {
-    publications = publishing.publications.collect {
+afterEvaluate {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
-            null
+            artifactId = "${project.name}"
+            artifact sourceJar
         } else {
-            it.name
+            artifactId = "${project.name}-$name"
         }
-    } - null
+    }
 }
 
-bintrayUpload.dependsOn publishToMavenLocal
+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"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/SauceNaoAPI/${project.name}/;publish=1;override=1")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}

settings.gradle

@@ -1,18 +1 @@
-/*
- * This settings file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at https://docs.gradle.org/3.4.1/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
-rootProject.name = 'SauceNaoAPI'
+rootProject.name = 'saucenaoapi'

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

@@ -1,17 +0,0 @@
-package com.insanusmokrassar.SauceNaoAPI
-
-sealed class OutputType {
-    abstract val typeCode: Int
-}
-
-object HtmlOutputType : OutputType() {
-    override val typeCode: Int = 0
-}
-
-object XmlOutputType : OutputType() {
-    override val typeCode: Int = 1
-}
-
-object JsonOutputType : OutputType() {
-    override val typeCode: Int = 2
-}

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

@@ -1,23 +0,0 @@
-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/results/ResultHeader.kt

@@ -1,9 +0,0 @@
-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/utils/SleepCalculations.kt

@@ -1,18 +0,0 @@
-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/dev/inmo/saucenaoapi/OutputType.kt

@@ -0,0 +1,17 @@
+package dev.inmo.saucenaoapi
+
+sealed class OutputType {
+    abstract val typeCode: Int
+}
+
+object HtmlOutputType : dev.inmo.saucenaoapi.OutputType() {
+    override val typeCode: Int = 0
+}
+
+object XmlOutputType : dev.inmo.saucenaoapi.OutputType() {
+    override val typeCode: Int = 1
+}
+
+object JsonOutputType : dev.inmo.saucenaoapi.OutputType() {
+    override val typeCode: Int = 2
+}

src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt

@@ -1,9 +1,9 @@
-package com.insanusmokrassar.SauceNaoAPI
+package dev.inmo.saucenaoapi
 
-import com.insanusmokrassar.SauceNaoAPI.exceptions.TooManyRequestsException
-import com.insanusmokrassar.SauceNaoAPI.exceptions.sauceNaoAPIException
-import com.insanusmokrassar.SauceNaoAPI.models.*
-import com.insanusmokrassar.SauceNaoAPI.utils.*
+import dev.inmo.saucenaoapi.exceptions.TooManyRequestsException
+import dev.inmo.saucenaoapi.exceptions.sauceNaoAPIException
+import dev.inmo.saucenaoapi.models.*
+import dev.inmo.saucenaoapi.utils.*
 import io.ktor.client.HttpClient
 import io.ktor.client.features.ClientRequestException
 import io.ktor.client.request.*
@@ -40,7 +40,7 @@ val defaultSauceNaoParser = Json {
 
 data class SauceNaoAPI(
     private val apiToken: String? = null,
-    private val outputType: OutputType = JsonOutputType,
+    private val outputType: dev.inmo.saucenaoapi.OutputType = dev.inmo.saucenaoapi.JsonOutputType,
     private val client: HttpClient = HttpClient(),
     private val searchUrl: String = SEARCH_URL,
     private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default),

src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceRequestSubject.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.SauceNaoAPI
+package dev.inmo.saucenaoapi
 
 import io.ktor.http.ContentType
 import io.ktor.utils.io.core.Input

src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/AdaptedAnswer.kt

@@ -0,0 +1,23 @@
+package dev.inmo.saucenaoapi.additional
+
+import dev.inmo.saucenaoapi.additional.header.ResultMetaInfo
+import dev.inmo.saucenaoapi.additional.header.adapted
+import dev.inmo.saucenaoapi.additional.results.AdaptedResult
+import dev.inmo.saucenaoapi.additional.results.adapted
+import dev.inmo.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/dev/inmo/saucenaoapi/additional/Utils.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.SauceNaoAPI.additional
+package dev.inmo.saucenaoapi.additional
 
 import com.soywiz.klock.TimeSpan
 

src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/AccountInfo.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/IndexInfo.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/QueryResultsMetainfo.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/ResultMetaInfo.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/AdaptedResult.kt

@@ -1,9 +1,9 @@
-package com.insanusmokrassar.SauceNaoAPI.additional.results
+package dev.inmo.saucenaoapi.additional.results
 
-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
+import dev.inmo.saucenaoapi.additional.header.IndexInfo
+import dev.inmo.saucenaoapi.additional.header.ResultMetaInfo
+import dev.inmo.saucenaoapi.models.Result
+import dev.inmo.saucenaoapi.models.ResultData
 
 fun Result.adapted(
     resultMetaInfo: ResultMetaInfo

src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/ResultHeader.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/exceptions/TooManyRequestsException.kt

@@ -1,7 +1,7 @@
-package com.insanusmokrassar.SauceNaoAPI.exceptions
+package dev.inmo.saucenaoapi.exceptions
 
-import com.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
-import com.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
+import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
+import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
 import com.soywiz.klock.TimeSpan
 import io.ktor.client.features.ClientRequestException
 import io.ktor.client.statement.readText
@@ -9,18 +9,17 @@ 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)
-                }
+    return when (response.status) {
+        TooManyRequests -> {
+            val answerContent = response.readText()
+            when {
+                answerContent.contains("daily limit") -> TooManyRequestsLongException(answerContent)
+                else -> TooManyRequestsShortException(answerContent)
             }
-            else -> this
         }
+        else -> this
     }
+}
 
 sealed class TooManyRequestsException(message: String, cause: Throwable? = null) : IOException(message, cause) {
     abstract val answerContent: String

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Header.kt

@@ -1,6 +1,6 @@
-package com.insanusmokrassar.SauceNaoAPI.models
+package dev.inmo.saucenaoapi.models
 
-import com.insanusmokrassar.SauceNaoAPI.defaultSauceNaoParser
+import dev.inmo.saucenaoapi.defaultSauceNaoParser
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.descriptors.SerialDescriptor

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/HeaderIndex.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/LimitsState.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Result.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt

@@ -1,6 +1,6 @@
-package com.insanusmokrassar.SauceNaoAPI.models
+package dev.inmo.saucenaoapi.models
 
-import com.insanusmokrassar.SauceNaoAPI.utils.CommonMultivariantStringSerializer
+import dev.inmo.saucenaoapi.utils.CommonMultivariantStringSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultHeader.kt

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

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/SauceNaoAnswer.kt

@@ -1,6 +1,6 @@
-package com.insanusmokrassar.SauceNaoAPI.models
+package dev.inmo.saucenaoapi.models
 
-import com.insanusmokrassar.SauceNaoAPI.defaultSauceNaoParser
+import dev.inmo.saucenaoapi.defaultSauceNaoParser
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.encoding.Decoder

src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/CommonMultivariantStringSerializer.kt

@@ -1,17 +1,13 @@
-package com.insanusmokrassar.SauceNaoAPI.utils
+package dev.inmo.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

src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt

@@ -1,11 +1,11 @@
-package com.insanusmokrassar.SauceNaoAPI.utils
+package dev.inmo.saucenaoapi.utils
 
-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 dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
+import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
+import dev.inmo.saucenaoapi.exceptions.TooManyRequestsException
+import dev.inmo.saucenaoapi.exceptions.TooManyRequestsLongException
+import dev.inmo.saucenaoapi.models.Header
+import dev.inmo.saucenaoapi.models.LimitsState
 import com.soywiz.klock.DateTime
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel

src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SauceCloseable.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.SauceNaoAPI.utils
+package dev.inmo.saucenaoapi.utils
 
 import kotlinx.coroutines.supervisorScope
 

src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt

@@ -1,7 +1,7 @@
-package com.insanusmokrassar.SauceNaoAPI.utils
+package dev.inmo.saucenaoapi.utils
 
-import com.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
-import com.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
+import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
+import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
 import com.soywiz.klock.DateTime
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel

src/jvmTest/kotlin/Launcher.kt

@@ -1,5 +1,5 @@
-import com.insanusmokrassar.SauceNaoAPI.SauceNaoAPI
-import com.insanusmokrassar.SauceNaoAPI.utils.useSafe
+import dev.inmo.saucenaoapi.SauceNaoAPI
+import dev.inmo.saucenaoapi.utils.useSafe
 import io.ktor.http.ContentType
 import io.ktor.utils.io.streams.asInput
 import kotlinx.coroutines.*