feat(pl/OgladajAnime): Update OgladajANime and Add new Lib

This commit is contained in:
Hayanek 2024-12-29 17:36:25 +01:00
parent 896bbe57a1
commit 615be7605e
4 changed files with 103 additions and 5 deletions

View file

@ -1,7 +1,7 @@
ext {
extName = 'OgladajAnime'
extClass = '.OgladajAnime'
extVersionCode = 3
extVersionCode = 5
isNsfw = true
}
@ -14,4 +14,6 @@ dependencies {
implementation(project(':lib:vk-extractor'))
implementation(project(':lib:googledrive-extractor'))
implementation(project(':lib:cda-extractor'))
implementation(project(':lib:dood-extractor'))
implementation(project(':lib:lycoris-extractor'))
}

View file

@ -12,6 +12,8 @@ import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
import eu.kanade.tachiyomi.lib.cdaextractor.CdaPlExtractor
import eu.kanade.tachiyomi.lib.dailymotionextractor.DailymotionExtractor
import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
import eu.kanade.tachiyomi.lib.lycorisextractor.LycorisCafeExtractor
import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor
@ -57,7 +59,7 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
// ============================== Popular ===============================
override fun popularAnimeRequest(page: Int): Request {
return GET("$baseUrl/search/page/$page", headers)
return GET("$baseUrl/search/page/$page", apiHeaders)
}
override fun popularAnimeSelector(): String = "div#anime_main div.card.bg-white"
@ -72,7 +74,7 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
// =============================== Latest ===============================
override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/search/new/$page", headers)
override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/search/new/$page", apiHeaders)
override fun latestUpdatesSelector(): String = popularAnimeSelector()
@ -82,7 +84,7 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
// =============================== Search ===============================
override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/search/name/$query", headers)
override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/search/name/$query", apiHeaders)
override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element)
@ -176,6 +178,8 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
private val dailymotionExtractor by lazy { DailymotionExtractor(client, headers) }
private val sibnetExtractor by lazy { SibnetExtractor(client) }
private val doodExtractor by lazy { DoodExtractor(client) }
private val lycorisExtractor by lazy { LycorisCafeExtractor(client) }
override fun videoListParse(response: Response): List<Video> {
val jsonResponse = json.decodeFromString<ApiResponse>(response.body.string())
@ -205,7 +209,7 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
}
}
if (player.url !in listOf("vk", "cda", "mp4upload", "sibnet", "dailymotion")) {
if (player.url !in listOf("vk", "cda", "mp4upload", "sibnet", "dailymotion", "dood", "lycoris")) {
return@mapNotNull null
}
val url = getPlayerUrl(player.id)
@ -229,6 +233,12 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
serverUrl.contains("sibnet.ru") -> {
sibnetExtractor.videosFromUrl(serverUrl, prefix)
}
serverUrl.contains("dood") -> {
doodExtractor.videosFromUrl(serverUrl, "$prefix Dood")
}
serverUrl.contains("lycoris.cafe") -> {
lycorisExtractor.getVideosFromUrl(serverUrl, headers, prefix)
}
else -> emptyList()
}
}