From 84dada200725396a82e7a38acf6902162473baae Mon Sep 17 00:00:00 2001 From: jmir1 Date: Tue, 7 Sep 2021 17:37:40 +0200 Subject: [PATCH] dependency and coroutines cleanup --- src/ar/witanime/build.gradle | 7 +--- .../animeextension/ar/witanime/WitAnime.kt | 8 ++--- src/ar/xsanime/build.gradle | 7 +--- .../animeextension/ar/xsanime/XsAnime.kt | 8 ++--- src/en/animepahe/build.gradle | 7 +--- src/en/gogoanime/build.gradle | 7 +--- .../animeextension/en/gogoanime/GogoAnime.kt | 9 ++--- src/en/hanime/build.gradle | 7 +--- src/en/twistmoe/build.gradle | 7 +--- .../animeextension/en/twistmoe/TwistMoe.kt | 36 ++++++++----------- 10 files changed, 27 insertions(+), 76 deletions(-) diff --git a/src/ar/witanime/build.gradle b/src/ar/witanime/build.gradle index 6957d6ae3..683d95d16 100644 --- a/src/ar/witanime/build.gradle +++ b/src/ar/witanime/build.gradle @@ -5,13 +5,8 @@ ext { extName = 'WIT ANIME' pkgNameSuffix = 'ar.witanime' extClass = '.WitAnime' - extVersionCode = 6 + extVersionCode = 7 libVersion = '12' } -dependencies { - ext.coroutinesVersion = "1.4.3" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") -} apply from: "$rootDir/common.gradle" diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt index 5a06381af..2593b8065 100644 --- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt +++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt @@ -6,9 +6,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.util.asJsoup -import kotlinx.coroutines.runBlocking import okhttp3.Headers.Companion.toHeaders import okhttp3.OkHttpClient import okhttp3.Request @@ -64,10 +62,8 @@ class WitAnime : ParsedAnimeHttpSource() { val referer = response.request.url.encodedPath val newHeaderList = mutableMapOf(Pair("referer", baseUrl + referer)) headers.forEach { newHeaderList[it.first] = it.second } - val iframeResponse = runBlocking { - client.newCall(GET(iframe, newHeaderList.toHeaders())) - .await().asJsoup() - } + val iframeResponse = client.newCall(GET(iframe, newHeaderList.toHeaders())) + .execute().asJsoup() return iframeResponse.select(videoListSelector()).map { videoFromElement(it) } } diff --git a/src/ar/xsanime/build.gradle b/src/ar/xsanime/build.gradle index d2d9ee66b..8bde3742e 100644 --- a/src/ar/xsanime/build.gradle +++ b/src/ar/xsanime/build.gradle @@ -5,13 +5,8 @@ ext { extName = 'XS Anime' pkgNameSuffix = 'ar.xsanime' extClass = '.XsAnime' - extVersionCode = 2 + extVersionCode = 3 libVersion = '12' } -dependencies { - ext.coroutinesVersion = "1.4.3" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") -} apply from: "$rootDir/common.gradle" diff --git a/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt b/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt index c1b930f7f..acbe5e7a4 100644 --- a/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt +++ b/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt @@ -7,9 +7,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.util.asJsoup -import kotlinx.coroutines.runBlocking import okhttp3.Headers.Companion.toHeaders import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.OkHttpClient @@ -66,10 +64,8 @@ class XsAnime : ParsedAnimeHttpSource() { val referer = response.request.url.encodedPath val newHeaderList = mutableMapOf(Pair("referer", baseUrl + referer)) headers.forEach { newHeaderList[it.first] = it.second } - val iframeResponse = runBlocking { - client.newCall(GET(iframe, newHeaderList.toHeaders())) - .await().asJsoup() - } + val iframeResponse = client.newCall(GET(iframe, newHeaderList.toHeaders())) + .execute().asJsoup() return iframeResponse.select(videoListSelector()).map { videoFromElement(it) } } diff --git a/src/en/animepahe/build.gradle b/src/en/animepahe/build.gradle index 8951e6f62..c4dbd47f2 100644 --- a/src/en/animepahe/build.gradle +++ b/src/en/animepahe/build.gradle @@ -5,13 +5,8 @@ ext { extName = 'AnimePahe' pkgNameSuffix = 'en.animepahe' extClass = '.AnimePahe' - extVersionCode = 2 + extVersionCode = 3 libVersion = '12' } -dependencies { - ext.coroutinesVersion = "1.4.3" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") -} apply from: "$rootDir/common.gradle" diff --git a/src/en/gogoanime/build.gradle b/src/en/gogoanime/build.gradle index 7d1aa180c..359a9b28c 100644 --- a/src/en/gogoanime/build.gradle +++ b/src/en/gogoanime/build.gradle @@ -5,13 +5,8 @@ ext { extName = 'Gogoanime' pkgNameSuffix = 'en.gogoanime' extClass = '.GogoAnime' - extVersionCode = 10 + extVersionCode = 11 libVersion = '12' } -dependencies { - ext.coroutinesVersion = "1.4.3" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") -} apply from: "$rootDir/common.gradle" diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt index ec3e90e09..8787260ac 100644 --- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt +++ b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt @@ -6,9 +6,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.util.asJsoup -import kotlinx.coroutines.runBlocking import okhttp3.Headers import okhttp3.OkHttpClient import okhttp3.Request @@ -55,13 +53,12 @@ class GogoAnime : ParsedAnimeHttpSource() { val document = response.asJsoup() val totalEpisodes = document.select(episodeListSelector()).last().attr("ep_end") val id = document.select("input#movie_id").attr("value") - return runBlocking { episodesRequest(totalEpisodes, id) } + return episodesRequest(totalEpisodes, id) } - private suspend fun episodesRequest(totalEpisodes: String, id: String): List { + private fun episodesRequest(totalEpisodes: String, id: String): List { val request = GET("https://ajax.gogo-load.com/ajax/load-list-episode?ep_start=0&ep_end=$totalEpisodes&id=$id", headers) - val epResponse = client.newCall(request) - .await() + val epResponse = client.newCall(request).execute() val document = epResponse.asJsoup() return document.select("a").map { episodeFromElement(it) } } diff --git a/src/en/hanime/build.gradle b/src/en/hanime/build.gradle index 38c898c7f..961f8247f 100644 --- a/src/en/hanime/build.gradle +++ b/src/en/hanime/build.gradle @@ -5,14 +5,9 @@ ext { extName = 'hanime.tv' pkgNameSuffix = 'en.hanime' extClass = '.Hanime' - extVersionCode = 7 + extVersionCode = 8 libVersion = '12' containsNsfw = true } -dependencies { - ext.coroutinesVersion = "1.4.3" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") -} apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/src/en/twistmoe/build.gradle b/src/en/twistmoe/build.gradle index 9059c9dcc..90734a5fd 100644 --- a/src/en/twistmoe/build.gradle +++ b/src/en/twistmoe/build.gradle @@ -5,13 +5,8 @@ ext { extName = 'twist.moe' pkgNameSuffix = 'en.twistmoe' extClass = '.TwistMoe' - extVersionCode = 5 + extVersionCode = 6 libVersion = '12' } -dependencies { - ext.coroutinesVersion = "1.4.3" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") -} apply from: "$rootDir/common.gradle" diff --git a/src/en/twistmoe/src/eu/kanade/tachiyomi/animeextension/en/twistmoe/TwistMoe.kt b/src/en/twistmoe/src/eu/kanade/tachiyomi/animeextension/en/twistmoe/TwistMoe.kt index a6c02b9d2..ee35f1a25 100644 --- a/src/en/twistmoe/src/eu/kanade/tachiyomi/animeextension/en/twistmoe/TwistMoe.kt +++ b/src/en/twistmoe/src/eu/kanade/tachiyomi/animeextension/en/twistmoe/TwistMoe.kt @@ -13,8 +13,6 @@ import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST -import eu.kanade.tachiyomi.network.await -import kotlinx.coroutines.runBlocking import okhttp3.Headers import okhttp3.MediaType.Companion.toMediaType import okhttp3.Request @@ -134,16 +132,13 @@ class TwistMoe : AnimeHttpSource() { "" } if (malID.isNotEmpty()) { - val coverResponse = runBlocking { - val headers = Headers.Builder().apply { - add("Content-Type", "application/json") - add("Accept", "application/json") - }.build() - val bodyString = "{\"query\":\"query(\$id: Int){Media(type:ANIME,idMal:\$id){coverImage{large}}}\",\"variables\":{\"id\":$malID}}" - val body = bodyString.toRequestBody("application/json".toMediaType()) - client.newCall(POST("https://graphql.anilist.co", headers, body)) - .await() - } + val headers = Headers.Builder().apply { + add("Content-Type", "application/json") + add("Accept", "application/json") + }.build() + val bodyString = "{\"query\":\"query(\$id: Int){Media(type:ANIME,idMal:\$id){coverImage{large}}}\",\"variables\":{\"id\":$malID}}" + val body = bodyString.toRequestBody("application/json".toMediaType()) + val coverResponse = client.newCall(POST("https://graphql.anilist.co", headers, body)).execute() val imageUrl = JsonParser.parseString(coverResponse.body!!.string()) .asJsonObject.get("data") .asJsonObject.get("Media") @@ -152,16 +147,13 @@ class TwistMoe : AnimeHttpSource() { if (imageUrl.isNotEmpty()) anime.thumbnail_url = imageUrl } else { val query = anime.title - val coverResponse = runBlocking { - val headers = Headers.Builder().apply { - add("Content-Type", "application/json") - add("Accept", "application/json") - }.build() - val bodyString = "{\"query\":\"query(\$query: String){Media(type:ANIME,search:\$query){coverImage{large}}}\",\"variables\":{\"query\":\"$query\"}}" - val body = bodyString.toRequestBody("application/json".toMediaType()) - client.newCall(POST("https://graphql.anilist.co", headers, body)) - .await() - } + val headers = Headers.Builder().apply { + add("Content-Type", "application/json") + add("Accept", "application/json") + }.build() + val bodyString = "{\"query\":\"query(\$query: String){Media(type:ANIME,search:\$query){coverImage{large}}}\",\"variables\":{\"query\":\"$query\"}}" + val body = bodyString.toRequestBody("application/json".toMediaType()) + val coverResponse = client.newCall(POST("https://graphql.anilist.co", headers, body)).execute() val imageUrl = JsonParser.parseString(coverResponse.body!!.string()) .asJsonObject.get("data") .asJsonObject.get("Media")