INSANEMODE/aniyomi-extensions-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AllAnime: Fix stuff & add new server (#1678)

Browse Source
This commit is contained in:
Secozzi
2023-06-04 08:47:12 +02:00
committed by GitHub
parent 064264e85e
commit 37435a7cdf
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/allanime/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'AllAnime'
pkgNameSuffix = 'en.allanime'
extClass = '.AllAnime'
extVersionCode = 20
extVersionCode = 21
libVersion = '13'
}

28
src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt
View File

@ -244,22 +244,28 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() {
)
videoJson.data.episode.sourceUrls.forEach { video ->
val videoUrl = if (video.sourceUrl.startsWith("#")) {
hexToText(video.sourceUrl.substringAfter("#"))
} else {
video.sourceUrl
}
val matchingMapping = mappings.firstOrNull { (altHoster, urlMatches) ->
altHosterSelection.contains(altHoster) && video.sourceUrl.containsAny(urlMatches)
altHosterSelection.contains(altHoster) && videoUrl.containsAny(urlMatches)
}
when {
video.sourceUrl.startsWith("/apivtwo/") && INTERAL_HOSTER_NAMES.any {
videoUrl.startsWith("/apivtwo/") && INTERAL_HOSTER_NAMES.any {
Regex("""\b${it.lowercase()}\b""").find(video.sourceName.lowercase()) != null &&
hosterSelection.contains(it.lowercase())
} -> {
serverList.add(Server(video.sourceUrl, "internal ${video.sourceName}", video.priority))
serverList.add(Server(videoUrl, "internal ${video.sourceName}", video.priority))
}
altHosterSelection.contains("player") && video.type == "player" -> {
serverList.add(Server(video.sourceUrl, "player", video.priority))
serverList.add(Server(videoUrl, "player", video.priority))
}
matchingMapping != null -> {
serverList.add(Server(video.sourceUrl, matchingMapping.first, video.priority))
serverList.add(Server(videoUrl, matchingMapping.first, video.priority))
}
}
}
@ -340,6 +346,10 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() {
}.filterNotNull().flatten(),
)
if (videoList.isEmpty()) {
throw Exception("No videos found")
}
return prioritySort(videoList)
}
@ -403,6 +413,12 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() {
return keywords.any { this.contains(it) }
}
fun hexToText(inputString: String): String {
return inputString.chunked(2).map {
it.toInt(16).toByte()
}.toByteArray().toString(Charsets.UTF_8)
}
// From Dopebox
private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
runBlocking {
@ -544,7 +560,7 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() {
companion object {
private const val PAGE_SIZE = 26 // number of items to retrieve when calling API
private val INTERAL_HOSTER_NAMES = arrayOf(
"Default", "Ac", "Ak", "Kir", "Luf-mp4",
"Default", "Ac", "Ak", "Kir", "Rab", "Luf-mp4",
"Si-Hls", "S-mp4", "Ac-Hls", "Uv-mp4", "Pn-Hls",
)

1
src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/extractors/AllAnimeExtractor.kt
View File

@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.animesource.model.Track
import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.network.GET
import kotlinx.serialization.Serializable
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import okhttp3.Headers
import okhttp3.HttpUrl.Companion.toHttpUrl