forked from AlmightyHak/extensions-source
Merge pull request #25 from mobby45/fixAnimeWorld
[IT] Gradle Update + Anime World Fix
This commit is contained in:
commit
f64f39f26c
2 changed files with 2 additions and 8 deletions
|
@ -1,7 +1,7 @@
|
||||||
ext {
|
ext {
|
||||||
extName = 'ANIMEWORLD.tv'
|
extName = 'ANIMEWORLD.tv'
|
||||||
extClass = '.ANIMEWORLD'
|
extClass = '.ANIMEWORLD'
|
||||||
extVersionCode = 37
|
extVersionCode = 38
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$rootDir/common.gradle"
|
apply from: "$rootDir/common.gradle"
|
||||||
|
|
|
@ -14,10 +14,8 @@ import eu.kanade.tachiyomi.animesource.model.Video
|
||||||
import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
|
import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
|
||||||
import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
|
import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
|
||||||
import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
|
import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
|
||||||
import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
|
|
||||||
import eu.kanade.tachiyomi.network.GET
|
import eu.kanade.tachiyomi.network.GET
|
||||||
import eu.kanade.tachiyomi.util.asJsoup
|
import eu.kanade.tachiyomi.util.asJsoup
|
||||||
import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
|
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import okhttp3.HttpUrl.Companion.toHttpUrl
|
import okhttp3.HttpUrl.Companion.toHttpUrl
|
||||||
|
@ -140,7 +138,7 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
||||||
serverList.add(Pair(name, url))
|
serverList.add(Pair(name, url))
|
||||||
}
|
}
|
||||||
|
|
||||||
val videoList = serverList.parallelCatchingFlatMapBlocking { server ->
|
val videoList = serverList.flatMap { server ->
|
||||||
val url = server.second
|
val url = server.second
|
||||||
when {
|
when {
|
||||||
url.contains("streamingaw") -> {
|
url.contains("streamingaw") -> {
|
||||||
|
@ -150,10 +148,6 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
||||||
DoodExtractor(client).videoFromUrl(url, redirect = true)
|
DoodExtractor(client).videoFromUrl(url, redirect = true)
|
||||||
?.let(::listOf)
|
?.let(::listOf)
|
||||||
}
|
}
|
||||||
url.contains("streamtape") -> {
|
|
||||||
StreamTapeExtractor(client).videoFromUrl(url.replace("/v/", "/e/"))
|
|
||||||
?.let(::listOf)
|
|
||||||
}
|
|
||||||
url.contains("filemoon") -> {
|
url.contains("filemoon") -> {
|
||||||
FilemoonExtractor(client).videosFromUrl(url, prefix = "${server.first} - ", headers = headers)
|
FilemoonExtractor(client).videosFromUrl(url, prefix = "${server.first} - ", headers = headers)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue