From d4f902aefdd83bf5414180d9dcc06926d9aba1b8 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 21 Sep 2021 14:42:52 +0600 Subject: [PATCH 1/5] start 0.9.1 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 581e3fc..cee905f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # SauceNaoAPI Changelog +## 0.9.1 + ## 0.9.0 * Versions updates: diff --git a/gradle.properties b/gradle.properties index cddc234..ba15bbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ ktor_version=1.6.3 gradle_github_release_plugin_version=2.2.12 -library_version=0.9.0 +library_version=0.9.1 From 64109735f88a5391b290996fd071a3c94571e261 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 21 Sep 2021 14:44:21 +0600 Subject: [PATCH 2/5] update dependencies --- CHANGELOG.md | 5 +++++ gradle.properties | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cee905f..2c6f46e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## 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` + ## 0.9.0 * Versions updates: diff --git a/gradle.properties b/gradle.properties index ba15bbc..717444b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ kotlin.code.style=official -kotlin_version=1.5.30 -kotlin_coroutines_version=1.5.1 +kotlin_version=1.5.31 +kotlin_coroutines_version=1.5.2 kotlin_serialisation_version=1.2.2 -klock_version=2.4.0 +klock_version=2.4.2 ktor_version=1.6.3 gradle_github_release_plugin_version=2.2.12 From b5ceff32bd5685603353ff25df08d74fd997b27e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 21 Sep 2021 14:47:40 +0600 Subject: [PATCH 3/5] add several extensions to ResultData: authors, froms, charactersList, titles --- CHANGELOG.md | 1 + .../kotlin/dev/inmo/saucenaoapi/models/ResultData.kt | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c6f46e..a804ff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * `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` ## 0.9.0 diff --git a/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt index 74cb01f..f8f0263 100644 --- a/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt @@ -159,3 +159,15 @@ data class ResultData( @SerialName("ext_urls") val extUrls: List = emptyList() ) + +val ResultData.froms: List + get() = material ?.split(", ") ?: emptyList() + +val ResultData.authors: List + get() = creator ?.split(", ") ?: emptyList() + +val ResultData.charactersList: List + get() = characters ?.split(", ") ?: emptyList() + +val ResultData.titles: List + get() = title ?.split(", ") ?: emptyList() From 05b8d7738f5ac666404c071673e817c7ef5a0140 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 21 Sep 2021 15:10:33 +0600 Subject: [PATCH 4/5] extension ResultData#urls --- CHANGELOG.md | 2 +- .../kotlin/dev/inmo/saucenaoapi/models/ResultData.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a804ff4..f104ac4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ * `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` +* Add several extensions to `ResultData`: `authors`, `froms`, `charactersList`, `titles`, `urls` ## 0.9.0 diff --git a/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt index f8f0263..54c14cb 100644 --- a/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt @@ -171,3 +171,6 @@ val ResultData.charactersList: List val ResultData.titles: List get() = title ?.split(", ") ?: emptyList() + +val ResultData.urls: List + get() = extUrls + (url ?.split(", ") ?: emptyList()) From 60ae527dd09b52351274b68d15624468f0ddef4e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 21 Sep 2021 15:18:48 +0600 Subject: [PATCH 5/5] small fix --- src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt index 54c14cb..bc5e24d 100644 --- a/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt @@ -164,7 +164,7 @@ val ResultData.froms: List get() = material ?.split(", ") ?: emptyList() val ResultData.authors: List - get() = creator ?.split(", ") ?: emptyList() + get() = (creator ?.split(", ") ?: emptyList()) + (memberName ?.split(", ") ?: emptyList()) val ResultData.charactersList: List get() = characters ?.split(", ") ?: emptyList()