AlmightyHak/extensions-source
2
0
Fork 1
Code Issues 296 Pull requests 6 Projects Releases Packages Wiki Activity Actions 1

Merge branch 'Kohi-den:main' into main

Browse source
This commit is contained in:
Zero 2025-04-10 13:01:58 +05:30 • committed by GitHub
commit 1a5ac6f37c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 118 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib-multisrc/anilist/build.gradle.kts
View file

@ -2,4 +2,4 @@ plugins {
id("lib-multisrc")
}
baseVersionCode = 3
baseVersionCode = 4

2
lib-multisrc/anilist/src/eu/kanade/tachiyomi/multisrc/anilist/AniListFilters.kt
View file

@ -110,6 +110,8 @@ object AniListFilters {
val YEAR_LIST = arrayOf(
Pair("<Select>", ""),
Pair("2026", "2026"),
Pair("2025", "2025"),
Pair("2024", "2024"),
Pair("2023", "2023"),
Pair("2022", "2022"),

2
lib-multisrc/zorotheme/build.gradle.kts
View file

@ -2,7 +2,7 @@ plugins {
id("lib-multisrc")
}
baseVersionCode = 4
baseVersionCode = 5
dependencies {
api(project(":lib:megacloud-extractor"))

2
lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroThemeFilters.kt
View file

@ -183,7 +183,7 @@ object ZoroThemeFilters {
Pair("Most Watched", "most_watched"),
)
val YEARS = arrayOf(ALL) + (1917..2024).map {
val YEARS = arrayOf(ALL) + (1917..2025).map {
Pair(it.toString(), it.toString())
}.reversed().toTypedArray()

4
lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt
View file

@ -141,7 +141,7 @@ class MegaCloudExtractor(
}
private fun getVideoDto(url: String): VideoDto {
val type = if (url.startsWith("https://megacloud.tv") or url.startsWith("https://megacloud.club")) 0 else 1
val type = if (url.startsWith("https://megacloud.tv") or url.startsWith("https://megacloud.blog")) 0 else 1
val keyType = SOURCES_KEY[type]
@ -184,4 +184,4 @@ class MegaCloudExtractor(
@Serializable
data class TrackDto(val file: String, val kind: String, val label: String = "")
}
}

2
lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/WebViewResolver.kt
View file

@ -92,7 +92,7 @@ class WebViewResolver(private val globalHeaders: Headers) {
val headers = mapOf("X-Requested-With" to "org.lineageos.jelly")
webView?.loadUrl("https://megacloud.tv/about", headers)
}
}
latch.await(TIMEOUT_SEC, TimeUnit.SECONDS)

6
src/en/animekhor/build.gradle
View file

@ -2,8 +2,8 @@ ext {
extName = 'AnimeKhor'
extClass = '.AnimeKhor'
themePkg = 'animestream'
baseUrl = 'https://animekhor.xyz'
overrideVersionCode = 6
baseUrl = 'https://animekhor.org'
overrideVersionCode = 7
}
apply from: "$rootDir/common.gradle"
@ -12,4 +12,4 @@ dependencies {
implementation(project(':lib:okru-extractor'))
implementation(project(':lib:streamwish-extractor'))
implementation(libs.jsunpacker)
}
}

2
src/en/animekhor/src/eu/kanade/tachiyomi/animeextension/en/animekhor/AnimeKhor.kt
View file

@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream
class AnimeKhor : AnimeStream(
"en",
"AnimeKhor",
"https://animekhor.xyz",
"https://animekhor.org",
) {
// ============================ Video Links =============================

2
src/en/aniplay/build.gradle
View file

@ -2,7 +2,7 @@ ext {
extName = 'AniPlay'
extClass = '.AniPlay'
themePkg = 'anilist'
overrideVersionCode = 15
overrideVersionCode = 17
}
apply from: "$rootDir/common.gradle"

129
src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt
View file

@ -30,7 +30,9 @@ import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.io.IOException
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import java.util.concurrent.locks.ReentrantLock
@Suppress("unused")
class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
@ -244,9 +246,9 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
val response = client.newCall(request).execute()
val responseString = response.body.string()
val sourcesString = extractSourcesList(responseString) ?: return emptyList()
Log.i("AniPlay", "${extra.source} $language -> $sourcesString")
try {
val sourcesString = extractSourcesList(responseString) ?: throw Exception("extractSourcesList null")
Log.i("AniPlay", "${extra.source} $language -> $sourcesString")
return processEpisodeData(
EpisodeData(
source = extra.source,
@ -260,14 +262,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
}
}
private fun getProxiedUrl(originalUrl: String, serverName: String, referer: String?): String {
return when (serverName) {
"Yuki" -> "$PROXY_URL/yukiprox?url=$originalUrl"
"Pahe" -> "$PROXY_URL/fetch?url=$originalUrl?ref=$referer"
else -> return originalUrl
}
}
private fun processEpisodeData(episodeData: EpisodeData): List<Video> {
val defaultSource = episodeData.response.sources?.firstOrNull {
it.quality in listOf("default", "auto")
@ -290,19 +284,44 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
}
try {
val url = getProxiedUrl(defaultSource.url, serverName, episodeData.response.headers?.Referer)
return playlistUtils.extractFromHls(
playlistUrl = url,
videoNameGen = { quality -> "$serverName - $quality - $typeName" },
subtitleList = subtitles,
masterHeadersGen = { baseHeaders: Headers, _: String ->
baseHeaders.newBuilder().apply {
when (serverName) {
// yuki
PREF_SERVER_ENTRIES[1] -> {
val url = "https://yukiprox.aniplaynow.live/m3u8-proxy?url=${defaultSource.url}&headers={\"Referer\":\"https://megacloud.club/\"}"
return playlistUtils.extractFromHls(
playlistUrl = url,
videoNameGen = { quality -> "$serverName - $quality - $typeName" },
subtitleList = subtitles,
masterHeadersGen = { baseHeaders: Headers, _: String ->
baseHeaders.newBuilder().apply {
set("Accept", "*/*")
set("Origin", baseUrl)
set("Referer", "$baseUrl/")
}.build()
},
videoHeadersGen = { baseHeaders: Headers, _, _: String ->
baseHeaders.newBuilder().apply {
set("Accept", "*/*")
set("Origin", baseUrl)
set("Referer", "$baseUrl/")
}.build()
},
)
}
// pahe
PREF_SERVER_ENTRIES[2] -> {
val url = "https://prox.aniplaynow.live/?url=${defaultSource.url}&ref=https://kwik.si"
val headers = headers.newBuilder().apply {
set("Accept", "*/*")
set("Origin", baseUrl)
set("Referer", "$baseUrl/")
}.build()
},
)
return listOf(Video(url, "$serverName - Video - $typeName", url, headers, subtitles, listOf()))
}
else -> {
throw Exception("Unknown serverName: $serverName (${episodeData.source})")
}
}
} catch (e: Exception) {
Log.e("AniPlay", "processEpisodeData extractFromHls Error (\"$serverName - $typeName\"): $e")
}
@ -358,6 +377,60 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
return if (bracketCount == 0) input.substring(startIndex - 1, endIndex) else null
}
private val headerFetchLock = ReentrantLock()
private var lastHeaderFetch = 0L
private fun fetchHeaders() {
val internalFetchHeaders = internalFetchHeaders@{
val currentTimestamp = Date().time
val timeout = lastHeaderFetch + (HEADERS_TIMEOUT_MINUTES * 60 * 1000)
// check only after 15 minutes
if (timeout > currentTimestamp) {
Log.i("AniPlay", "Skipping header update. $timeout > $currentTimestamp (${timeout - currentTimestamp}).")
return@internalFetchHeaders
}
val baseUrl = Base64.decode("aHR0cHM6Ly9qb3NlZmZzdHJha2EuZ2l0aHViLmlvL2FuaXBsYXktaGVhZGVycy8=", Base64.DEFAULT).toString(Charsets.UTF_8)
val preferredDomain = preferences.getString(PREF_DOMAIN_KEY, PREF_DOMAIN_DEFAULT)!!
try {
val url = ("$baseUrl$preferredDomain/headers.json").toHttpUrl()
val response = client.newCall(Request(url)).execute()
val body = response.body.string()
val domainHeaders = body.parseAs<DomainHeaders>()
domainsHeaders[preferredDomain] = domainHeaders
Log.i("AniPlay", "Fetched headers($preferredDomain): $domainHeaders")
} catch (e: Exception) {
Log.e("AniPlay", "Failed to fetch new headers: \"e\"")
return@internalFetchHeaders
}
lastHeaderFetch = Date().time
}
headerFetchLock.lock()
try {
internalFetchHeaders()
} finally {
headerFetchLock.unlock()
}
}
private fun getHeaderValue(serverHost: String, key: String): String {
fetchHeaders()
try {
val domainHeaders = domainsHeaders[serverHost] ?: throw Exception("Bad host: $serverHost")
return when (key) {
NEXT_ACTION_EPISODE_LIST -> domainHeaders.episodes
NEXT_ACTION_SOURCES_LIST -> domainHeaders.sources
else -> throw Exception("Bad key: $key")
}
} catch (e: Exception) {
Log.e("AniPlay", "getHeaderValue error. $e. (s:${domainsHeaders.size}, l:$lastHeaderFetch)")
throw e
}
}
/* ====================================== Preferences ====================================== */
override fun setupPreferenceScreen(screen: PreferenceScreen) {
@ -485,10 +558,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
} ?: 0L
}
private fun getHeaderValue(serverHost: String, key: String): String {
return HEADER_NEXT_ACTION[serverHost]?.get(key) ?: throw Exception("Bad host/key")
}
companion object {
private const val PREF_DOMAIN_KEY = "domain"
private val PREF_DOMAIN_ENTRIES = arrayOf("aniplaynow.live (default)", "aniplay.lol (backup/experimental)")
@ -524,18 +593,10 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
private const val NEXT_ACTION_EPISODE_LIST = "NEXT_ACTION_EPISODE_LIST"
private const val NEXT_ACTION_SOURCES_LIST = "NEXT_ACTION_SOURCES_LIST"
private val HEADER_NEXT_ACTION = mapOf(
PREF_DOMAIN_ENTRY_VALUES[0] to mapOf(
"NEXT_ACTION_EPISODE_LIST" to "7f07777b5f74e3edb312e0b718a560f9d3ad21aeba",
"NEXT_ACTION_SOURCES_LIST" to "7f11490e43dca1ed90fcb5b90bac1e5714a3e11232",
),
PREF_DOMAIN_ENTRY_VALUES[1] to mapOf(
"NEXT_ACTION_EPISODE_LIST" to "7f57233b7a6486e8211b883c502fa0450775f0ee98",
"NEXT_ACTION_SOURCES_LIST" to "7f48c7ffeb25edece852102a65d794a1dffa37aaac",
),
)
private const val PROXY_URL = "https://prox.aniplaynow.live"
private const val HEADERS_TIMEOUT_MINUTES = 60
private val DATE_FORMATTER = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
private var domainsHeaders = mutableMapOf<String, DomainHeaders>()
}
}

8
src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlayDto.kt
View file

@ -79,3 +79,11 @@ data class EpisodeExtra(
val episodeId: String,
val hasDub: Boolean,
)
// Headers
@Serializable
data class DomainHeaders(
val episodes: String,
val sources: String,
val time: Long,
)

2
src/en/kickassanime/build.gradle
View file

@ -1,7 +1,7 @@
ext {
extName = 'KickAssAnime'
extClass = '.KickAssAnime'
extVersionCode = 45
extVersionCode = 46
}
apply from: "$rootDir/common.gradle"

2
src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
View file

@ -339,7 +339,7 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
private const val PREF_DOMAIN_KEY = "preferred_domain"
private const val PREF_DOMAIN_TITLE = "Preferred domain (requires app restart)"
private const val PREF_DOMAIN_DEFAULT = "https://kaas.to"
private val PREF_DOMAIN_ENTRIES = arrayOf("kaas.to", "kaas.ro", "kickassanimes.io", "www1.kickassanime.mx")
private val PREF_DOMAIN_ENTRIES = arrayOf("kaas.to", "kaas.ro", "kaa.mx", "kickassanimes.io", "www1.kickassanime.mx")
private val PREF_DOMAIN_ENTRY_VALUES = PREF_DOMAIN_ENTRIES.map { "https://$it" }.toTypedArray()
private const val PREF_HOSTER_KEY = "hoster_selection"