Compare commits

..

23 Commits
0.6.2 ... 0.8.1

Author SHA1 Message Date
dfe29296ab 0.8.1 changelog 2021-04-07 20:09:11 +06:00
ce1d185eff 0.8.1 + dependencies update 2021-04-07 20:00:20 +06:00
a78611a27c Merge pull request #75 from InsanusMokrassar/0.8.0
0.8.0
2021-03-08 00:39:19 +06:00
cba4b2ccdb update publish scripts 2021-03-08 00:38:32 +06:00
6aabcca9d2 update publish scripts 2021-03-08 00:37:31 +06:00
503c4226d7 update dependencies 2021-03-08 00:35:39 +06:00
d82bff2563 start 0.8.0 2021-03-08 00:32:50 +06:00
8391e20dce Merge pull request #64 from InsanusMokrassar/0.7.2
0.7.2
2021-02-01 13:12:58 +06:00
67244683dd update dependencies 2021-02-01 13:11:05 +06:00
948dede0c8 start 0.7.2 2021-02-01 13:06:12 +06:00
6f171c5f6d update readme 2020-12-23 13:59:22 +06:00
6d85ccfffa Merge pull request #54 from InsanusMokrassar/0.7.1
0.7.1
2020-12-23 13:51:01 +06:00
bce508a8c2 update ktor 2020-12-23 13:47:34 +06:00
224f0a6cc0 update versions 2020-12-16 14:29:28 +06:00
61937ed209 start 0.7.1 2020-12-16 14:28:28 +06:00
8e861020d8 Update README.md 2020-12-02 15:09:45 +06:00
c231b956b4 Merge pull request #48 from InsanusMokrassar/0.7.0
0.7.0
2020-12-02 14:46:36 +06:00
c14df69ae1 fix in changelog 2020-12-02 14:45:45 +06:00
f55744a038 update publishing 2020-12-02 14:44:25 +06:00
f27c493771 upmigration 2020-12-02 14:39:54 +06:00
7bc1e822fc update package 2020-12-02 14:32:26 +06:00
eb9456a233 start 0.7.0 2020-12-02 14:30:49 +06:00
8c8a02054d Merge pull request #47 from InsanusMokrassar/0.6.2
0.6.2
2020-12-02 14:23:36 +06:00
37 changed files with 165 additions and 155 deletions

View File

@@ -1,5 +1,44 @@
# SauceNaoAPI Changelog
## 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:

View File

@@ -1,6 +1,6 @@
# SauceNaoAPI
[![Download](https://api.bintray.com/packages/insanusmokrassar/InsanusMokrassar/SauceNaoAPI-mpp/images/download.svg)](https://bintray.com/insanusmokrassar/InsanusMokrassar/SauceNaoAPI-mpp/_latestVersion)
[ ![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
@@ -11,7 +11,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

View File

@@ -18,7 +18,7 @@ plugins {
}
project.version = "$library_version"
project.group = "com.insanusmokrassar"
project.group = "dev.inmo"
apply from: "publish.gradle"
apply from: "github_release.gradle"

View File

@@ -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.4.32
kotlin_coroutines_version=1.4.3
kotlin_serialisation_version=1.1.0
klock_version=2.0.7
ktor_version=1.5.3
gradle_github_release_plugin_version=2.2.12
library_version=0.6.2
library_version=0.8.1

View File

@@ -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-6.8.3-bin.zip

View File

@@ -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"}]}}

View File

@@ -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,27 @@ 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('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
}

1
publish.kpsb Normal file
View File

@@ -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":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

View File

@@ -1 +1 @@
rootProject.name = 'SauceNaoAPI'
rootProject.name = 'saucenaoapi'

View File

@@ -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
}

View File

@@ -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>
)

View File

@@ -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
)

View File

@@ -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
}
}

View File

@@ -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
}

View File

@@ -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),

View File

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

View File

@@ -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>
)

View File

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

View File

@@ -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(

View File

@@ -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,

View File

@@ -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(

View File

@@ -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(),

View File

@@ -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

View File

@@ -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
)

View File

@@ -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

View File

@@ -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

View File

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

View File

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

View File

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

View File

@@ -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

View File

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

View File

@@ -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

View File

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

View File

@@ -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

View File

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

View File

@@ -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

View File

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