fix(pl/ogladajanime): Correct names of episodes and add fansub (#3268)

Co-authored-by: Hayanek <kontakt@wolfek.xyz>
This commit is contained in:
Cezary 2024-05-28 12:14:17 +02:00 committed by GitHub
parent a56d5f48b4
commit d0b60afd47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 9 deletions

View File

@ -1,7 +1,7 @@
ext { ext {
extName = 'OgladajAnime' extName = 'OgladajAnime'
extClass = '.OgladajAnime' extClass = '.OgladajAnime'
extVersionCode = 2 extVersionCode = 3
isNsfw = true isNsfw = true
} }

View File

@ -124,13 +124,22 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val episodeNumber = element.attr("value").toFloatOrNull() ?: 0f val episodeNumber = element.attr("value").toFloatOrNull() ?: 0f
val episodeText = element.select("div > div > p").text() val episodeText = element.select("div > div > p").text()
val episodeImg = element.select("div > img").attr("alt") val episodeImg = element.select("div > img").attr("alt").uppercase()
episode.name = if (episodeText.isNotEmpty()) { if (episodeText.isNotEmpty()) {
"[${episodeNumber.toInt()}] $episodeText ($episodeImg)" episode.name = if (episodeImg == "PL") {
"${episodeNumber.toInt()} $episodeText"
} else {
"${episodeNumber.toInt()} [$episodeImg] $episodeText"
}
} else { } else {
"Episode ${episodeNumber.toInt()} ($episodeImg)" episode.name = if (episodeImg == "PL") {
"${episodeNumber.toInt()} Odcinek"
} else {
"${episodeNumber.toInt()} [$episodeImg] Odcinek"
}
} }
episode.episode_number = episodeNumber episode.episode_number = episodeNumber
episode.url = element.attr("ep_id") episode.url = element.attr("ep_id")
@ -173,14 +182,29 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val dataObject = json.decodeFromString<ApiData>(jsonResponse.data) val dataObject = json.decodeFromString<ApiData>(jsonResponse.data)
val serverList = dataObject.players.mapNotNull { player -> val serverList = dataObject.players.mapNotNull { player ->
var sub = player.sub.uppercase() var sub = player.sub.uppercase()
if (sub == "PL" && player.audio == "PL") { if (player.audio == "pl") {
sub = "DUB PL" sub = "Lektor"
} else if (player.sub.isEmpty() && sub != "Lektor") {
sub = "Dub " + player.sub.uppercase()
} }
val subGroup = if (sub == player.sub_group?.uppercase()) "" else player.sub_group
val subGroupPart = if (subGroup?.isNotEmpty() == true) " $subGroup - " else " "
val prefix = if (player.ismy > 0) { val prefix = if (player.ismy > 0) {
"[$sub/Odwrócone Kolory] " if (player.sub == "pl" && player.sub_group?.isNotEmpty() == true) {
"[Odwrócone Kolory] $subGroup - "
} else {
"[$sub/Odwrócone Kolory]$subGroupPart"
}
} else { } else {
"[$sub] " if (player.sub == "pl" && player.sub_group?.isNotEmpty() == true) {
"$subGroup - "
} else {
"[$sub]$subGroupPart"
}
} }
if (player.url !in listOf("vk", "cda", "mp4upload", "sibnet", "dailymotion")) { if (player.url !in listOf("vk", "cda", "mp4upload", "sibnet", "dailymotion")) {
return@mapNotNull null return@mapNotNull null
} }
@ -224,6 +248,7 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val audio: String? = null, val audio: String? = null,
val sub: String, val sub: String,
val url: String, val url: String,
val sub_group: String? = null,
val ismy: Int, val ismy: Int,
) )