InsanusMokrassar/SauceNaoAPI
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/SauceNaoAPI.git synced 2024-11-04 22:33:47 +00:00
Code Issues Projects Releases Wiki Activity

upmigration

Browse Source
This commit is contained in:
InsanusMokrassar 2020-12-02 14:39:54 +06:00
parent 7bc1e822fc
commit f27c493771
29 changed files with 94 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -2,6 +2,14 @@
## 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.tgbotapi`
* Change implementation in your gradle files: `implementation "com.insanusmokrassar:SauceNaoAPI:*"` ->
`implementation "dev.inmo:saucenaoapi:*"`
## 0.6.2
* Versions updates:

2
settings.gradle
View File

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

17
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/OutputType.kt
View File

@ -1,17 +0,0 @@
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
}

9
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/ResultHeader.kt
View File

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

17
src/commonMain/kotlin/dev/inmo/saucenaoapi/OutputType.kt Normal file
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
}

12
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/SauceNaoAPI.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt
View File

@ -1,9 +1,9 @@
package dev.inmo.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: dev.inmo.SauceNaoAPI.OutputType = dev.inmo.SauceNaoAPI.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),

2
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/SauceRequestSubject.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceRequestSubject.kt
View File

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

12
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/AdaptedAnswer.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/AdaptedAnswer.kt
View File

@ -1,10 +1,10 @@
package dev.inmo.SauceNaoAPI.additional
package dev.inmo.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
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 ->

2
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/Utils.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/Utils.kt
View File

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

6
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/AccountInfo.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/AccountInfo.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.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(

4
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/IndexInfo.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/IndexInfo.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.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,

4
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/QueryResultsMetainfo.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.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(

4
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/ResultMetaInfo.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/ResultMetaInfo.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.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(),

10
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/AdaptedResult.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/AdaptedResult.kt
View File

@ -1,9 +1,9 @@
package dev.inmo.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

9
src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/ResultHeader.kt Normal file
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
)

6
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/exceptions/TooManyRequestsException.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/exceptions/TooManyRequestsException.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.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

4
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/Header.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Header.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.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

2
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/HeaderIndex.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/models/HeaderIndex.kt
View File

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

2
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/LimitsState.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/models/LimitsState.kt
View File

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

2
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/Result.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Result.kt
View File

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

4
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/ResultData.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.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

2
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/ResultHeader.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultHeader.kt
View File

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

4
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/SauceNaoAnswer.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/models/SauceNaoAnswer.kt
View File

@ -1,6 +1,6 @@
package dev.inmo.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

3
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/CommonMultivariantStringSerializer.kt
View File

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

14
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/RequestQuotaManager.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt
View File

@ -1,11 +1,11 @@
package dev.inmo.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

2
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/SauceCloseable.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SauceCloseable.kt
View File

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

8
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/SleepCalculations.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SleepCalculations.kt
View File

@ -1,8 +1,8 @@
package dev.inmo.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.models.Header
import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
import dev.inmo.saucenaoapi.models.Header
import com.soywiz.klock.DateTime
internal suspend fun calculateSleepTime(

6
src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/TimeManager.kt → src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.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

4
src/jvmTest/kotlin/Launcher.kt
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.*