From f27c49377185342ab787ed770647a12908466353 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 2 Dec 2020 14:39:54 +0600 Subject: [PATCH] upmigration --- CHANGELOG.md | 8 ++++++++ settings.gradle | 2 +- .../kotlin/dev/inmo/SauceNaoAPI/OutputType.kt | 17 ----------------- .../additional/results/ResultHeader.kt | 9 --------- .../kotlin/dev/inmo/saucenaoapi/OutputType.kt | 17 +++++++++++++++++ .../{SauceNaoAPI => saucenaoapi}/SauceNaoAPI.kt | 12 ++++++------ .../SauceRequestSubject.kt | 2 +- .../additional/AdaptedAnswer.kt | 12 ++++++------ .../additional/Utils.kt | 2 +- .../additional/header/AccountInfo.kt | 6 +++--- .../additional/header/IndexInfo.kt | 4 ++-- .../additional/header/QueryResultsMetainfo.kt | 4 ++-- .../additional/header/ResultMetaInfo.kt | 4 ++-- .../additional/results/AdaptedResult.kt | 10 +++++----- .../additional/results/ResultHeader.kt | 9 +++++++++ .../exceptions/TooManyRequestsException.kt | 6 +++--- .../models/Header.kt | 4 ++-- .../models/HeaderIndex.kt | 2 +- .../models/LimitsState.kt | 2 +- .../models/Result.kt | 2 +- .../models/ResultData.kt | 4 ++-- .../models/ResultHeader.kt | 2 +- .../models/SauceNaoAnswer.kt | 4 ++-- .../utils/CommonMultivariantStringSerializer.kt | 3 +-- .../utils/RequestQuotaManager.kt | 14 +++++++------- .../utils/SauceCloseable.kt | 2 +- .../utils/SleepCalculations.kt | 8 ++++---- .../utils/TimeManager.kt | 6 +++--- src/jvmTest/kotlin/Launcher.kt | 4 ++-- 29 files changed, 94 insertions(+), 87 deletions(-) delete mode 100644 src/commonMain/kotlin/dev/inmo/SauceNaoAPI/OutputType.kt delete mode 100644 src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/ResultHeader.kt create mode 100644 src/commonMain/kotlin/dev/inmo/saucenaoapi/OutputType.kt rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/SauceNaoAPI.kt (95%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/SauceRequestSubject.kt (94%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/additional/AdaptedAnswer.kt (50%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/additional/Utils.kt (87%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/additional/header/AccountInfo.kt (83%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/additional/header/IndexInfo.kt (83%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/additional/header/QueryResultsMetainfo.kt (90%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/additional/header/ResultMetaInfo.kt (70%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/additional/results/AdaptedResult.kt (56%) create mode 100644 src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/ResultHeader.kt rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/exceptions/TooManyRequestsException.kt (86%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/models/Header.kt (96%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/models/HeaderIndex.kt (84%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/models/LimitsState.kt (84%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/models/Result.kt (78%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/models/ResultData.kt (98%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/models/ResultHeader.kt (88%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/models/SauceNaoAnswer.kt (94%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/utils/CommonMultivariantStringSerializer.kt (88%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/utils/RequestQuotaManager.kt (85%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/utils/SauceCloseable.kt (91%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/utils/SleepCalculations.kt (65%) rename src/commonMain/kotlin/dev/inmo/{SauceNaoAPI => saucenaoapi}/utils/TimeManager.kt (93%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94ab597..720bcde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: diff --git a/settings.gradle b/settings.gradle index 640a3b2..82bcc88 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'SauceNaoAPI' +rootProject.name = 'saucenaoapi' diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/OutputType.kt b/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/OutputType.kt deleted file mode 100644 index 2637f84..0000000 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/OutputType.kt +++ /dev/null @@ -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 -} diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/ResultHeader.kt b/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/ResultHeader.kt deleted file mode 100644 index cbb965d..0000000 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/ResultHeader.kt +++ /dev/null @@ -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 -) diff --git a/src/commonMain/kotlin/dev/inmo/saucenaoapi/OutputType.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/OutputType.kt new file mode 100644 index 0000000..15951c9 --- /dev/null +++ b/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 +} diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/SauceNaoAPI.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt similarity index 95% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/SauceNaoAPI.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt index 2b7e834..4966c38 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/SauceNaoAPI.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt @@ -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), diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/SauceRequestSubject.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceRequestSubject.kt similarity index 94% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/SauceRequestSubject.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceRequestSubject.kt index 8ab275b..3eca172 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/SauceRequestSubject.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceRequestSubject.kt @@ -1,4 +1,4 @@ -package dev.inmo.SauceNaoAPI +package dev.inmo.saucenaoapi import io.ktor.http.ContentType import io.ktor.utils.io.core.Input diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/AdaptedAnswer.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/AdaptedAnswer.kt similarity index 50% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/AdaptedAnswer.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/AdaptedAnswer.kt index b617804..fa85915 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/AdaptedAnswer.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/AdaptedAnswer.kt @@ -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 -> diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/Utils.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/Utils.kt similarity index 87% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/Utils.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/Utils.kt index 3ffa49e..36b0dcb 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/Utils.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/Utils.kt @@ -1,4 +1,4 @@ -package dev.inmo.SauceNaoAPI.additional +package dev.inmo.saucenaoapi.additional import com.soywiz.klock.TimeSpan diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/AccountInfo.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/AccountInfo.kt similarity index 83% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/AccountInfo.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/AccountInfo.kt index da63b5d..d9603d6 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/AccountInfo.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/AccountInfo.kt @@ -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( diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/IndexInfo.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/IndexInfo.kt similarity index 83% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/IndexInfo.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/IndexInfo.kt index 206252c..930235d 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/IndexInfo.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/IndexInfo.kt @@ -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, diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/QueryResultsMetainfo.kt similarity index 90% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/QueryResultsMetainfo.kt index 1a8308a..4926a45 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/QueryResultsMetainfo.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/QueryResultsMetainfo.kt @@ -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( diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/ResultMetaInfo.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/ResultMetaInfo.kt similarity index 70% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/ResultMetaInfo.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/ResultMetaInfo.kt index 626e588..7fc8b8a 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/header/ResultMetaInfo.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/ResultMetaInfo.kt @@ -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(), diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/AdaptedResult.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/AdaptedResult.kt similarity index 56% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/AdaptedResult.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/AdaptedResult.kt index 7a5931c..37ca910 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/additional/results/AdaptedResult.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/AdaptedResult.kt @@ -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 diff --git a/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/ResultHeader.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/results/ResultHeader.kt new file mode 100644 index 0000000..6fdb203 --- /dev/null +++ b/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 +) diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/exceptions/TooManyRequestsException.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/exceptions/TooManyRequestsException.kt similarity index 86% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/exceptions/TooManyRequestsException.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/exceptions/TooManyRequestsException.kt index 5e296a4..57df9cf 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/exceptions/TooManyRequestsException.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/exceptions/TooManyRequestsException.kt @@ -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 diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/Header.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Header.kt similarity index 96% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/Header.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Header.kt index ebc0866..2c2bae5 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/Header.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Header.kt @@ -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 diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/HeaderIndex.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/HeaderIndex.kt similarity index 84% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/HeaderIndex.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/models/HeaderIndex.kt index d78ac74..05e4771 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/HeaderIndex.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/HeaderIndex.kt @@ -1,4 +1,4 @@ -package dev.inmo.SauceNaoAPI.models +package dev.inmo.saucenaoapi.models import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/LimitsState.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/LimitsState.kt similarity index 84% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/LimitsState.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/models/LimitsState.kt index f1fbd14..156f28c 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/LimitsState.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/LimitsState.kt @@ -1,4 +1,4 @@ -package dev.inmo.SauceNaoAPI.models +package dev.inmo.saucenaoapi.models import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/Result.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Result.kt similarity index 78% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/Result.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Result.kt index d517a78..0457a19 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/Result.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/Result.kt @@ -1,4 +1,4 @@ -package dev.inmo.SauceNaoAPI.models +package dev.inmo.saucenaoapi.models import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/ResultData.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt similarity index 98% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/ResultData.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt index 52396dc..74cb01f 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/ResultData.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt @@ -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 diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/ResultHeader.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultHeader.kt similarity index 88% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/ResultHeader.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultHeader.kt index b509411..dfd49b5 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/ResultHeader.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultHeader.kt @@ -1,4 +1,4 @@ -package dev.inmo.SauceNaoAPI.models +package dev.inmo.saucenaoapi.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/SauceNaoAnswer.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/SauceNaoAnswer.kt similarity index 94% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/SauceNaoAnswer.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/models/SauceNaoAnswer.kt index c5e2126..a065703 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/models/SauceNaoAnswer.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/SauceNaoAnswer.kt @@ -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 diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/CommonMultivariantStringSerializer.kt similarity index 88% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/CommonMultivariantStringSerializer.kt index 471b8fc..293454b 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/CommonMultivariantStringSerializer.kt @@ -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.* diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/RequestQuotaManager.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt similarity index 85% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/RequestQuotaManager.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt index 587cc68..8144b2d 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/RequestQuotaManager.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt @@ -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 diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/SauceCloseable.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SauceCloseable.kt similarity index 91% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/SauceCloseable.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SauceCloseable.kt index c12da6b..4070f66 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/SauceCloseable.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SauceCloseable.kt @@ -1,4 +1,4 @@ -package dev.inmo.SauceNaoAPI.utils +package dev.inmo.saucenaoapi.utils import kotlinx.coroutines.supervisorScope diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/SleepCalculations.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SleepCalculations.kt similarity index 65% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/SleepCalculations.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SleepCalculations.kt index 8b9a946..3e8d64c 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/SleepCalculations.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SleepCalculations.kt @@ -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( diff --git a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/TimeManager.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt similarity index 93% rename from src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/TimeManager.kt rename to src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt index fb44245..0526c6f 100644 --- a/src/commonMain/kotlin/dev/inmo/SauceNaoAPI/utils/TimeManager.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt @@ -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 diff --git a/src/jvmTest/kotlin/Launcher.kt b/src/jvmTest/kotlin/Launcher.kt index 5fef72f..43a5d47 100644 --- a/src/jvmTest/kotlin/Launcher.kt +++ b/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.*