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

fix(es/animeflv): Change server info (#2927)

Browse Source
This commit is contained in:
Ludgie 2024-02-14 12:57:45 +01:00 committed by GitHub
parent bb79f8bce9
commit 5fc0ba8790
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/streamtape-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamtapeextractor/StreamTapeExtractor.kt
View File

@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.util.asJsoup
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
class StreamTapeExtractor(private val client: OkHttpClient) { class StreamTapeExtractor(private val client: OkHttpClient) {
fun videoFromUrl(url: String, quality: String = "StreamTape", subtitleList: List<Track> = emptyList()): Video? { fun videoFromUrl(url: String, quality: String = "Streamtape", subtitleList: List<Track> = emptyList()): Video? {
val baseUrl = "https://streamtape.com/e/" val baseUrl = "https://streamtape.com/e/"
val newUrl = if (!url.startsWith(baseUrl)) { val newUrl = if (!url.startsWith(baseUrl)) {
// ["https", "", "<domain>", "<???>", "<id>", ...] // ["https", "", "<domain>", "<???>", "<id>", ...]
@ -27,7 +27,7 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
return Video(videoUrl, quality, videoUrl, subtitleTracks = subtitleList) return Video(videoUrl, quality, videoUrl, subtitleTracks = subtitleList)
} }
fun videosFromUrl(url: String, quality: String = "StreamTape", subtitleList: List<Track> = emptyList()): List<Video> { fun videosFromUrl(url: String, quality: String = "Streamtape", subtitleList: List<Track> = emptyList()): List<Video> {
return videoFromUrl(url, quality, subtitleList)?.let(::listOf).orEmpty() return videoFromUrl(url, quality, subtitleList)?.let(::listOf).orEmpty()
} }
} }

3
src/es/animeflv/build.gradle
View File

@ -1,7 +1,7 @@
ext { ext {
extName = 'AnimeFLV' extName = 'AnimeFLV'
extClass = '.AnimeFlv' extClass = '.AnimeFlv'
extVersionCode = 52 extVersionCode = 53
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"
@ -10,6 +10,5 @@ dependencies {
implementation(project(':lib:yourupload-extractor')) implementation(project(':lib:yourupload-extractor'))
implementation(project(':lib:streamtape-extractor')) implementation(project(':lib:streamtape-extractor'))
implementation(project(':lib:okru-extractor')) implementation(project(':lib:okru-extractor'))
implementation(project(':lib:dood-extractor'))
implementation(project(':lib:streamwish-extractor')) implementation(project(':lib:streamwish-extractor'))
} }

10
src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
View File

@ -11,7 +11,6 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.model.SEpisode
import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
@ -50,12 +49,12 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
companion object { companion object {
private const val PREF_QUALITY_KEY = "preferred_quality" private const val PREF_QUALITY_KEY = "preferred_quality"
private const val PREF_QUALITY_DEFAULT = "1080" private const val PREF_QUALITY_DEFAULT = "480"
private val QUALITY_LIST = arrayOf("1080", "720", "480", "360") private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
private const val PREF_SERVER_KEY = "preferred_server" private const val PREF_SERVER_KEY = "preferred_server"
private const val PREF_SERVER_DEFAULT = "YourUpload" private const val PREF_SERVER_DEFAULT = "StreamWish"
private val SERVER_LIST = arrayOf("MailRu", "Okru", "YourUpload", "DoodStream", "StreamTape") private val SERVER_LIST = arrayOf("StreamWish", "YourUpload", "Okru", "Streamtape")
} }
override fun popularAnimeSelector(): String = "div.Container ul.ListAnimes li article" override fun popularAnimeSelector(): String = "div.Container ul.ListAnimes li article"
@ -123,14 +122,13 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val stapeUrl = json!!["url"]!!.jsonPrimitive!!.content val stapeUrl = json!!["url"]!!.jsonPrimitive!!.content
StreamTapeExtractor(client).videoFromUrl(stapeUrl)?.let(::listOf) StreamTapeExtractor(client).videoFromUrl(stapeUrl)?.let(::listOf)
} }
"Doodstream" -> DoodExtractor(client).videoFromUrl(url, "DoodStream", false)?.let(::listOf)
"Okru" -> OkruExtractor(client).videosFromUrl(url) "Okru" -> OkruExtractor(client).videosFromUrl(url)
"YourUpload" -> YourUploadExtractor(client).videoFromUrl(url, headers = headers) "YourUpload" -> YourUploadExtractor(client).videoFromUrl(url, headers = headers)
"SW" -> { "SW" -> {
val docHeaders = headers.newBuilder() val docHeaders = headers.newBuilder()
.add("Referer", "$baseUrl/") .add("Referer", "$baseUrl/")
.build() .build()
StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" }) StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish: $it" })
} }
else -> null else -> null
} }