github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-09-14 14:12:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix chapter number parsing when number is after unwanted tag

Browse source 
Fixes #554

Co-authored-by: Naputt1 <94742489+Naputt1@users.noreply.github.com>
This commit is contained in:
AntsyLich 2024-06-08 07:07:47 +06:00
parent 119bcbf8ed
commit 6a80305d6c
No known key found for this signature in database
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
domain/src/main/java/tachiyomi/domain/chapter/service/ChapterRecognition.kt
View file

@ -41,27 +41,35 @@ object ChapterRecognition {
}
// Get chapter title with lower case
var name = chapterName.lowercase()
val cleanChapterName = chapterName.lowercase()
// Remove manga title from chapter title.
.replace(mangaTitle.lowercase(), "").trim()
// Remove comma's or hyphens.
.replace(',', '.')
.replace('-', '.')
// Remove unwanted white spaces.
.replace(unwantedWhiteSpace, "")
// Remove manga title from chapter title.
name = name.replace(mangaTitle.lowercase(), "").trim()
val numberMatch = number.findAll(cleanChapterName)
// Remove comma's or hyphens.
name = name.replace(',', '.').replace('-', '.')
when {
numberMatch.none() -> {
return chapterNumber ?: -1.0
}
numberMatch.count() > 1 -> {
// Remove unwanted tags.
unwanted.replace(cleanChapterName, "").let { name ->
// Check base case ch.xx
basic.find(name)?.let { return getChapterNumberFromMatch(it) }
// Remove unwanted white spaces.
name = unwantedWhiteSpace.replace(name, "")
// need to find again first number might already removed
number.find(name)?.let { return getChapterNumberFromMatch(it) }
}
}
}
// Remove unwanted tags.
name = unwanted.replace(name, "")
// Check base case ch.xx
basic.find(name)?.let { return getChapterNumberFromMatch(it) }
// Take the first number encountered.
number.find(name)?.let { return getChapterNumberFromMatch(it) }
return chapterNumber ?: -1.0
// return the first number encountered
return getChapterNumberFromMatch(numberMatch.first())
}
/**

11
domain/src/test/java/tachiyomi/domain/chapter/service/ChapterRecognitionTest.kt
View file

@ -171,6 +171,17 @@ class ChapterRecognitionTest {
assertChapter(mangaTitle, "Tokyo ESP 027: Part 002: Chapter 001", 027.0)
}
/**
* Case where the chapter title contains the unwanted tag
* But follow by chapter number.
*/
@Test
fun `Number after unwanted tag`() {
val mangaTitle = "One-punch Man"
assertChapter(mangaTitle, "Mag Version 195.5", 195.5)
}
@Test
fun `Unparseable chapter`() {
val mangaTitle = "random"