small fix

0.9.0

.github/workflows/build_and_publish.yml

@@ -0,0 +1,23 @@
+name: Publish package to GitHub Packages
+on: [push]
+jobs:
+  publishing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Rewrite version
+        run: |
+          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
+          cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
+          rm gradle.properties
+          mv gradle.properties.tmp gradle.properties
+      - name: Build
+        run: ./gradlew build
+      - name: Publish
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
+        env:
+          GITHUBPACKAGES_USER: ${{ github.actor }}
+          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,70 @@
 # SauceNaoAPI Changelog
 
+## 0.9.1
+
+* Versions updates:
+  * `Kotlin`: `1.5.30` -> `1.5.31`
+  * `Klock`: `2.4.0` -> `2.4.2`
+  * `Coroutines`: `1.5.1` -> `1.5.2`
+* Add several extensions to `ResultData`: `authors`, `froms`, `charactersList`, `titles`, `urls`
+
+## 0.9.0
+
+* Versions updates:
+  * `Kotlin`: `1.5.10` -> `1.5.30`
+  * `Klock`: `2.1.2` -> `2.4.0`
+  * `Ktor`: `1.5.4` -> `1.6.3`
+  * `Serialization`: `1.2.1` -> `1.2.2`
+  * `Coroutines`: `1.5.0` -> `1.5.1`
+
+## 0.8.2
+
+* Versions updates:
+  * `Kotlin`: `1.4.32` -> `1.5.10`
+  * `Klock`: `2.0.7` -> `2.1.2`
+  * `Ktor`: `1.5.3` -> `1.5.4`
+  * `Serialization`: `1.1.0` -> `1.2.1`
+  * `Coroutines`: `1.4.3` -> `1.5.0`
+
+## 0.8.1
+
+* Versions updates:
+  * `Kotlin`: `1.4.31` -> `1.4.32`
+  * `Klock`: `2.0.6` -> `2.0.7`
+  * `Ktor`: `1.5.2` -> `1.5.3`
+
+## 0.8.0
+
+* Versions updates:
+  * `Kotlin`: `1.4.21` -> `1.4.31`
+  * `Klock`: `2.0.4` -> `2.0.6`
+  * `Ktor`: `1.5.1` -> `1.5.2`
+  * `Kotlin Serialisation`: `1.0.1` -> `1.1.0`
+  * `Kotlin Coroutines`: `1.4.2` -> `1.4.3`
+
+## 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:

README.md

@@ -1,6 +1,7 @@
 # SauceNaoAPI
 
-[![Download](https://api.bintray.com/packages/insanusmokrassar/InsanusMokrassar/SauceNaoAPI-mpp/images/download.svg)](https://bintray.com/insanusmokrassar/InsanusMokrassar/SauceNaoAPI-mpp/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/saucenaoapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/saucenaoapi)
+
 
 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
@@ -11,7 +12,7 @@ wrapper classes, but now you can access them via `SauceNaoAnswer#row` field.
 ### Gradle
 
 ```groovy
-implementation "com.insanusmokrassar:SauceNaoAPI:$saucenaoapi_version"
+implementation "dev.inmo:saucenaoapi:$saucenaoapi_version"
 ```
 
 ## Requester

build.gradle

@@ -1,7 +1,6 @@
 buildscript {
     repositories {
         mavenLocal()
-        jcenter()
         mavenCentral()
     }
 
@@ -18,7 +17,7 @@ plugins {
 }
 
 project.version = "$library_version"
-project.group = "com.insanusmokrassar"
+project.group = "dev.inmo"
 
 apply from: "publish.gradle"
 apply from: "github_release.gradle"
@@ -32,7 +31,7 @@ repositories {
 
 kotlin {
     jvm()
-    js(BOTH) {
+    js(IR) {
         browser()
         nodejs()
     }

gradle.properties

@@ -1,10 +1,10 @@
 kotlin.code.style=official
-kotlin_version=1.4.20
-kotlin_coroutines_version=1.4.2
-kotlin_serialisation_version=1.0.1
-klock_version=2.0.0
-ktor_version=1.4.3
+kotlin_version=1.5.31
+kotlin_coroutines_version=1.5.2
+kotlin_serialisation_version=1.2.2
+klock_version=2.4.2
+ktor_version=1.6.3
 
 gradle_github_release_plugin_version=2.2.12
 
-library_version=0.6.2
+library_version=0.9.1

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

publication.kpsb

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}-mpp","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,24 +1,9 @@
 apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
-task sourceJar (type : Jar) {
-    classifier = 'sources'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-            artifact sourceJar
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
 
 publishing {
     publications.all {
@@ -48,22 +33,37 @@ publishing {
                 
                     license {
                         name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                        url = "https://github.com/InsanusMokrassar/SauceNaoAPI/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')}/InsanusMokrassar/${project.name}-mpp/;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')
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
+                }
+            }
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
                 }
             }
         }
-        
     }
-}
+}
+
+signing {
+    useGpgCmd()
+    sign publishing.publications
+}

publish.kpsb

@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/SauceNaoAPI/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","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

settings.gradle

@@ -1 +1 @@
-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),
@@ -158,7 +158,7 @@ data class SauceNaoAPI(
         minSimilarity: Float? = null
     ): SauceNaoAnswer? {
         return suspendCoroutine<SauceNaoAnswer> {
-            requestsChannel.offer(
+            requestsChannel.trySend(
                 it to HttpRequestBuilder().apply {
                     url(searchUrl)
 
@@ -212,4 +212,4 @@ data class SauceNaoAPI(
         timeManager.close()
         quotaManager.close()
     }
-}
+}

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

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
 
@@ -159,3 +159,18 @@ data class ResultData(
     @SerialName("ext_urls")
     val extUrls: List<String> = emptyList()
 )
+
+val ResultData.froms: List<String>
+    get() = material ?.split(", ") ?: emptyList()
+
+val ResultData.authors: List<String>
+    get() = (creator ?.split(", ") ?: emptyList()) + (memberName ?.split(", ") ?: emptyList())
+
+val ResultData.charactersList: List<String>
+    get() = characters ?.split(", ") ?: emptyList()
+
+val ResultData.titles: List<String>
+    get() = title ?.split(", ") ?: emptyList()
+
+val ResultData.urls: List<String>
+    get() = extUrls + (url ?.split(", ") ?: emptyList())

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,8 +1,7 @@
-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.*

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
@@ -92,7 +92,7 @@ internal class RequestQuotaManager (
                     quotaActions.send(callback)
                 }
             }
-            quotaActions.offer(callback)
+            quotaActions.trySend(callback)
         }
     }
 

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
@@ -84,7 +84,7 @@ internal class TimeManager(
 
     suspend fun getMostOldestInLongPeriod(): DateTime? {
         return suspendCoroutine {
-            actionsChannel.offer(
+            actionsChannel.trySend(
                 TimeManagerMostOldestInLongGetter(it)
             )
         }
@@ -92,7 +92,7 @@ internal class TimeManager(
 
     suspend fun getMostOldestInShortPeriod(): DateTime? {
         return suspendCoroutine {
-            actionsChannel.offer(TimeManagerMostOldestInShortGetter(it))
+            actionsChannel.trySend(TimeManagerMostOldestInShortGetter(it))
         }
     }
 

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.*