-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(pt/anitube): Fixed Anitube and HinataSoul for old videos (#189)
- Loading branch information
Showing
8 changed files
with
425 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| ext { | ||
| extName = 'Anitube' | ||
| extClass = '.Anitube' | ||
| extVersionCode = 18 | ||
| extVersionCode = 19 | ||
| } | ||
|
|
||
| apply from: "$rootDir/common.gradle" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
.../src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeDownloadExtractor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package eu.kanade.tachiyomi.animeextension.pt.anitube.extractors | ||
|
|
||
| import android.util.Log | ||
| import eu.kanade.tachiyomi.animesource.model.Video | ||
| import eu.kanade.tachiyomi.network.GET | ||
| import eu.kanade.tachiyomi.network.POST | ||
| import eu.kanade.tachiyomi.util.asJsoup | ||
| import eu.kanade.tachiyomi.util.parallelMapNotNullBlocking | ||
| import okhttp3.FormBody | ||
| import okhttp3.Headers | ||
| import okhttp3.OkHttpClient | ||
|
|
||
| class AnitubeDownloadExtractor( | ||
| private val headers: Headers, | ||
| private val client: OkHttpClient, | ||
| ) { | ||
|
|
||
| private val qualities = listOf("SD", "HD", "FULLHD") | ||
| private val tag by lazy { javaClass.simpleName } | ||
|
|
||
| private fun videosFromFile4Go(url: String, quality: String): Video? { | ||
| Log.d(tag, "Checking download for $url") | ||
| val docDownload = client.newCall(GET(url)).execute().asJsoup() | ||
|
|
||
| val form = | ||
| docDownload.selectFirst("button.download")?.closest("form") | ||
|
|
||
| if (form == null) { | ||
| Log.d(tag, "Download form not found for $url") | ||
| return null | ||
| } | ||
|
|
||
| val body = FormBody.Builder().apply { | ||
| form.select("input[name]").forEach { | ||
| add(it.attr("name"), it.attr("value")) | ||
| } | ||
| }.build() | ||
|
|
||
| val postUrl = form.attr("action") | ||
|
|
||
| val postHeaders = headers.newBuilder() | ||
| .set("Referer", url) | ||
| .build() | ||
|
|
||
| val docFinal = | ||
| client.newCall(POST(postUrl, headers = postHeaders, body = body)) | ||
| .execute().asJsoup() | ||
|
|
||
| val videoUrl = docFinal.selectFirst("a.novobotao.download")?.attr("href") | ||
|
|
||
| if (videoUrl == null) { | ||
| Log.d(tag, "Download link not found for $url") | ||
| return null | ||
| } | ||
|
|
||
| return Video(videoUrl, "$quality - File4Go", videoUrl) | ||
| } | ||
|
|
||
| private fun videosFromDownloadPage(url: String, epName: String): List<Video> { | ||
| Log.d(tag, "Extracting videos links for URL: $url") | ||
| val docDownload = client.newCall(GET(url)).execute().asJsoup() | ||
|
|
||
| val row = docDownload.select("table.downloadpag_episodios tr").firstOrNull { | ||
| it.text().contains(epName) | ||
| } | ||
|
|
||
| if (row == null) { | ||
| Log.d(tag, "Episode $epName not found in download page") | ||
| return emptyList() | ||
| } | ||
|
|
||
| val links = row.select("td").mapIndexedNotNull { index, el -> | ||
| val link = el.selectFirst("a") ?: return@mapIndexedNotNull null | ||
|
|
||
| object { | ||
| var quality = qualities.get(index - 1) | ||
| var url = link.attr("href") | ||
| } | ||
| } | ||
|
|
||
| Log.d(tag, "Found ${links.size} links for $epName") | ||
|
|
||
| return links.parallelMapNotNullBlocking { | ||
| if (!it.url.contains("file4go.net")) { | ||
| return@parallelMapNotNullBlocking null | ||
| } | ||
| videosFromFile4Go(it.url, it.quality) | ||
| }.reversed() | ||
| } | ||
|
|
||
| fun videosFromUrl(url: String, epName: String, quality: String = "Default"): List<Video> { | ||
| if (url.contains("file4go.net")) { | ||
| return listOfNotNull(videosFromFile4Go(url, quality)) | ||
| } | ||
|
|
||
| return videosFromDownloadPage(url, epName) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| ext { | ||
| extName = 'Hinata Soul' | ||
| extClass = '.HinataSoul' | ||
| extVersionCode = 8 | ||
| extVersionCode = 9 | ||
| } | ||
|
|
||
| apply from: "$rootDir/common.gradle" |
Oops, something went wrong.