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

fix(en/animeflix): Improve handling of multiple seasons (#1712)

Browse Source
This commit is contained in:
Secozzi
2023-06-12 08:37:12 +02:00
committed by GitHub
parent a71847a9e1
commit e2682e85b1
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/animeflix/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'AnimeFlix' extName = 'AnimeFlix'
pkgNameSuffix = 'en.animeflix' pkgNameSuffix = 'en.animeflix'
extClass = '.AnimeFlix' extClass = '.AnimeFlix'
extVersionCode = 3 extVersionCode = 4
libVersion = '13' libVersion = '13'
} }

44
src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt
View File

@ -80,8 +80,6 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
// =============================== Search =============================== // =============================== Search ===============================
// https://animeflix.org.in/download-demon-slayer-movie-infinity-train-movie-2020-japanese-with-esubs-hevc-720p-1080p/
override fun searchAnimeParse(response: Response): AnimesPage = throw Exception("Not used") override fun searchAnimeParse(response: Response): AnimesPage = throw Exception("Not used")
override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("Not used") override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("Not used")
@ -207,34 +205,38 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val serversList = mutableListOf<List<EpUrl>>() val serversList = mutableListOf<List<EpUrl>>()
val seasonRegex = Regex("""season (\d+)""", RegexOption.IGNORE_CASE) val seasonRegex = Regex("""season (\d+)""", RegexOption.IGNORE_CASE)
val qualityRegex = """(\d+)p""".toRegex() val qualityRegex = """(\d+)p""".toRegex()
val episodeRegex = Regex("""episode (\d+)""", RegexOption.IGNORE_CASE)
val driveList = mutableListOf<Pair<String, String>>() val driveList = mutableListOf<Pair<String, String>>()
val seasonList = document.select("div.inline > h3:contains(Season)") val seasonList = document.select("div.inline > h3:contains(Season),div.thecontent > h3:contains(Season)")
if (seasonList.distinctBy { seasonRegex.find(it.text())!!.groupValues[1] }.size > 1) { if (seasonList.distinctBy { seasonRegex.find(it.text())!!.groupValues[1] }.size > 1) {
document.select("div.thecontent p:has(span:contains(Gdrive))").forEach { val seasonsLinks = document.select("div.thecontent p:has(span:contains(Gdrive))").groupBy {
val titleText = it.previousElementSibling()!!.text() seasonRegex.find(it.previousElementSibling()!!.text())!!.groupValues[1]
}.values.toList()
seasonsLinks.forEach { season ->
val quality = qualityRegex.find(titleText)!!.groupValues[1] val serverListSeason = mutableListOf<List<EpUrl>>()
val seasonName = seasonRegex.find(titleText)!!.groupValues[1]
val episodesDocument = client.newCall(GET(it.selectFirst("a")!!.attr("href"))).execute().asJsoup() season.forEach {
episodesDocument.select("div.entry-content > h3 > a").forEach { val quality = qualityRegex.find(it.previousElementSibling()!!.text())!!.groupValues[1]
val seasonNumber = seasonRegex.find(it.previousElementSibling()!!.text())!!.groupValues[1]
val url = it.selectFirst("a")!!.attr("href")
val episodesDocument = client.newCall(GET(url)).execute().asJsoup()
serverListSeason.add(
episodesDocument.select("div.entry-content > h3 > a").map {
EpUrl(quality, it.attr("href"), "Season $seasonNumber ${it.text()}")
},
)
}
transpose(serverListSeason).forEachIndexed { index, serverList ->
episodeList.add( episodeList.add(
SEpisode.create().apply { SEpisode.create().apply {
name = "Season $seasonName ${it.text()}" name = serverList.first().name
episode_number = episodeRegex.find(it.text())?.groupValues?.get(1)?.toFloatOrNull() ?: 1F episode_number = (index + 1).toFloat()
setUrlWithoutDomain( setUrlWithoutDomain(
json.encodeToString( json.encodeToString(serverList),
listOf(
EpUrl(
quality = quality,
url = it.attr("href"),
name = "Season $seasonName ${it.text()}",
),
),
),
) )
}, },
) )