Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
| 128428ce51 |
81 changed files with 253 additions and 602 deletions
4
.github/workflows/build_pull_request.yml
vendored
4
.github/workflows/build_pull_request.yml
vendored
|
|
@ -13,7 +13,7 @@ concurrency:
|
|||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CI_CHUNK_SIZE: 288
|
||||
CI_CHUNK_SIZE: 65
|
||||
|
||||
jobs:
|
||||
prepare:
|
||||
|
|
@ -86,7 +86,7 @@ jobs:
|
|||
build-cache-${{ github.event.pull_request.base.sha }}-
|
||||
build-cache-
|
||||
|
||||
- name: Build extensions
|
||||
- name: Build extensions (chunk ${{ matrix.chunk }})
|
||||
env:
|
||||
CI_CHUNK_NUM: ${{ matrix.chunk }}
|
||||
run: chmod +x ./gradlew && ./gradlew -p src assembleDebug
|
||||
|
|
|
|||
45
.github/workflows/build_push.yml
vendored
45
.github/workflows/build_push.yml
vendored
|
|
@ -37,14 +37,15 @@ jobs:
|
|||
projects=(src/*/*)
|
||||
echo "NUM_INDIVIDUAL_MODULES=${#projects[@]}" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Find lib changes
|
||||
id: modified-libs
|
||||
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
|
||||
with:
|
||||
files: lib/
|
||||
files_ignore: lib/**.md
|
||||
files_separator: " "
|
||||
safe_output: false
|
||||
# Temporary pause because of leak of tj-actions/changed-files
|
||||
# - name: Find lib changes
|
||||
# id: modified-libs
|
||||
# uses: tj-actions/changed-files@90a06d6ba9543371ab4df8eeca0be07ca6054959 #v42
|
||||
# with:
|
||||
# files: lib/
|
||||
# files_ignore: lib/**.md
|
||||
# files_separator: " "
|
||||
# safe_output: false
|
||||
|
||||
- name: Import GPG key
|
||||
uses: https://github.com/crazy-max/ghaction-import-gpg@v6 # v6.1.0
|
||||
|
|
@ -54,11 +55,12 @@ jobs:
|
|||
git_user_signingkey: true
|
||||
git_commit_gpgsign: true
|
||||
|
||||
- name: Bump extensions that uses a modified lib
|
||||
if: steps.modified-libs.outputs.any_changed == 'true'
|
||||
run: |
|
||||
chmod +x ./.github/scripts/bump-versions.py
|
||||
./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }}
|
||||
# # This step is going to commit, but this will not trigger another workflow.
|
||||
# - name: Bump extensions that uses a modified lib
|
||||
# if: steps.modified-libs.outputs.any_changed == 'true'
|
||||
# run: |
|
||||
# chmod +x ./.github/scripts/bump-versions.py
|
||||
# ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }}
|
||||
|
||||
- id: generate-matrices
|
||||
name: Create output matrices
|
||||
|
|
@ -104,17 +106,6 @@ jobs:
|
|||
- name: Set up Gradle
|
||||
uses: https://github.com/gradle/actions/setup-gradle@245c8a24de79c0dbeabaf19ebcbbd3b2c36f278d # v4
|
||||
|
||||
- name: Restore build cache
|
||||
uses: https://github.com/actions/cache/restore@v3
|
||||
with:
|
||||
path: |
|
||||
src/**/build
|
||||
!src/**/build/outputs
|
||||
key: build-cache-${{ github.sha }}-${{ matrix.chunk }}
|
||||
restore-keys: |
|
||||
build-cache-${{ github.sha }}-
|
||||
build-cache-
|
||||
|
||||
- name: Build extensions
|
||||
env:
|
||||
CI_CHUNK_NUM: ${{ matrix.chunk }}
|
||||
|
|
@ -123,7 +114,7 @@ jobs:
|
|||
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
|
||||
run: chmod +x ./gradlew && ./gradlew -p src assembleRelease
|
||||
|
||||
- name: Store build cache
|
||||
- name: Cache build directories
|
||||
uses: https://github.com/actions/cache/save@v3
|
||||
with:
|
||||
path: |
|
||||
|
|
@ -195,10 +186,6 @@ jobs:
|
|||
- name: Sync repo
|
||||
run: |
|
||||
rsync -a --delete --exclude .git --exclude .gitignore main/repo/ repo --exclude README.md --exclude repo.json
|
||||
|
||||
- name: Increase buffer size
|
||||
run: |
|
||||
git config --global http.postBuffer 157286400
|
||||
|
||||
- name: Deploy repo
|
||||
uses: https://github.com/EndBug/add-and-commit@v9
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
// solution inspired from https://github.com/drblgn/rabbit_wasm/blob/main/rabbit.ts
|
||||
// solution inspired from https://github.com/shimizudev/consumet.ts/blob/master/dist/extractors/megacloud/megacloud.getsrcs.js
|
||||
|
||||
const embed_url = 'https://megacloud.tv/embed-2/v2/e-1/';
|
||||
const embed_url = 'https://megacloud.tv/embed-2/e-1/';
|
||||
const referrer = 'https://hianime.to';
|
||||
const user_agent = navigator.userAgent;
|
||||
let wasm;
|
||||
|
|
@ -31,7 +31,7 @@ const image_data = {
|
|||
data: window.decoded_png,
|
||||
};
|
||||
const canvas = {
|
||||
baseUrl: 'https://megacloud.tv/embed-2/v2/e-1/1hnXq7VzX0Ex?k=1',
|
||||
baseUrl: 'https://megacloud.tv/embed-2/e-1/1hnXq7VzX0Ex?k=1',
|
||||
width: 0,
|
||||
height: 0,
|
||||
style: {
|
||||
|
|
@ -58,7 +58,7 @@ const fake_window = {
|
|||
},
|
||||
origin: 'https://megacloud.tv',
|
||||
location: {
|
||||
href: 'https://megacloud.tv/embed-2/v2/e-1/1hnXq7VzX0Ex?k=1',
|
||||
href: 'https://megacloud.tv/embed-2/e-1/1hnXq7VzX0Ex?k=1',
|
||||
origin: 'https://megacloud.tv',
|
||||
},
|
||||
performance: {
|
||||
|
|
@ -327,9 +327,9 @@ function initWasm() {
|
|||
__wbg_createElement_03cf347ddad1c8c0: function () {
|
||||
return applyToWindow(function (
|
||||
// @ts-ignore
|
||||
index,
|
||||
index,
|
||||
// @ts-ignore
|
||||
decodeIndex,
|
||||
decodeIndex,
|
||||
// @ts-ignore
|
||||
decodeIndexOffset) {
|
||||
return addToStack(canvas);
|
||||
|
|
@ -338,9 +338,9 @@ function initWasm() {
|
|||
__wbg_querySelector_118a0639aa1f51cd: function () {
|
||||
return applyToWindow(function (
|
||||
// @ts-ignore
|
||||
index,
|
||||
index,
|
||||
// @ts-ignore
|
||||
decodeIndex,
|
||||
decodeIndex,
|
||||
// @ts-ignore
|
||||
decodeOffset) {
|
||||
//let item = get(index).querySelector(decodeSub(decodeIndex, decodeOffset));
|
||||
|
|
@ -353,11 +353,11 @@ function initWasm() {
|
|||
return addToStack(nodeList);
|
||||
}, arguments);
|
||||
},
|
||||
__wbg_getAttribute_706ae88bd37410fa: function (offset,
|
||||
__wbg_getAttribute_706ae88bd37410fa: function (offset,
|
||||
// @ts-ignore
|
||||
index,
|
||||
index,
|
||||
// @ts-ignore
|
||||
decodeIndex,
|
||||
decodeIndex,
|
||||
// @ts-ignore
|
||||
decodeOffset) {
|
||||
//let attr = get(index).getAttribute(decodeSub(decodeIndex, decodeOffset));
|
||||
|
|
@ -676,7 +676,7 @@ async function getSources(xrax) {
|
|||
let res = {};
|
||||
try {
|
||||
await V();
|
||||
let getSourcesUrl = 'https://megacloud.tv/embed-2/v2/e-1/getSources?id=' +
|
||||
let getSourcesUrl = 'https://megacloud.tv/embed-2/ajax/e-1/getSources?id=' +
|
||||
fake_window.pid +
|
||||
'&v=' +
|
||||
fake_window.localStorage.kversion +
|
||||
|
|
@ -688,7 +688,7 @@ async function getSources(xrax) {
|
|||
headers: {
|
||||
'User-Agent': user_agent,
|
||||
//"Referrer": fake_window.origin + "/v2/embed-4/" + xrax + "?z=",
|
||||
Referer: embed_url + xrax + '?k=1&autoPlay=1&oa=0&asi=1',
|
||||
Referer: embed_url + xrax + '?k=1',
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
},
|
||||
method: 'GET',
|
||||
|
|
@ -711,4 +711,4 @@ async function getSources(xrax) {
|
|||
catch (err) {
|
||||
console.error(err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
package eu.kanade.tachiyomi.lib.megacloudextractor
|
||||
|
||||
import android.content.SharedPreferences
|
||||
import android.util.Base64
|
||||
import android.util.Log
|
||||
import eu.kanade.tachiyomi.animesource.model.Track
|
||||
import eu.kanade.tachiyomi.animesource.model.Video
|
||||
import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
|
||||
|
|
@ -22,12 +20,7 @@ import okhttp3.Headers
|
|||
import okhttp3.HttpUrl.Companion.toHttpUrl
|
||||
import okhttp3.OkHttpClient
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import java.security.MessageDigest
|
||||
import javax.crypto.Cipher
|
||||
import javax.crypto.spec.IvParameterSpec
|
||||
import javax.crypto.spec.SecretKeySpec
|
||||
|
||||
// MegaCloudExtractor
|
||||
class MegaCloudExtractor(
|
||||
private val client: OkHttpClient,
|
||||
private val headers: Headers,
|
||||
|
|
@ -45,16 +38,16 @@ class MegaCloudExtractor(
|
|||
|
||||
companion object {
|
||||
private val SERVER_URL = arrayOf("https://megacloud.tv", "https://rapid-cloud.co")
|
||||
private val SOURCES_URL = arrayOf("/embed-2/v2/e-1/getSources?id=", "/ajax/embed-6-v2/getSources?id=")
|
||||
private val SOURCES_URL = arrayOf("/embed-2/ajax/e-1/getSources?id=", "/ajax/embed-6-v2/getSources?id=")
|
||||
private val SOURCES_SPLITTER = arrayOf("/e-1/", "/embed-6-v2/")
|
||||
private val SOURCES_KEY = arrayOf("1", "6")
|
||||
private const val E1_SCRIPT_URL = "/js/player/a/v2/pro/embed-1.min.js"
|
||||
private const val E6_SCRIPT_URL = "/js/player/e6-player-v2.min.js"
|
||||
private const val E1_SCRIPT_URL = "https://megacloud.tv/js/player/a/prod/e1-player.min.js"
|
||||
private const val E6_SCRIPT_URL = "https://rapid-cloud.co/js/player/prod/e6-player-v2.min.js"
|
||||
private val MUTEX = Mutex()
|
||||
private var shouldUpdateKey = false
|
||||
private const val PREF_KEY_KEY = "megacloud_key_"
|
||||
private const val PREF_KEY_DEFAULT = "[[0, 0]]"
|
||||
|
||||
|
||||
private inline fun <reified R> runLocked(crossinline block: () -> R) = runBlocking(Dispatchers.IO) {
|
||||
MUTEX.withLock { block() }
|
||||
}
|
||||
|
|
@ -73,8 +66,8 @@ class MegaCloudExtractor(
|
|||
|
||||
private fun updateKey(type: String) {
|
||||
val scriptUrl = when (type) {
|
||||
"1" -> "${SERVER_URL[0]}$E1_SCRIPT_URL"
|
||||
"6" -> "${SERVER_URL[1]}$E6_SCRIPT_URL"
|
||||
"1" -> E1_SCRIPT_URL
|
||||
"6" -> E6_SCRIPT_URL
|
||||
else -> throw Exception("Unknown key type")
|
||||
}
|
||||
val script = noCacheClient.newCall(GET(scriptUrl, cache = cacheControl))
|
||||
|
|
@ -149,21 +142,16 @@ class MegaCloudExtractor(
|
|||
}
|
||||
|
||||
private fun getVideoDto(url: String): VideoDto {
|
||||
val type = if (
|
||||
url.startsWith("https://megacloud.tv") ||
|
||||
url.startsWith("https://megacloud.blog")
|
||||
) 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]
|
||||
|
||||
val id = url.substringAfter(SOURCES_SPLITTER[type], "")
|
||||
.substringBefore("?", "")
|
||||
.ifEmpty { throw Exception("Failed to extract ID from URL") }
|
||||
.substringBefore("?", "").ifEmpty { throw Exception("I HATE THE ANTICHRIST") }
|
||||
|
||||
// Previous method using WebViewResolver to get key
|
||||
// if (type == 0) {
|
||||
// return webViewResolver.getSources(id)!!
|
||||
// }
|
||||
if (type == 0) {
|
||||
return webViewResolver.getSources(id)!!
|
||||
}
|
||||
|
||||
val srcRes = client.newCall(GET(SERVER_URL[type] + SOURCES_URL[type] + id))
|
||||
.execute()
|
||||
|
|
@ -174,82 +162,11 @@ class MegaCloudExtractor(
|
|||
if (!data.encrypted) return json.decodeFromString<VideoDto>(srcRes)
|
||||
|
||||
val ciphered = data.sources.jsonPrimitive.content
|
||||
val decrypted = json.decodeFromString<List<VideoLink>>(
|
||||
// tryDecrypting(ciphered, keyType),
|
||||
tryDecrypting(ciphered),
|
||||
)
|
||||
val decrypted = json.decodeFromString<List<VideoLink>>(tryDecrypting(ciphered, keyType))
|
||||
|
||||
return VideoDto(decrypted, data.tracks)
|
||||
}
|
||||
|
||||
var megaKey: String? = null
|
||||
|
||||
private fun tryDecrypting(ciphered: String): String {
|
||||
return megaKey?.let { key ->
|
||||
try {
|
||||
decryptOpenSSL(ciphered, key).also {
|
||||
Log.i("MegaCloudExtractor", "Decrypted URL: $it")
|
||||
}
|
||||
} catch (e: RuntimeException) {
|
||||
Log.e("MegaCloudExtractor", "Decryption failed with existing key: ${e.message}")
|
||||
decryptWithNewKey(ciphered)
|
||||
}
|
||||
} ?: decryptWithNewKey(ciphered)
|
||||
}
|
||||
|
||||
private fun decryptWithNewKey(ciphered: String): String {
|
||||
val newKey = requestNewKey()
|
||||
megaKey = newKey
|
||||
return decryptOpenSSL(ciphered, newKey).also {
|
||||
Log.i("MegaCloudExtractor", "Decrypted URL with new key: $it")
|
||||
}
|
||||
}
|
||||
|
||||
private fun requestNewKey(): String =
|
||||
client.newCall(GET("https://raw.githubusercontent.com/yogesh-hacker/MegacloudKeys/refs/heads/main/keys.json"))
|
||||
.execute()
|
||||
.use { response ->
|
||||
if (!response.isSuccessful) throw IllegalStateException("Failed to fetch keys.json")
|
||||
val jsonStr = response.body.string()
|
||||
if (jsonStr.isEmpty()) throw IllegalStateException("keys.json is empty")
|
||||
val key = json.decodeFromString<Map<String, String>>(jsonStr)["mega"]
|
||||
?: throw IllegalStateException("Mega key not found in keys.json")
|
||||
Log.i("MegaCloudExtractor", "Using Mega Key: $key")
|
||||
megaKey = key
|
||||
key
|
||||
}
|
||||
|
||||
private fun decryptOpenSSL(encBase64: String, password: String): String {
|
||||
try {
|
||||
val data = Base64.decode(encBase64, Base64.NO_WRAP) // Base64.DEFAULT or Base64.NO_WRAP
|
||||
require(data.copyOfRange(0, 8).contentEquals("Salted__".toByteArray()))
|
||||
val salt = data.copyOfRange(8, 16)
|
||||
val (key, iv) = opensslKeyIv(password.toByteArray(), salt)
|
||||
|
||||
val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
|
||||
val secretKey = SecretKeySpec(key, "AES")
|
||||
val ivSpec = IvParameterSpec(iv)
|
||||
cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec)
|
||||
|
||||
val decrypted = cipher.doFinal(data.copyOfRange(16, data.size))
|
||||
return String(decrypted)
|
||||
} catch (e: Exception) {
|
||||
Log.e("DecryptOpenSSL", "Decryption failed: ${e.message}")
|
||||
throw RuntimeException("Decryption failed: ${e.message}", e)
|
||||
}
|
||||
}
|
||||
|
||||
private fun opensslKeyIv(password: ByteArray, salt: ByteArray, keyLen: Int = 32, ivLen: Int = 16): Pair<ByteArray, ByteArray> {
|
||||
var d = ByteArray(0)
|
||||
var d_i = ByteArray(0)
|
||||
while (d.size < keyLen + ivLen) {
|
||||
val md = MessageDigest.getInstance("MD5")
|
||||
d_i = md.digest(d_i + password + salt)
|
||||
d += d_i
|
||||
}
|
||||
return Pair(d.copyOfRange(0, keyLen), d.copyOfRange(keyLen, keyLen + ivLen))
|
||||
}
|
||||
|
||||
@Serializable
|
||||
data class VideoDto(
|
||||
val sources: List<VideoLink>,
|
||||
|
|
@ -268,4 +185,4 @@ class MegaCloudExtractor(
|
|||
|
||||
@Serializable
|
||||
data class TrackDto(val file: String, val kind: String, val label: String = "")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,33 +18,14 @@ class VoeExtractor(private val client: OkHttpClient) {
|
|||
|
||||
private val playlistUtils by lazy { PlaylistUtils(clientDdos) }
|
||||
|
||||
private val linkRegex = "(http|https)://([\\w_-]+(?:\\.[\\w_-]+)+)([\\w.,@?^=%&:/~+#-]*[\\w@?^=%&/~+#-])".toRegex()
|
||||
|
||||
private val base64Regex = Regex("'.*'")
|
||||
|
||||
private val scriptBase64Regex = "(let|var)\\s+\\w+\\s*=\\s*'(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)';".toRegex()
|
||||
|
||||
@Serializable
|
||||
data class VideoLinkDTO(val source: String)
|
||||
|
||||
private fun decodeVoeData(data: String): String {
|
||||
val shifted = data.map { char ->
|
||||
when (char) {
|
||||
in 'A'..'Z' -> 'A' + (char - 'A' + 13).mod(26)
|
||||
in 'a'..'z' -> 'a' + (char - 'a' + 13).mod(26)
|
||||
else -> char
|
||||
}
|
||||
}.joinToString()
|
||||
|
||||
val junk = listOf("@$", "^^", "~@", "%?", "*~", "!!", "#&")
|
||||
var result = shifted
|
||||
for (part in junk) {
|
||||
result = result.replace(part, "_")
|
||||
}
|
||||
val clean = result.replace("_", "")
|
||||
|
||||
val transformed = String(Base64.decode(clean, Base64.DEFAULT)).map {
|
||||
(it.code - 3).toChar()
|
||||
}.joinToString().reversed()
|
||||
|
||||
val decoded = String(Base64.decode(transformed, Base64.DEFAULT))
|
||||
|
||||
return json.decodeFromString<VideoLinkDTO>(decoded).source
|
||||
}
|
||||
data class VideoLinkDTO(val file: String)
|
||||
|
||||
fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
|
||||
var document = clientDdos.newCall(GET(url)).execute().asJsoup()
|
||||
|
|
@ -57,12 +38,25 @@ class VoeExtractor(private val client: OkHttpClient) {
|
|||
document = clientDdos.newCall(GET(originalUrl)).execute().asJsoup()
|
||||
}
|
||||
|
||||
val encodedVoeData = document.select("script").find { it.data().contains("MKGMa=\"")}?.data()
|
||||
?.substringAfter("MKGMa=\"")
|
||||
?.substringBefore('"') ?: return emptyList()
|
||||
|
||||
val playlistUrl = decodeVoeData(encodedVoeData)
|
||||
val alternativeScript = document.select("script").find { scriptBase64Regex.containsMatchIn(it.data()) }?.data()
|
||||
val script = document.selectFirst("script:containsData(const sources), script:containsData(var sources), script:containsData(wc0)")?.data()
|
||||
?: alternativeScript
|
||||
?: return emptyList()
|
||||
val playlistUrl = when {
|
||||
// Layout 1
|
||||
script.contains("sources") -> {
|
||||
val link = script.substringAfter("hls': '").substringBefore("'")
|
||||
if (linkRegex.matches(link)) link else String(Base64.decode(link, Base64.DEFAULT))
|
||||
}
|
||||
// Layout 2
|
||||
script.contains("wc0") || alternativeScript != null -> {
|
||||
val base64 = base64Regex.find(script)!!.value
|
||||
val decoded = Base64.decode(base64, Base64.DEFAULT).let(::String)
|
||||
|
||||
json.decodeFromString<VideoLinkDTO>(if (alternativeScript != null) decoded.reversed() else decoded).file
|
||||
}
|
||||
else -> return emptyList()
|
||||
}
|
||||
return playlistUtils.extractFromHls(playlistUrl,
|
||||
videoNameGen = { quality -> "${prefix}Voe:$quality" }
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'JavGG'
|
||||
extClass = '.Javgg'
|
||||
extVersionCode = 9
|
||||
extVersionCode = 7
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'SupJav'
|
||||
extClass = '.SupJavFactory'
|
||||
extVersionCode = 18
|
||||
extVersionCode = 16
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Anime4up'
|
||||
extClass = '.Anime4Up'
|
||||
extVersionCode = 66
|
||||
extVersionCode = 64
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Arab Seed'
|
||||
extClass = '.ArabSeed'
|
||||
extVersionCode = 21
|
||||
extVersionCode = 19
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Okanime'
|
||||
extClass = '.Okanime'
|
||||
extVersionCode = 16
|
||||
extVersionCode = 14
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Anime-Base'
|
||||
extClass = '.AnimeBase'
|
||||
extVersionCode = 35
|
||||
extVersionCode = 33
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Anime-Loads'
|
||||
extClass = '.AnimeLoads'
|
||||
extVersionCode = 20
|
||||
extVersionCode = 18
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'AnimeToast'
|
||||
extClass = '.AnimeToast'
|
||||
extVersionCode = 25
|
||||
extVersionCode = 23
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'AniWorld'
|
||||
extClass = '.AniWorld'
|
||||
extVersionCode = 28
|
||||
extVersionCode = 26
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Einfach'
|
||||
extClass = '.Einfach'
|
||||
extVersionCode = 20
|
||||
extVersionCode = 18
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'FilmPalast'
|
||||
extClass = '.FilmPalast'
|
||||
extVersionCode = 22
|
||||
extVersionCode = 20
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.Kinoking'
|
||||
themePkg = 'dooplay'
|
||||
baseUrl = 'https://kinoking.cc'
|
||||
overrideVersionCode = 26
|
||||
overrideVersionCode = 24
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Kool'
|
||||
extClass = '.Kool'
|
||||
extVersionCode = 17
|
||||
extVersionCode = 15
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Movie4k'
|
||||
extClass = '.Movie4k'
|
||||
extVersionCode = 14
|
||||
extVersionCode = 12
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Serienstream'
|
||||
extClass = '.Serienstream'
|
||||
extVersionCode = 27
|
||||
extVersionCode = 25
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
|||
val document = response.asJsoup()
|
||||
val sub = document.select("#anime-cover-sub-content .episode-node").mapIndexed { idx, it ->
|
||||
EpisodeResponse.Episode(
|
||||
id = idx.toDouble(),
|
||||
id = it.attr("title").toDoubleOrNull(),
|
||||
episodeIndex = idx.toString(),
|
||||
name = it.attr("title"),
|
||||
lang = "Sub",
|
||||
|
|
@ -138,7 +138,7 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
|||
}
|
||||
val dub = document.select("#anime-cover-dub-content .episode-node").mapIndexed { idx, it ->
|
||||
EpisodeResponse.Episode(
|
||||
id = idx.toDouble(),
|
||||
id = it.attr("title").toDoubleOrNull(),
|
||||
episodeIndex = idx.toString(),
|
||||
name = it.attr("title"),
|
||||
lang = "Dub",
|
||||
|
|
@ -301,6 +301,6 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
|||
private const val PREF_QUALITY_KEY = "preferred_quality"
|
||||
private const val PREF_QUALITY_TITLE = "Preferred quality"
|
||||
private const val PREF_QUALITY_DEFAULT = "1080p"
|
||||
private val PREF_QUALITY_LIST = arrayOf("2K", "1080p", "720p", "480p", "360p")
|
||||
private val PREF_QUALITY_LIST = arrayOf("1080p", "720p", "480p", "360p")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,13 +48,8 @@ class OwlExtractor(private val client: OkHttpClient, private val baseUrl: String
|
|||
luffy.forEach { stream ->
|
||||
noRedirectClient.newCall(GET("${stream.url}$jwt")).execute()
|
||||
.use { it.headers["Location"] }?.let {
|
||||
val resolution = when {
|
||||
stream.resolution?.endsWith("0") == true -> "${stream.resolution}p"
|
||||
else -> stream.resolution
|
||||
}
|
||||
|
||||
videoList.add(
|
||||
Video(it, "${link.lang} Luffy:${resolution ?: "Unknown"}", it),
|
||||
Video(it, "${link.lang} Luffy:${stream.resolution}", it),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
@ -88,10 +83,7 @@ class OwlExtractor(private val client: OkHttpClient, private val baseUrl: String
|
|||
return client.newCall(GET(url)).execute().let { it ->
|
||||
if (it.isSuccessful) {
|
||||
it.parseAs<Stream>().url.let {
|
||||
playlistUtils.extractFromHls(
|
||||
it,
|
||||
videoNameGen = { qty -> "$lang $server:$qty" },
|
||||
)
|
||||
playlistUtils.extractFromHls(it, videoNameGen = { qty -> "$lang $server:$qty" })
|
||||
}
|
||||
} else {
|
||||
emptyList()
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.AniWatchtv'
|
||||
themePkg = 'zorotheme'
|
||||
baseUrl = 'https://aniwatchtv.to'
|
||||
overrideVersionCode = 2
|
||||
overrideVersionCode = 1
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.Kaido'
|
||||
themePkg = 'zorotheme'
|
||||
baseUrl = 'https://kaido.to'
|
||||
overrideVersionCode = 10
|
||||
overrideVersionCode = 9
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.HiAnime'
|
||||
themePkg = 'zorotheme'
|
||||
baseUrl = 'https://hianimez.to'
|
||||
overrideVersionCode = 54
|
||||
overrideVersionCode = 52
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Animefenix'
|
||||
extClass = '.Animefenix'
|
||||
extVersionCode = 61
|
||||
extVersionCode = 59
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Animejl'
|
||||
extClass = '.Animejl'
|
||||
extVersionCode = 9
|
||||
extVersionCode = 7
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'AnimeMovil'
|
||||
extClass = '.AnimeMovil'
|
||||
extVersionCode = 33
|
||||
extVersionCode = 31
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Cine24h'
|
||||
extClass = '.Cine24h'
|
||||
extVersionCode = 15
|
||||
extVersionCode = 13
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'CineCalidad'
|
||||
extClass = '.CineCalidad'
|
||||
extVersionCode = 21
|
||||
extVersionCode = 19
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Cuevana'
|
||||
extClass = '.CuevanaFactory'
|
||||
extVersionCode = 50
|
||||
extVersionCode = 48
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.DeTodoPeliculas'
|
||||
themePkg = 'dooplay'
|
||||
baseUrl = 'https://detodopeliculas.nu'
|
||||
overrideVersionCode = 7
|
||||
overrideVersionCode = 5
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Doramasflix'
|
||||
extClass = '.Doramasflix'
|
||||
extVersionCode = 37
|
||||
extVersionCode = 35
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Doramasyt'
|
||||
extClass = '.Doramasyt'
|
||||
extVersionCode = 24
|
||||
extVersionCode = 22
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'EnNovelas'
|
||||
extClass = '.EnNovelas'
|
||||
extVersionCode = 23
|
||||
extVersionCode = 21
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'EstrenosDoramas'
|
||||
extClass = '.EstrenosDoramas'
|
||||
extVersionCode = 9
|
||||
extVersionCode = 7
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.FlixLatam'
|
||||
themePkg = 'dooplay'
|
||||
baseUrl = 'https://flixlatam.com'
|
||||
overrideVersionCode = 8
|
||||
overrideVersionCode = 6
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Gnula'
|
||||
extClass = '.Gnula'
|
||||
extVersionCode = 35
|
||||
extVersionCode = 33
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Hackstore'
|
||||
extClass = '.Hackstore'
|
||||
extVersionCode = 29
|
||||
extVersionCode = 27
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'HentaiLA'
|
||||
extClass = '.Hentaila'
|
||||
extVersionCode = 38
|
||||
extVersionCode = 36
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'HentaiTk'
|
||||
extClass = '.Hentaitk'
|
||||
extVersionCode = 17
|
||||
extVersionCode = 15
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'HomeCine'
|
||||
extClass = '.HomeCine'
|
||||
extVersionCode = 9
|
||||
extVersionCode = 7
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Jkanime'
|
||||
extClass = '.Jkanime'
|
||||
extVersionCode = 39
|
||||
extVersionCode = 37
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'LACartoons'
|
||||
extClass = '.Lacartoons'
|
||||
extVersionCode = 15
|
||||
extVersionCode = 13
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'MetroSeries'
|
||||
extClass = '.MetroSeries'
|
||||
extVersionCode = 22
|
||||
extVersionCode = 20
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'MhdFlix'
|
||||
extClass = '.MhdFlix'
|
||||
extVersionCode = 10
|
||||
extVersionCode = 8
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'MonosChinos'
|
||||
extClass = '.MonosChinos'
|
||||
extVersionCode = 39
|
||||
extVersionCode = 37
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'MundoDonghua'
|
||||
extClass = '.MundoDonghua'
|
||||
extVersionCode = 33
|
||||
extVersionCode = 31
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Otakuverso'
|
||||
extClass = '.Otakuverso'
|
||||
extVersionCode = 5
|
||||
extVersionCode = 3
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'PelisForte'
|
||||
extClass = '.PelisForte'
|
||||
extVersionCode = 34
|
||||
extVersionCode = 32
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Pelisplushd'
|
||||
extClass = '.PelisplushdFactory'
|
||||
extVersionCode = 77
|
||||
extVersionCode = 75
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Serieskao'
|
||||
extClass = '.Serieskao'
|
||||
extVersionCode = 8
|
||||
extVersionCode = 6
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.SoloLatino'
|
||||
themePkg = 'dooplay'
|
||||
baseUrl = 'https://sololatino.net'
|
||||
overrideVersionCode = 10
|
||||
overrideVersionCode = 8
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'TioanimeH'
|
||||
extClass = '.TioanimeHFactory'
|
||||
extVersionCode = 28
|
||||
extVersionCode = 26
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.Tiodonghua'
|
||||
themePkg = 'animestream'
|
||||
baseUrl = 'https://anime.tiodonghua.com'
|
||||
overrideVersionCode = 9
|
||||
overrideVersionCode = 7
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'VerAnimes'
|
||||
extClass = '.VerAnimes'
|
||||
extVersionCode = 14
|
||||
extVersionCode = 12
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'VerSeriesOnline'
|
||||
extClass = '.VerSeriesOnline'
|
||||
extVersionCode = 8
|
||||
extVersionCode = 6
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Zonaleros'
|
||||
extClass = '.Zonaleros'
|
||||
extVersionCode = 5
|
||||
extVersionCode = 3
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Anime-Sama'
|
||||
extClass = '.AnimeSama'
|
||||
extVersionCode = 13
|
||||
extVersionCode = 12
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import android.app.Application
|
|||
import android.content.SharedPreferences
|
||||
import androidx.preference.ListPreference
|
||||
import androidx.preference.PreferenceScreen
|
||||
import app.cash.quickjs.QuickJs
|
||||
import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
|
||||
import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
|
||||
import eu.kanade.tachiyomi.animesource.model.AnimesPage
|
||||
|
|
@ -18,7 +17,6 @@ import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor
|
|||
import eu.kanade.tachiyomi.network.GET
|
||||
import eu.kanade.tachiyomi.util.asJsoup
|
||||
import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
|
||||
import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
|
||||
import kotlinx.serialization.encodeToString
|
||||
import kotlinx.serialization.json.Json
|
||||
import okhttp3.HttpUrl.Companion.toHttpUrl
|
||||
|
|
@ -51,11 +49,12 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
|
||||
// ============================== Popular ===============================
|
||||
override fun popularAnimeParse(response: Response): AnimesPage {
|
||||
val doc = response.asJsoup()
|
||||
val doc = response.body.string()
|
||||
val page = response.request.url.fragment?.toInt() ?: 0
|
||||
val chunks = doc.select("#containerPepites > div a").chunked(5)
|
||||
val regex = Regex("^\\s*carteClassique\\(\\s*.*?\\s*,\\s*\"(.*?)\".*\\)", RegexOption.MULTILINE)
|
||||
val chunks = regex.findAll(doc).chunked(5).toList()
|
||||
val seasons = chunks.getOrNull(page - 1)?.flatMap {
|
||||
val animeUrl = "$baseUrl${it.attr("href")}"
|
||||
val animeUrl = "$baseUrl/catalogue/${it.groupValues[1]}"
|
||||
fetchAnimeSeasons(animeUrl)
|
||||
}?.toList().orEmpty()
|
||||
return AnimesPage(seasons, page < chunks.size)
|
||||
|
|
@ -73,7 +72,7 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
.removePathSegment(animeUrl.pathSize - 3)
|
||||
.build()
|
||||
fetchAnimeSeasons(url.toString())
|
||||
}.distinctBy { it.url }
|
||||
}
|
||||
return AnimesPage(seasons, false)
|
||||
}
|
||||
override fun latestUpdatesRequest(page: Int): Request = GET(baseUrl)
|
||||
|
|
@ -81,26 +80,29 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
// =============================== Search ===============================
|
||||
override fun getFilterList() = AnimeSamaFilters.FILTER_LIST
|
||||
|
||||
override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
|
||||
val url = "$baseUrl/catalogue/".toHttpUrl().newBuilder()
|
||||
override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
|
||||
if (query.startsWith(PREFIX_SEARCH)) {
|
||||
return AnimesPage(fetchAnimeSeasons("$baseUrl/catalogue/${query.removePrefix(PREFIX_SEARCH)}/"), false)
|
||||
}
|
||||
val params = AnimeSamaFilters.getSearchFilters(filters)
|
||||
params.types.forEach { url.addQueryParameter("type[]", it) }
|
||||
params.language.forEach { url.addQueryParameter("langue[]", it) }
|
||||
params.genres.forEach { url.addQueryParameter("genre[]", it) }
|
||||
url.addQueryParameter("search", query)
|
||||
url.addQueryParameter("page", "$page")
|
||||
return GET(url.build(), headers)
|
||||
val elements = database
|
||||
.asSequence()
|
||||
.filter { it.select("h1, p").fold(false) { v, e -> v || e.text().contains(query, true) } }
|
||||
.filter { params.include.all { p -> it.className().contains(p) } }
|
||||
.filter { params.exclude.none { p -> it.className().contains(p) } }
|
||||
.filter { params.types.fold(params.types.isEmpty()) { v, p -> v || it.className().contains(p) } }
|
||||
.filter { params.language.fold(params.language.isEmpty()) { v, p -> v || it.className().contains(p) } }
|
||||
.chunked(5)
|
||||
.toList()
|
||||
if (elements.isEmpty()) return AnimesPage(emptyList(), false)
|
||||
val animes = elements[page - 1].flatMap {
|
||||
fetchAnimeSeasons(it.getElementsByTag("a").attr("href"))
|
||||
}
|
||||
return AnimesPage(animes, page < elements.size)
|
||||
}
|
||||
|
||||
override fun searchAnimeParse(response: Response): AnimesPage {
|
||||
val document = response.asJsoup()
|
||||
val anime = document.select("#list_catalog > div a").parallelFlatMapBlocking {
|
||||
fetchAnimeSeasons(it.attr("href"))
|
||||
}
|
||||
val page = response.request.url.queryParameterValues("page").first()
|
||||
val hasNextPage = document.select("#list_pagination a:last-child").text() != page
|
||||
return AnimesPage(anime, hasNextPage)
|
||||
}
|
||||
override fun searchAnimeParse(response: Response): AnimesPage = throw UnsupportedOperationException()
|
||||
override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw UnsupportedOperationException()
|
||||
|
||||
// =========================== Anime Details ============================
|
||||
override suspend fun getAnimeDetails(anime: SAnime): SAnime = anime
|
||||
|
|
@ -119,10 +121,6 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
override fun episodeListParse(response: Response): List<SEpisode> = throw UnsupportedOperationException()
|
||||
|
||||
// ============================ Video Links =============================
|
||||
private val sibnetExtractor by lazy { SibnetExtractor(client) }
|
||||
private val vkExtractor by lazy { VkExtractor(client, headers) }
|
||||
private val sendvidExtractor by lazy { SendvidExtractor(client, headers) }
|
||||
|
||||
override suspend fun getVideoList(episode: SEpisode): List<Video> {
|
||||
val playerUrls = json.decodeFromString<List<List<String>>>(episode.url)
|
||||
val videos = playerUrls.flatMapIndexed { i, it ->
|
||||
|
|
@ -130,9 +128,9 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
it.parallelCatchingFlatMap { playerUrl ->
|
||||
with(playerUrl) {
|
||||
when {
|
||||
contains("sibnet.ru") -> sibnetExtractor.videosFromUrl(playerUrl, prefix)
|
||||
contains("vk.") -> vkExtractor.videosFromUrl(playerUrl, prefix)
|
||||
contains("sendvid.com") -> sendvidExtractor.videosFromUrl(playerUrl, prefix)
|
||||
contains("sibnet.ru") -> SibnetExtractor(client).videosFromUrl(playerUrl, prefix)
|
||||
contains("vk.") -> VkExtractor(client, headers).videosFromUrl(playerUrl, prefix)
|
||||
contains("sendvid.com") -> SendvidExtractor(client, headers).videosFromUrl(playerUrl, prefix)
|
||||
else -> emptyList()
|
||||
}
|
||||
}
|
||||
|
|
@ -142,16 +140,21 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
}
|
||||
|
||||
// ============================ Utils =============================
|
||||
private fun sanitizeEpisodesJs(doc: String) = doc
|
||||
.replace(Regex("[\"\t]"), "") // Fix trash format
|
||||
.replace("'", "\"") // Fix quotes
|
||||
.replace(Regex("/\\*.*?\\*/", setOf(RegexOption.MULTILINE, RegexOption.DOT_MATCHES_ALL)), "") // Remove block comments
|
||||
.replace(Regex("(^|,|\\[)\\s*//.*?$", RegexOption.MULTILINE), "$1") // Remove line comments
|
||||
.replace(Regex(",\\s*]"), "]") // Remove trailing comma
|
||||
|
||||
override fun List<Video>.sort(): List<Video> {
|
||||
val voices = preferences.getString(PREF_VOICES_KEY, PREF_VOICES_DEFAULT)!!
|
||||
val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
|
||||
val player = preferences.getString(PREF_PLAYER_KEY, PREF_PLAYER_DEFAULT)!!
|
||||
|
||||
return this.sortedWith(
|
||||
compareBy(
|
||||
{ it.quality.contains(voices, true) },
|
||||
{ it.quality.contains(quality) },
|
||||
{ it.quality.contains(player, true) },
|
||||
),
|
||||
).reversed()
|
||||
}
|
||||
|
|
@ -161,17 +164,14 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
return fetchAnimeSeasons(res)
|
||||
}
|
||||
|
||||
private val commentRegex by lazy { Regex("/\\*.*?\\*/", RegexOption.DOT_MATCHES_ALL) }
|
||||
private val seasonRegex by lazy { Regex("^\\s*panneauAnime\\(\"(.*)\", \"(.*)\"\\)", RegexOption.MULTILINE) }
|
||||
|
||||
private fun fetchAnimeSeasons(response: Response): List<SAnime> {
|
||||
val animeDoc = response.asJsoup()
|
||||
val animeUrl = response.request.url
|
||||
val animeName = animeDoc.getElementById("titreOeuvre")?.text() ?: ""
|
||||
|
||||
val seasonRegex = Regex("^\\s*panneauAnime\\(\"(.*)\", \"(.*)\"\\)", RegexOption.MULTILINE)
|
||||
val scripts = animeDoc.select("h2 + p + div > script, h2 + div > script").toString()
|
||||
val uncommented = commentRegex.replace(scripts, "")
|
||||
val animes = seasonRegex.findAll(uncommented).flatMapIndexed { animeIndex, seasonMatch ->
|
||||
val animes = seasonRegex.findAll(scripts).flatMapIndexed { animeIndex, seasonMatch ->
|
||||
val (seasonName, seasonStem) = seasonMatch.destructured
|
||||
if (seasonStem.contains("film", true)) {
|
||||
val moviesUrl = "$animeUrl/$seasonStem"
|
||||
|
|
@ -219,16 +219,23 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
|
||||
private fun fetchPlayers(url: String): List<List<String>> {
|
||||
val docUrl = "$url/episodes.js"
|
||||
val doc = client.newCall(GET(docUrl)).execute().use {
|
||||
if (!it.isSuccessful) return emptyList()
|
||||
it.body.string()
|
||||
val players = mutableListOf<List<String>>()
|
||||
val doc = client.newCall(GET(docUrl)).execute().run {
|
||||
if (code != 200) {
|
||||
close()
|
||||
return listOf()
|
||||
}
|
||||
body.string()
|
||||
}
|
||||
val urls = QuickJs.create().use { qjs ->
|
||||
qjs.evaluate(doc)
|
||||
val res = qjs.evaluate("JSON.stringify(Array.from({length: 10}, (e,i) => this[`eps\${i}`]).filter(e => e))")
|
||||
json.decodeFromString<List<List<String>>>(res as String)
|
||||
val sanitizedDoc = sanitizeEpisodesJs(doc)
|
||||
for (i in 1..8) {
|
||||
val numPlayers = getPlayers("eps$i", sanitizedDoc)
|
||||
if (numPlayers != null) players.add(numPlayers)
|
||||
}
|
||||
return List(urls[0].size) { i -> urls.mapNotNull { it.getOrNull(i) }.distinct() }
|
||||
val asPlayers = getPlayers("epsAS", sanitizedDoc)
|
||||
if (asPlayers != null) players.add(asPlayers)
|
||||
if (players.isEmpty()) return emptyList()
|
||||
return List(players[0].size) { i -> players.mapNotNull { it.getOrNull(i) }.distinct() }
|
||||
}
|
||||
|
||||
private fun getPlayers(playerName: String, doc: String): List<String>? {
|
||||
|
|
@ -269,22 +276,6 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
preferences.edit().putString(key, entry).commit()
|
||||
}
|
||||
}.also(screen::addPreference)
|
||||
|
||||
ListPreference(screen.context).apply {
|
||||
key = PREF_PLAYER_KEY
|
||||
title = "Lecteur par défaut"
|
||||
entries = PLAYERS
|
||||
entryValues = PLAYERS_VALUES
|
||||
setDefaultValue(PREF_PLAYER_DEFAULT)
|
||||
summary = "%s"
|
||||
|
||||
setOnPreferenceChangeListener { _, newValue ->
|
||||
val selected = newValue as String
|
||||
val index = findIndexOfValue(selected)
|
||||
val entry = entryValues[index] as String
|
||||
preferences.edit().putString(key, entry).commit()
|
||||
}
|
||||
}.also(screen::addPreference)
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
|
@ -300,25 +291,10 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
"vf",
|
||||
)
|
||||
|
||||
private val PLAYERS = arrayOf(
|
||||
"Sendvid",
|
||||
"Sibnet",
|
||||
"VK",
|
||||
)
|
||||
|
||||
private val PLAYERS_VALUES = arrayOf(
|
||||
"sendvid",
|
||||
"sibnet",
|
||||
"vk",
|
||||
)
|
||||
|
||||
private const val PREF_VOICES_KEY = "voices_preference"
|
||||
private const val PREF_VOICES_DEFAULT = "vostfr"
|
||||
|
||||
private const val PREF_QUALITY_KEY = "preferred_quality"
|
||||
private const val PREF_QUALITY_DEFAULT = "1080"
|
||||
|
||||
private const val PREF_PLAYER_KEY = "player_preference"
|
||||
private const val PREF_PLAYER_DEFAULT = "sibnet"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@ object AnimeSamaFilters {
|
|||
|
||||
private class CheckBoxVal(name: String, state: Boolean = false) : AnimeFilter.CheckBox(name, state)
|
||||
|
||||
open class TriStateFilterList(name: String, values: List<TriFilter>) : AnimeFilter.Group<AnimeFilter.TriState>(name, values)
|
||||
|
||||
class TriFilter(name: String) : AnimeFilter.TriState(name)
|
||||
|
||||
private inline fun <reified R> AnimeFilterList.getFirst(): R {
|
||||
return this.filterIsInstance<R>().first()
|
||||
}
|
||||
|
|
@ -26,6 +30,20 @@ object AnimeSamaFilters {
|
|||
}
|
||||
}
|
||||
|
||||
private inline fun <reified R> AnimeFilterList.parseTriFilter(
|
||||
options: Array<Pair<String, String>>,
|
||||
): List<List<String>> {
|
||||
return (this.getFirst<R>() as TriStateFilterList).state
|
||||
.filterNot { it.isIgnored() }
|
||||
.map { filter -> filter.state to filter.name }
|
||||
.groupBy { it.first }
|
||||
.let {
|
||||
val included = it.get(AnimeFilter.TriState.STATE_INCLUDE)?.map { options.find { o -> o.first == it.second }!!.second } ?: emptyList()
|
||||
val excluded = it.get(AnimeFilter.TriState.STATE_EXCLUDE)?.map { options.find { o -> o.first == it.second }!!.second } ?: emptyList()
|
||||
listOf(included, excluded)
|
||||
}
|
||||
}
|
||||
|
||||
class TypesFilter : CheckBoxFilterList(
|
||||
"Type",
|
||||
AnimeSamaFiltersData.TYPES.map { CheckBoxVal(it.first, false) },
|
||||
|
|
@ -36,9 +54,9 @@ object AnimeSamaFilters {
|
|||
AnimeSamaFiltersData.LANGUAGES.map { CheckBoxVal(it.first, false) },
|
||||
)
|
||||
|
||||
class GenresFilter : CheckBoxFilterList(
|
||||
class GenresFilter : TriStateFilterList(
|
||||
"Genre",
|
||||
AnimeSamaFiltersData.GENRES.map { CheckBoxVal(it.first, false) },
|
||||
AnimeSamaFiltersData.GENRES.map { TriFilter(it.first) },
|
||||
)
|
||||
|
||||
val FILTER_LIST get() = AnimeFilterList(
|
||||
|
|
@ -50,15 +68,19 @@ object AnimeSamaFilters {
|
|||
data class SearchFilters(
|
||||
val types: List<String> = emptyList(),
|
||||
val language: List<String> = emptyList(),
|
||||
val genres: List<String> = emptyList(),
|
||||
val include: List<String> = emptyList(),
|
||||
val exclude: List<String> = emptyList(),
|
||||
)
|
||||
|
||||
fun getSearchFilters(filters: AnimeFilterList): SearchFilters {
|
||||
if (filters.isEmpty()) return SearchFilters()
|
||||
val (include, exclude) = filters.parseTriFilter<GenresFilter>(AnimeSamaFiltersData.GENRES)
|
||||
|
||||
return SearchFilters(
|
||||
filters.parseCheckbox<TypesFilter>(AnimeSamaFiltersData.TYPES),
|
||||
filters.parseCheckbox<LangFilter>(AnimeSamaFiltersData.LANGUAGES),
|
||||
filters.parseCheckbox<GenresFilter>(AnimeSamaFiltersData.GENRES),
|
||||
include,
|
||||
exclude,
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -72,111 +94,31 @@ object AnimeSamaFilters {
|
|||
val LANGUAGES = arrayOf(
|
||||
Pair("VF", "VF"),
|
||||
Pair("VOSTFR", "VOSTFR"),
|
||||
Pair("VASTFR", "VASTFR"),
|
||||
)
|
||||
|
||||
val GENRES = arrayOf(
|
||||
Pair("Action", "Action"),
|
||||
Pair("Adolescence", "Adolescence"),
|
||||
Pair("Aliens / Extra-terrestres", "Aliens / Extra-terrestres"),
|
||||
Pair("Amitié", "Amitié"),
|
||||
Pair("Amour", "Amour"),
|
||||
Pair("Apocalypse", "Apocalypse"),
|
||||
Pair("Art", "Art"),
|
||||
Pair("Arts martiaux", "Arts martiaux"),
|
||||
Pair("Assassinat", "Assassinat"),
|
||||
Pair("Autre monde", "Autre monde"),
|
||||
Pair("Aventure", "Aventure"),
|
||||
Pair("Combats", "Combats"),
|
||||
Pair("Comédie", "Comédie"),
|
||||
Pair("Crime", "Crime"),
|
||||
Pair("Cyberpunk", "Cyberpunk"),
|
||||
Pair("Danse", "Danse"),
|
||||
Pair("Démons", "Démons"),
|
||||
Pair("Détective", "Détective"),
|
||||
Pair("Donghua", "Donghua"),
|
||||
Pair("Drame", "Drame"),
|
||||
Pair("Ecchi", "Ecchi"),
|
||||
Pair("Ecole", "Ecole"),
|
||||
Pair("Enquête", "Enquête"),
|
||||
Pair("Famille", "Famille"),
|
||||
Pair("Fantastique", "Fantastique"),
|
||||
Pair("Fantasy", "Fantasy"),
|
||||
Pair("Fantômes", "Fantômes"),
|
||||
Pair("Futur", "Futur"),
|
||||
Pair("Ghibli", "Ghibli"),
|
||||
Pair("Guerre", "Guerre"),
|
||||
Pair("Harcèlement", "Harcèlement"),
|
||||
Pair("Harem", "Harem"),
|
||||
Pair("Harem inversé", "Harem inversé"),
|
||||
Pair("Histoire", "Histoire"),
|
||||
Pair("Historique", "Historique"),
|
||||
Pair("École", "School-Life"),
|
||||
Pair("Fantaisie", "Fantasy"),
|
||||
Pair("Horreur", "Horreur"),
|
||||
Pair("Isekai", "Isekai"),
|
||||
Pair("Jeunesse", "Jeunesse"),
|
||||
Pair("Jeux", "Jeux"),
|
||||
Pair("Jeux vidéo", "Jeux vidéo"),
|
||||
Pair("Josei", "Josei"),
|
||||
Pair("Journalisme", "Journalisme"),
|
||||
Pair("Mafia", "Mafia"),
|
||||
Pair("Magical girl", "Magical girl"),
|
||||
Pair("Magie", "Magie"),
|
||||
Pair("Maladie", "Maladie"),
|
||||
Pair("Mariage", "Mariage"),
|
||||
Pair("Mature", "Mature"),
|
||||
Pair("Mechas", "Mechas"),
|
||||
Pair("Médiéval", "Médiéval"),
|
||||
Pair("Militaire", "Militaire"),
|
||||
Pair("Monde virtuel", "Monde virtuel"),
|
||||
Pair("Monstres", "Monstres"),
|
||||
Pair("Musique", "Musique"),
|
||||
Pair("Mystère", "Mystère"),
|
||||
Pair("Nekketsu", "Nekketsu"),
|
||||
Pair("Ninjas", "Ninjas"),
|
||||
Pair("Nostalgie", "Nostalgie"),
|
||||
Pair("Paranormal", "Paranormal"),
|
||||
Pair("Philosophie", "Philosophie"),
|
||||
Pair("Pirates", "Pirates"),
|
||||
Pair("Police", "Police"),
|
||||
Pair("Politique", "Politique"),
|
||||
Pair("Post-apocalyptique", "Post-apocalyptique"),
|
||||
Pair("Pouvoirs psychiques", "Pouvoirs psychiques"),
|
||||
Pair("Préhistoire", "Préhistoire"),
|
||||
Pair("Prison", "Prison"),
|
||||
Pair("Psychologique", "Psychologique"),
|
||||
Pair("Quotidien", "Quotidien"),
|
||||
Pair("Religion", "Religion"),
|
||||
Pair("Réincarnation / Transmigration", "Réincarnation / Transmigration"),
|
||||
Pair("Quotidien", "Slice-of-Life"),
|
||||
Pair("Romance", "Romance"),
|
||||
Pair("Samouraïs", "Samouraïs"),
|
||||
Pair("School Life", "School Life"),
|
||||
Pair("Science-Fantasy", "Science-Fantasy"),
|
||||
Pair("Science-fiction", "Science-fiction"),
|
||||
Pair("Scientifique", "Scientifique"),
|
||||
Pair("Seinen", "Seinen"),
|
||||
Pair("Shôjo", "Shôjo"),
|
||||
Pair("Shônen", "Shônen"),
|
||||
Pair("Shônen-Ai", "Shônen-Ai"),
|
||||
Pair("Slice of Life", "Slice of Life"),
|
||||
Pair("Société", "Société"),
|
||||
Pair("Sport", "Sport"),
|
||||
Pair("Super pouvoirs", "Super pouvoirs"),
|
||||
Pair("Super-héros", "Super-héros"),
|
||||
Pair("Shôjo", "Shôjo"),
|
||||
Pair("Sports", "Sports"),
|
||||
Pair("Surnaturel", "Surnaturel"),
|
||||
Pair("Survie", "Survie"),
|
||||
Pair("Survival game", "Survival game"),
|
||||
Pair("Technologies", "Technologies"),
|
||||
Pair("Thriller", "Thriller"),
|
||||
Pair("Tournois", "Tournois"),
|
||||
Pair("Travail", "Travail"),
|
||||
Pair("Vampires", "Vampires"),
|
||||
Pair("Vengeance", "Vengeance"),
|
||||
Pair("Voyage", "Voyage"),
|
||||
Pair("Voyage temporel", "Voyage temporel"),
|
||||
Pair("Webcomic", "Webcomic"),
|
||||
Pair("Yakuza", "Yakuza"),
|
||||
Pair("Yaoi", "Yaoi"),
|
||||
Pair("Yokai", "Yokai"),
|
||||
Pair("Yuri", "Yuri"),
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'AniSama'
|
||||
extClass = '.AniSama'
|
||||
extVersionCode = 15
|
||||
extVersionCode = 13
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'EmpireStreaming'
|
||||
extClass = '.EmpireStreaming'
|
||||
extVersionCode = 21
|
||||
extVersionCode = 19
|
||||
}
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.FrenchAnime'
|
||||
themePkg = 'datalifeengine'
|
||||
baseUrl = 'https://french-anime.com'
|
||||
overrideVersionCode = 20
|
||||
overrideVersionCode = 18
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'OtakuFR'
|
||||
extClass = '.OtakuFR'
|
||||
extVersionCode = 29
|
||||
extVersionCode = 27
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Vostfree'
|
||||
extClass = '.Vostfree'
|
||||
extVersionCode = 29
|
||||
extVersionCode = 27
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ext {
|
|||
extClass = '.Wiflix'
|
||||
themePkg = 'datalifeengine'
|
||||
baseUrl = 'https://wiflix.voto'
|
||||
overrideVersionCode = 18
|
||||
overrideVersionCode = 16
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'StreamingCommunity'
|
||||
extClass = '.StreamingCommunity'
|
||||
extVersionCode = 7
|
||||
extVersionCode = 6
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class StreamingCommunity : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||
|
||||
override val name = "StreamingCommunity"
|
||||
|
||||
override val baseUrl = "https://streamingcommunity.ovh"
|
||||
override val baseUrl = "https://streamingcommunity.spa"
|
||||
|
||||
override val lang = "it"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Toonitalia'
|
||||
extClass = '.Toonitalia'
|
||||
extVersionCode = 28
|
||||
extVersionCode = 26
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
ext {
|
||||
extKmkVersionCode = 1
|
||||
extName = 'Q1N'
|
||||
extClass = '.Q1N'
|
||||
themePkg = 'dooplay'
|
||||
baseUrl = 'https://q1n.net'
|
||||
overrideVersionCode = 21
|
||||
overrideVersionCode = 20
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
@ -14,6 +13,5 @@ dependencies {
|
|||
implementation(project(":lib:filemoon-extractor"))
|
||||
implementation(project(":lib:streamwish-extractor"))
|
||||
implementation(project(":lib:mixdrop-extractor"))
|
||||
implementation(project(":lib:playlist-utils"))
|
||||
implementation(project(":lib:streamtape-extractor"))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
package eu.kanade.tachiyomi.animeextension.pt.animesgratis
|
||||
|
||||
import android.util.Log
|
||||
import eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors.NoaExtractor
|
||||
import eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors.RuplayExtractor
|
||||
import eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors.UniversalExtractor
|
||||
import eu.kanade.tachiyomi.animesource.model.SAnime
|
||||
import eu.kanade.tachiyomi.animesource.model.SEpisode
|
||||
import eu.kanade.tachiyomi.animesource.model.Video
|
||||
|
|
@ -29,8 +27,6 @@ class Q1N : DooPlay(
|
|||
"https://q1n.net",
|
||||
) {
|
||||
|
||||
private val tag by lazy { javaClass.simpleName }
|
||||
|
||||
override val id: Long = 2969482460524685571L
|
||||
|
||||
override val dateFormatter by lazy {
|
||||
|
|
@ -122,12 +118,10 @@ class Q1N : DooPlay(
|
|||
private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
|
||||
private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
|
||||
private val mixDropExtractor by lazy { MixDropExtractor(client) }
|
||||
private val universalExtractor by lazy { UniversalExtractor(client) }
|
||||
|
||||
private fun getPlayerVideos(player: Element): List<Video> {
|
||||
val name = player.selectFirst("span.title")!!.text().lowercase()
|
||||
val url = getPlayerUrl(player) ?: return emptyList()
|
||||
Log.d(tag, "Fetching videos from: $url")
|
||||
return when {
|
||||
"ruplay" in name -> ruplayExtractor.videosFromUrl(url)
|
||||
"streamwish" in name -> streamWishExtractor.videosFromUrl(url)
|
||||
|
|
@ -137,7 +131,7 @@ class Q1N : DooPlay(
|
|||
"noa" in name -> noaExtractor.videosFromUrl(url)
|
||||
"mdplayer" in name -> noaExtractor.videosFromUrl(url, "MDPLAYER")
|
||||
"/player/" in url -> bloggerExtractor.videosFromUrl(url, headers)
|
||||
else -> universalExtractor.videosFromUrl(url, headers)
|
||||
else -> emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,128 +0,0 @@
|
|||
package eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.app.Application
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.util.Log
|
||||
import android.webkit.WebResourceRequest
|
||||
import android.webkit.WebResourceResponse
|
||||
import android.webkit.WebView
|
||||
import android.webkit.WebViewClient
|
||||
import eu.kanade.tachiyomi.animesource.model.Video
|
||||
import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
|
||||
import okhttp3.Headers
|
||||
import okhttp3.HttpUrl.Companion.toHttpUrl
|
||||
import okhttp3.OkHttpClient
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import java.util.Locale
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class UniversalExtractor(private val client: OkHttpClient) {
|
||||
private val tag by lazy { javaClass.simpleName }
|
||||
private val context: Application by injectLazy()
|
||||
private val handler by lazy { Handler(Looper.getMainLooper()) }
|
||||
|
||||
@SuppressLint("SetJavaScriptEnabled")
|
||||
fun videosFromUrl(origRequestUrl: String, origRequestHeader: Headers): List<Video> {
|
||||
Log.d(tag, "Fetching videos from: $origRequestUrl")
|
||||
val host = origRequestUrl.toHttpUrl().host.substringBefore(".").proper()
|
||||
val latch = CountDownLatch(1)
|
||||
var webView: WebView? = null
|
||||
var resultUrl = ""
|
||||
val playlistUtils by lazy { PlaylistUtils(client, origRequestHeader) }
|
||||
val headers = origRequestHeader.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }.toMutableMap()
|
||||
|
||||
handler.post {
|
||||
val newView = WebView(context)
|
||||
webView = newView
|
||||
with(newView.settings) {
|
||||
javaScriptEnabled = true
|
||||
domStorageEnabled = true
|
||||
databaseEnabled = true
|
||||
useWideViewPort = false
|
||||
loadWithOverviewMode = false
|
||||
userAgentString = origRequestHeader["User-Agent"]
|
||||
}
|
||||
newView.webViewClient = object : WebViewClient() {
|
||||
override fun onPageFinished(view: WebView?, url: String?) {
|
||||
Log.d(tag, "Page loaded, injecting script")
|
||||
view?.evaluateJavascript(CHECK_SCRIPT) {}
|
||||
}
|
||||
|
||||
override fun shouldInterceptRequest(
|
||||
view: WebView,
|
||||
request: WebResourceRequest,
|
||||
): WebResourceResponse? {
|
||||
val url = request.url.toString()
|
||||
Log.d(tag, "Intercepted URL: $url")
|
||||
if (VIDEO_REGEX.containsMatchIn(url)) {
|
||||
resultUrl = url
|
||||
latch.countDown()
|
||||
}
|
||||
return super.shouldInterceptRequest(view, request)
|
||||
}
|
||||
}
|
||||
|
||||
webView?.loadUrl("$origRequestUrl&dl=1", headers)
|
||||
}
|
||||
|
||||
latch.await(TIMEOUT_SEC, TimeUnit.SECONDS)
|
||||
|
||||
handler.post {
|
||||
webView?.stopLoading()
|
||||
webView?.destroy()
|
||||
webView = null
|
||||
}
|
||||
|
||||
return when {
|
||||
"m3u8" in resultUrl -> {
|
||||
Log.d(tag, "m3u8 URL: $resultUrl")
|
||||
playlistUtils.extractFromHls(resultUrl, origRequestUrl, videoNameGen = { "$host: $it" })
|
||||
}
|
||||
"mpd" in resultUrl -> {
|
||||
Log.d(tag, "mpd URL: $resultUrl")
|
||||
playlistUtils.extractFromDash(resultUrl, { it -> "$host: $it" }, referer = origRequestUrl)
|
||||
}
|
||||
"mp4" in resultUrl -> {
|
||||
Log.d(tag, "mp4 URL: $resultUrl")
|
||||
Video(resultUrl, "$host: mp4", resultUrl, Headers.headersOf("referer", origRequestUrl)).let(::listOf)
|
||||
}
|
||||
else -> emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
private fun String.proper(): String {
|
||||
return this.replaceFirstChar {
|
||||
if (it.isLowerCase()) {
|
||||
it.titlecase(
|
||||
Locale.getDefault(),
|
||||
)
|
||||
} else it.toString()
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val TIMEOUT_SEC: Long = 10
|
||||
private val VIDEO_REGEX by lazy { Regex(".*\\.(mp4|m3u8|mpd)(\\?.*)?$") }
|
||||
private val CHECK_SCRIPT by lazy {
|
||||
"""
|
||||
setInterval(() => {
|
||||
var playButton = document.getElementById('player-button-container')
|
||||
if (playButton) {
|
||||
playButton.click()
|
||||
}
|
||||
var downloadButton = document.querySelector(".downloader-button")
|
||||
if (downloadButton) {
|
||||
if (downloadButton.href) {
|
||||
location.href = downloadButton.href
|
||||
} else {
|
||||
downloadButton.click()
|
||||
}
|
||||
}
|
||||
}, 2500)
|
||||
""".trimIndent()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Animeler'
|
||||
extClass = '.Animeler'
|
||||
extVersionCode = 20
|
||||
extVersionCode = 18
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Anizm'
|
||||
extClass = '.Anizm'
|
||||
extVersionCode = 29
|
||||
extVersionCode = 27
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'TR Anime Izle'
|
||||
extClass = '.TRAnimeIzle'
|
||||
extVersionCode = 25
|
||||
extVersionCode = 23
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Türk Anime TV'
|
||||
extClass = '.TurkAnime'
|
||||
extVersionCode = 38
|
||||
extVersionCode = 36
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Hanime1'
|
||||
extClass = '.Hanime1'
|
||||
extVersionCode = 5
|
||||
extVersionCode = 4
|
||||
isNsfw = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.animeextension.zh.hanime1
|
|||
|
||||
import android.app.Application
|
||||
import android.content.SharedPreferences
|
||||
import android.util.Log
|
||||
import androidx.preference.ListPreference
|
||||
import androidx.preference.PreferenceScreen
|
||||
import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
|
||||
|
|
@ -17,15 +16,12 @@ import eu.kanade.tachiyomi.network.GET
|
|||
import eu.kanade.tachiyomi.network.awaitSuccess
|
||||
import eu.kanade.tachiyomi.util.asJsoup
|
||||
import kotlinx.coroutines.CoroutineExceptionHandler
|
||||
import kotlinx.coroutines.DelicateCoroutinesApi
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import kotlinx.serialization.encodeToString
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.json.JsonElement
|
||||
import kotlinx.serialization.json.jsonArray
|
||||
import kotlinx.serialization.json.jsonObject
|
||||
import kotlinx.serialization.json.jsonPrimitive
|
||||
import okhttp3.Cookie
|
||||
|
|
@ -69,32 +65,14 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
|
|||
}
|
||||
|
||||
override fun animeDetailsParse(response: Response): SAnime {
|
||||
val doc = response.asJsoup()
|
||||
val jsoup = response.asJsoup()
|
||||
return SAnime.create().apply {
|
||||
genre = doc.select(".single-video-tag").not("[data-toggle]").eachText().joinToString()
|
||||
author = doc.select("#video-artist-name").text()
|
||||
doc.select("script[type=application/ld+json]").first()?.data()?.let {
|
||||
genre = jsoup.select(".single-video-tag").not("[data-toggle]").eachText().joinToString()
|
||||
author = jsoup.select("#video-artist-name").text()
|
||||
jsoup.select("script[type=application/ld+json]").first()?.data()?.let {
|
||||
val info = json.decodeFromString<JsonElement>(it).jsonObject
|
||||
title = info["name"]!!.jsonPrimitive.content
|
||||
description = info["description"]!!.jsonPrimitive.content
|
||||
thumbnail_url = info["thumbnailUrl"]?.jsonArray?.get(0)?.jsonPrimitive?.content
|
||||
}
|
||||
val type = doc.select("a#video-artist-name + a").text().trim()
|
||||
if (type == "裏番" || type == "泡麵番") {
|
||||
// Use the series cover image for bangumi entries instead of the episode image.
|
||||
runBlocking {
|
||||
try {
|
||||
val animesPage =
|
||||
getSearchAnime(
|
||||
1,
|
||||
title,
|
||||
AnimeFilterList(GenreFilter(arrayOf("", type)).apply { state = 1 }),
|
||||
)
|
||||
thumbnail_url = animesPage.animes.first().thumbnail_url
|
||||
} catch (e: Exception) {
|
||||
Log.e(name, "Failed to get bangumi cover image")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -159,7 +137,7 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
|
|||
|
||||
override fun searchAnimeParse(response: Response): AnimesPage {
|
||||
val jsoup = response.asJsoup()
|
||||
val nodes = jsoup.select("div.search-doujin-videos.hidden-xs:not(:has(a[target=_blank]))")
|
||||
val nodes = jsoup.select("div.search-doujin-videos.hidden-xs")
|
||||
val list = if (nodes.isNotEmpty()) {
|
||||
nodes.map {
|
||||
SAnime.create().apply {
|
||||
|
|
@ -238,12 +216,11 @@ class Hanime1 : AnimeHttpSource(), ConfigurableAnimeSource {
|
|||
return chain.proceed(chain.request())
|
||||
}
|
||||
|
||||
@OptIn(DelicateCoroutinesApi::class)
|
||||
private fun updateFilters() {
|
||||
filterUpdateState = FilterUpdateState.UPDATING
|
||||
val exceptionHandler =
|
||||
CoroutineExceptionHandler { _, _ -> filterUpdateState = FilterUpdateState.FAILED }
|
||||
GlobalScope.launch(Dispatchers.IO + exceptionHandler) {
|
||||
CoroutineScope(Dispatchers.IO + exceptionHandler).launch {
|
||||
val jsoup = client.newCall(GET("$baseUrl/search")).awaitSuccess().asJsoup()
|
||||
val genreList = jsoup.select("div.genre-option div.hentai-sort-options").eachText()
|
||||
val sortList =
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ext {
|
||||
extName = 'Xfani'
|
||||
extClass = '.Xfani'
|
||||
extVersionCode = 6
|
||||
extVersionCode = 5
|
||||
}
|
||||
|
||||
apply from: "$rootDir/common.gradle"
|
||||
|
|
|
|||
|
|
@ -20,9 +20,8 @@ import eu.kanade.tachiyomi.network.POST
|
|||
import eu.kanade.tachiyomi.network.awaitSuccess
|
||||
import eu.kanade.tachiyomi.util.asJsoup
|
||||
import kotlinx.coroutines.CoroutineExceptionHandler
|
||||
import kotlinx.coroutines.DelicateCoroutinesApi
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.json.jsonObject
|
||||
|
|
@ -54,7 +53,7 @@ enum class FilterUpdateState {
|
|||
|
||||
class Xfani : AnimeHttpSource(), ConfigurableAnimeSource {
|
||||
override val baseUrl: String
|
||||
get() = "https://dm.xifanacg.com"
|
||||
get() = "https://dick.xfani.com"
|
||||
override val lang: String
|
||||
get() = "zh"
|
||||
override val name: String
|
||||
|
|
@ -118,16 +117,10 @@ class Xfani : AnimeHttpSource(), ConfigurableAnimeSource {
|
|||
}
|
||||
|
||||
override fun animeDetailsParse(response: Response): SAnime {
|
||||
val doc = response.asJsoup()
|
||||
val jsoup = response.asJsoup()
|
||||
return SAnime.create().apply {
|
||||
description = doc.select("#height_limit.text").text()
|
||||
title = doc.select(".slide-info-title").text()
|
||||
author = doc.select(".slide-info:contains(导演 :)").text().removePrefix("导演 :")
|
||||
.removeSuffix(",")
|
||||
artist = doc.select(".slide-info:contains(演员 :)").text().removePrefix("演员 :")
|
||||
.removeSuffix(",")
|
||||
genre = doc.select(".slide-info:contains(类型 :)").text().removePrefix("类型 :")
|
||||
.removeSuffix(",").replace(",", ", ")
|
||||
description = jsoup.select("#height_limit.text").text()
|
||||
title = jsoup.select(".slide-info-title").text()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -241,13 +234,19 @@ class Xfani : AnimeHttpSource(), ConfigurableAnimeSource {
|
|||
return vodListToAnimePageList(response)
|
||||
}
|
||||
val jsoup = response.asJsoup()
|
||||
val items = jsoup.select("div.search-list")
|
||||
val items = jsoup.select("div.public-list-box.search-box.flex.rel")
|
||||
val animeList = items.map { item ->
|
||||
SAnime.create().apply {
|
||||
title = item.select("div.detail-info > a").text()
|
||||
url = item.select("div.detail-info > a").attr("href")
|
||||
title = item.select(".thumb-txt").text()
|
||||
url = item.select("div.left.public-list-bj a.public-list-exp").attr("href")
|
||||
thumbnail_url =
|
||||
item.select("div.detail-pic img[data-src]").attr("data-src")
|
||||
item.select("div.left.public-list-bj img[data-src]").attr("data-src")
|
||||
author = item.select("div.thumb-actor").text().removeSuffix("/")
|
||||
artist = item.select("div.thumb-director").text().removeSuffix("/")
|
||||
description = item.select(".thumb-blurb").text()
|
||||
genre = item.select("div.thumb-else").text()
|
||||
val statusString = item.select("div.left.public-list-bj .public-list-prb").text()
|
||||
status = STATUS_STR_MAPPING.getOrElse(statusString) { SAnime.ONGOING }
|
||||
}
|
||||
}
|
||||
val tip = jsoup.select("div.pages div.page-tip").text()
|
||||
|
|
@ -260,13 +259,12 @@ class Xfani : AnimeHttpSource(), ConfigurableAnimeSource {
|
|||
return numbers.size == 2 && numbers[0] != numbers[1]
|
||||
}
|
||||
|
||||
@OptIn(DelicateCoroutinesApi::class)
|
||||
private fun updateFilter() {
|
||||
filterState = FilterUpdateState.UPDATING
|
||||
val handler = CoroutineExceptionHandler { _, _ ->
|
||||
filterState = FilterUpdateState.FAILED
|
||||
}
|
||||
GlobalScope.launch(Dispatchers.IO + handler) {
|
||||
CoroutineScope(Dispatchers.IO + handler).launch {
|
||||
val jsoup = client.newCall(GET("$baseUrl/show/1/html")).awaitSuccess().asJsoup()
|
||||
// update class and year filter type
|
||||
val classList = jsoup.select("li[data-type=class]").eachAttr("data-val")
|
||||
|
|
@ -395,5 +393,9 @@ class Xfani : AnimeHttpSource(), ConfigurableAnimeSource {
|
|||
const val PREF_KEY_FILTER_YEAR = "PREF_KEY_FILTER_YEAR"
|
||||
|
||||
const val DEFAULT_VIDEO_SOURCE = "0"
|
||||
|
||||
val STATUS_STR_MAPPING = mapOf(
|
||||
"已完结" to SAnime.COMPLETED,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue