gogo, aniflix: support multiple doodstream domains
This commit is contained in:
@ -6,7 +6,7 @@ ext {
|
|||||||
extName = 'Aniflix'
|
extName = 'Aniflix'
|
||||||
pkgNameSuffix = 'de.aniflix'
|
pkgNameSuffix = 'de.aniflix'
|
||||||
extClass = '.Aniflix'
|
extClass = '.Aniflix'
|
||||||
extVersionCode = 4
|
extVersionCode = 5
|
||||||
libVersion = '12'
|
libVersion = '12'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,9 +44,9 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||||||
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
|
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
|
||||||
}
|
}
|
||||||
|
|
||||||
private val doodHeaders = Headers.Builder().apply {
|
private fun doodHeaders(tld: String) = Headers.Builder().apply {
|
||||||
add("User-Agent", "Aniyomi")
|
add("User-Agent", "Aniyomi")
|
||||||
add("Referer", "https://dood.la/")
|
add("Referer", "https://dood.$tld/")
|
||||||
}.build()
|
}.build()
|
||||||
|
|
||||||
private val json = Json {
|
private val json = Json {
|
||||||
@ -169,8 +169,9 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||||||
val videoList = mutableListOf<Video>()
|
val videoList = mutableListOf<Video>()
|
||||||
for (stream in streams) {
|
for (stream in streams) {
|
||||||
val quality = "${stream.hoster!!.name}, ${stream.lang!!}"
|
val quality = "${stream.hoster!!.name}, ${stream.lang!!}"
|
||||||
if (stream.link!!.contains("https://dood.la/e/")) {
|
if (stream.link!!.contains("https://dood")) {
|
||||||
videoList.add(Video(stream.link, quality, null, null, doodHeaders))
|
val tld = stream.link.substringAfter("https://dood.").substringBefore("/")
|
||||||
|
videoList.add(Video(stream.link, quality, null, null, doodHeaders(tld)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return videoList
|
return videoList
|
||||||
@ -209,16 +210,17 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||||||
|
|
||||||
override fun videoUrlParse(response: Response): String {
|
override fun videoUrlParse(response: Response): String {
|
||||||
val url = response.request.url.toString()
|
val url = response.request.url.toString()
|
||||||
response.priorResponse
|
if (url.contains("https://dood")) {
|
||||||
if (url.contains("https://dood.la/e/")) {
|
val doodTld = url.substringAfter("https://dood.").substringBefore("/")
|
||||||
val content = response.body!!.string()
|
val content = response.body!!.string()
|
||||||
|
if (!content.contains("'/pass_md5/")) throw Exception("Error with doodstream mirror")
|
||||||
val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
|
val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
|
||||||
val token = md5.substringAfterLast("/")
|
val token = md5.substringAfterLast("/")
|
||||||
val randomString = getRandomString()
|
val randomString = getRandomString()
|
||||||
val expiry = System.currentTimeMillis()
|
val expiry = System.currentTimeMillis()
|
||||||
val videoUrlStart = client.newCall(
|
val videoUrlStart = client.newCall(
|
||||||
GET(
|
GET(
|
||||||
"https://dood.la/pass_md5/$md5",
|
"https://dood.$doodTld/pass_md5/$md5",
|
||||||
Headers.headersOf("referer", url)
|
Headers.headersOf("referer", url)
|
||||||
)
|
)
|
||||||
).execute().body!!.string()
|
).execute().body!!.string()
|
||||||
@ -239,8 +241,8 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
|
|||||||
key = "preferred_hoster"
|
key = "preferred_hoster"
|
||||||
title = "Standard-Hoster"
|
title = "Standard-Hoster"
|
||||||
entries = arrayOf("Doodstream")
|
entries = arrayOf("Doodstream")
|
||||||
entryValues = arrayOf("https://dood.la/e/")
|
entryValues = arrayOf("https://dood")
|
||||||
setDefaultValue("https://dood.la/e/")
|
setDefaultValue("https://dood")
|
||||||
summary = "%s"
|
summary = "%s"
|
||||||
|
|
||||||
setOnPreferenceChangeListener { _, newValue ->
|
setOnPreferenceChangeListener { _, newValue ->
|
||||||
|
@ -5,7 +5,7 @@ ext {
|
|||||||
extName = 'Gogoanime'
|
extName = 'Gogoanime'
|
||||||
pkgNameSuffix = 'en.gogoanime'
|
pkgNameSuffix = 'en.gogoanime'
|
||||||
extClass = '.GogoAnime'
|
extClass = '.GogoAnime'
|
||||||
extVersionCode = 23
|
extVersionCode = 24
|
||||||
libVersion = '12'
|
libVersion = '12'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
|||||||
val newElements = Elements()
|
val newElements = Elements()
|
||||||
var googleElements = 0
|
var googleElements = 0
|
||||||
for (element in this) {
|
for (element in this) {
|
||||||
if (element.attr("href").contains("https://dood.la")) {
|
if (element.attr("href").contains("https://dood")) {
|
||||||
newElements.add(element)
|
newElements.add(element)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@ -108,7 +108,7 @@ class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
|||||||
return newElements
|
return newElements
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun videoListSelector() = "div.mirror_link a[download], div.mirror_link a[href*=https://dood.la]"
|
override fun videoListSelector() = "div.mirror_link a[download], div.mirror_link a[href*=https://dood]"
|
||||||
|
|
||||||
override fun videoFromElement(element: Element): Video {
|
override fun videoFromElement(element: Element): Video {
|
||||||
val quality = element.text().substringAfter("Download (").replace("P - mp4)", "p")
|
val quality = element.text().substringAfter("Download (").replace("P - mp4)", "p")
|
||||||
@ -116,7 +116,7 @@ class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
|||||||
val location = element.ownerDocument().location()
|
val location = element.ownerDocument().location()
|
||||||
val videoHeaders = Headers.headersOf("Referer", location)
|
val videoHeaders = Headers.headersOf("Referer", location)
|
||||||
return when {
|
return when {
|
||||||
url.contains("https://dood.la") -> {
|
url.contains("https://dood") -> {
|
||||||
val newQuality = "Doodstream mirror"
|
val newQuality = "Doodstream mirror"
|
||||||
Video(url, newQuality, doodUrlParse(url), null, videoHeaders)
|
Video(url, newQuality, doodUrlParse(url), null, videoHeaders)
|
||||||
}
|
}
|
||||||
@ -158,11 +158,12 @@ class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
|
|||||||
if (!content.contains("'/pass_md5/")) return null
|
if (!content.contains("'/pass_md5/")) return null
|
||||||
val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
|
val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
|
||||||
val token = md5.substringAfterLast("/")
|
val token = md5.substringAfterLast("/")
|
||||||
|
val doodTld = url.substringAfter("https://dood.").substringBefore("/")
|
||||||
val randomString = getRandomString()
|
val randomString = getRandomString()
|
||||||
val expiry = System.currentTimeMillis()
|
val expiry = System.currentTimeMillis()
|
||||||
val videoUrlStart = client.newCall(
|
val videoUrlStart = client.newCall(
|
||||||
GET(
|
GET(
|
||||||
"https://dood.la/pass_md5/$md5",
|
"https://dood.$doodTld/pass_md5/$md5",
|
||||||
Headers.headersOf("referer", url)
|
Headers.headersOf("referer", url)
|
||||||
)
|
)
|
||||||
).execute().body!!.string()
|
).execute().body!!.string()
|
||||||
|
Reference in New Issue
Block a user