javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 3 Wiki Activity

Linting fixes

Browse Source
This commit is contained in:
arkon
2020-04-25 14:24:45 -04:00
parent 4da760d614
commit 3f63b320c4
272 changed files with 4167 additions and 3602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt
+18 -9
View File
@@ -39,8 +39,9 @@ object ChapterRecognition {
fun parseChapterNumber(chapter: SChapter, manga: SManga) {
// If chapter number is known return.
if (chapter.chapter_number == -2f || chapter.chapter_number > -1f)
if (chapter.chapter_number == -2f || chapter.chapter_number > -1f) {
return
}
// Get chapter title with lower case
var name = chapter.name.toLowerCase()
@@ -59,8 +60,9 @@ object ChapterRecognition {
}
// Check base case ch.xx
if (updateChapter(basic.find(name), chapter))
if (updateChapter(basic.find(name), chapter)) {
return
}
// Check one number occurrence.
val occurrences: MutableList<MatchResult> = arrayListOf()
@@ -69,20 +71,23 @@ object ChapterRecognition {
}
if (occurrences.size == 1) {
if (updateChapter(occurrences[0], chapter))
if (updateChapter(occurrences[0], chapter)) {
return
}
}
// Remove manga title from chapter title.
val nameWithoutManga = name.replace(manga.title.toLowerCase(), "").trim()
// Check if first value is number after title remove.
if (updateChapter(withoutManga.find(nameWithoutManga), chapter))
if (updateChapter(withoutManga.find(nameWithoutManga), chapter)) {
return
}
// Take the first number encountered.
if (updateChapter(occurrence.find(nameWithoutManga), chapter))
if (updateChapter(occurrence.find(nameWithoutManga), chapter)) {
return
}
}
/**
@@ -110,18 +115,22 @@ object ChapterRecognition {
* @return decimal/alpha float value
*/
private fun checkForDecimal(decimal: String?, alpha: String?): Float {
if (!decimal.isNullOrEmpty())
if (!decimal.isNullOrEmpty()) {
return decimal.toFloat()
}
if (!alpha.isNullOrEmpty()) {
if (alpha.contains("extra"))
if (alpha.contains("extra")) {
return .99f
}
if (alpha.contains("omake"))
if (alpha.contains("omake")) {
return .98f
}
if (alpha.contains("special"))
if (alpha.contains("special")) {
return .97f
}
return if (alpha[0] == '.') {
// Take value after (.)
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
+2 -3
View File
@@ -24,7 +24,6 @@ fun syncChaptersWithSource(
manga: Manga,
source: Source
): Pair<List<Chapter>, List<Chapter>> {
if (rawSourceChapters.isEmpty()) {
throw Exception("No chapters found")
}
@@ -142,6 +141,6 @@ fun syncChaptersWithSource(
// checks if the chapter in db needs updated
private fun shouldUpdateDbChapter(dbChapter: Chapter, sourceChapter: SChapter): Boolean {
return dbChapter.scanlator != sourceChapter.scanlator || dbChapter.name != sourceChapter.name ||
dbChapter.date_upload != sourceChapter.date_upload ||
dbChapter.chapter_number != sourceChapter.chapter_number
dbChapter.date_upload != sourceChapter.date_upload ||
dbChapter.chapter_number != sourceChapter.chapter_number
}