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

fix: some sorting problems

Browse source
This commit is contained in:
rebelonion 2024-04-21 06:41:51 -05:00
parent 6113a10556
commit 513b937e59
3 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/ani/dantotsu/media/MediaNameAdapter.kt
View file

@ -70,7 +70,7 @@ object MediaNameAdapter {
return if (seasonMatcher.find()) { return if (seasonMatcher.find()) {
seasonMatcher.group(2)?.toInt() seasonMatcher.group(2)?.toInt()
} else { } else {
null text.toIntOrNull()
} }
} }
@ -93,7 +93,7 @@ object MediaNameAdapter {
} }
} }
} else { } else {
null text.toFloatOrNull()
} }
} }
@ -139,7 +139,7 @@ object MediaNameAdapter {
if (failedChapterNumberMatcher.find()) { if (failedChapterNumberMatcher.find()) {
failedChapterNumberMatcher.group(1)?.toFloat() failedChapterNumberMatcher.group(1)?.toFloat()
} else { } else {
null text.toFloatOrNull()
} }
} }
} }

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

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

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

@ -43,12 +43,8 @@ class OfflineMangaParser : MangaParser() {
chapters.add(chapter) chapters.add(chapter)
} }
} }
return if (chapters.isNotEmpty()) { chapters.addAll(loadChaptersCompat(mangaLink, extra, sManga))
chapters.sortBy { MediaNameAdapter.findChapterNumber(it.number) } chapters.distinctBy { it.number }.sortedBy { MediaNameAdapter.findChapterNumber(it.number) }
chapters
} else {
loadChaptersCompat(mangaLink, extra, sManga)
}
} }
return emptyList() return emptyList()
} }