rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: move some stuffs around

Browse source
This commit is contained in:
rebelonion 2024-05-24 14:51:25 -05:00
parent e7a60e07d8
commit 37949c7e8e
2 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/ani/dantotsu/parsers/OfflineAnimeParser.kt
View file

@ -55,13 +55,11 @@ class OfflineAnimeParser : AnimeParser() {
episodes.add(episode) episodes.add(episode)
} }
} }
//episodes.sortBy { MediaNameAdapter.findEpisodeNumber(it.number) }
episodes.addAll(loadEpisodesCompat(animeLink, extra, sAnime))
//filter those with the same name
return episodes.distinctBy { it.number }
.sortedBy { MediaNameAdapter.findEpisodeNumber(it.number) }
} }
return emptyList() episodes.addAll(loadEpisodesCompat(animeLink, extra, sAnime))
//filter those with the same name
return episodes.distinctBy { it.number }
.sortedBy { MediaNameAdapter.findEpisodeNumber(it.number) }
} }
override suspend fun loadVideoServers( override suspend fun loadVideoServers(

26
app/src/main/java/ani/dantotsu/parsers/OfflineMangaParser.kt
View file

@ -43,11 +43,10 @@ class OfflineMangaParser : MangaParser() {
chapters.add(chapter) chapters.add(chapter)
} }
} }
chapters.addAll(loadChaptersCompat(mangaLink, extra, sManga))
return chapters.distinctBy { it.number }
.sortedBy { MediaNameAdapter.findChapterNumber(it.number) }
} }
return emptyList() chapters.addAll(loadChaptersCompat(mangaLink, extra, sManga))
return chapters.distinctBy { it.number }
.sortedBy { MediaNameAdapter.findChapterNumber(it.number) }
} }
override suspend fun loadImages(chapterLink: String, sChapter: SChapter): List<MangaImage> { override suspend fun loadImages(chapterLink: String, sChapter: SChapter): List<MangaImage> {
@ -66,17 +65,16 @@ class OfflineMangaParser : MangaParser() {
for (image in images) { for (image in images) {
Logger.log("imageNumber: ${image.url.url}") Logger.log("imageNumber: ${image.url.url}")
} }
return if (images.isNotEmpty()) {
images.sortBy { image ->
val matchResult = imageNumberRegex.find(image.url.url)
matchResult?.groups?.get(1)?.value?.toIntOrNull() ?: Int.MAX_VALUE
}
images
} else {
loadImagesCompat(chapterLink, sChapter)
}
} }
return emptyList() return if (images.isNotEmpty()) {
images.sortBy { image ->
val matchResult = imageNumberRegex.find(image.url.url)
matchResult?.groups?.get(1)?.value?.toIntOrNull() ?: Int.MAX_VALUE
}
images
} else {
loadImagesCompat(chapterLink, sChapter)
}
} }
override suspend fun search(query: String): List<ShowResponse> { override suspend fun search(query: String): List<ShowResponse> {