From e0f2d699eb3af6008b4a006d4e8977a7c2dbfc83 Mon Sep 17 00:00:00 2001 From: mobby45 <68152858+mobby45@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:31:24 +0200 Subject: [PATCH] Gradle Update + Anime World Fix --- src/it/animeworld/build.gradle | 2 +- .../tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/it/animeworld/build.gradle b/src/it/animeworld/build.gradle index 8762b331..ee2b1985 100644 --- a/src/it/animeworld/build.gradle +++ b/src/it/animeworld/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'ANIMEWORLD.tv' extClass = '.ANIMEWORLD' - extVersionCode = 37 + extVersionCode = 38 } apply from: "$rootDir/common.gradle" diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt index 7e1b11ea..d0043b39 100644 --- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt +++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt @@ -14,10 +14,8 @@ import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor -import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup -import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import okhttp3.HttpUrl.Companion.toHttpUrl @@ -140,7 +138,7 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() { serverList.add(Pair(name, url)) } - val videoList = serverList.parallelCatchingFlatMapBlocking { server -> + val videoList = serverList.flatMap { server -> val url = server.second when { url.contains("streamingaw") -> { @@ -150,10 +148,6 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() { DoodExtractor(client).videoFromUrl(url, redirect = true) ?.let(::listOf) } - url.contains("streamtape") -> { - StreamTapeExtractor(client).videoFromUrl(url.replace("/v/", "/e/")) - ?.let(::listOf) - } url.contains("filemoon") -> { FilemoonExtractor(client).videosFromUrl(url, prefix = "${server.first} - ", headers = headers) }