Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 22:01:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up local source chapter name cleaning (closes #5969)

Browse Source
This commit is contained in:
arkon 2021-10-30 18:36:23 -04:00
parent 701b1ee744
commit 9ebbfb2d90
1 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
View File

@ -37,8 +37,6 @@ class LocalSource(private val context: Context) : CatalogueSource {
const val ID = 0L const val ID = 0L
const val HELP_URL = "https://tachiyomi.org/help/guides/local-manga/" const val HELP_URL = "https://tachiyomi.org/help/guides/local-manga/"
private val SUPPORTED_ARCHIVE_TYPES = setOf("zip", "rar", "cbr", "cbz", "epub")
private const val COVER_NAME = "cover.jpg" private const val COVER_NAME = "cover.jpg"
private val LATEST_THRESHOLD = TimeUnit.MILLISECONDS.convert(7, TimeUnit.DAYS) private val LATEST_THRESHOLD = TimeUnit.MILLISECONDS.convert(7, TimeUnit.DAYS)
@ -52,7 +50,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
if (cover == null) { if (cover == null) {
cover = File("${dir.absolutePath}/${manga.url}", COVER_NAME) cover = File("${dir.absolutePath}/${manga.url}", COVER_NAME)
} }
if (cover != null && !cover.exists()) { if (!cover.exists()) {
// It might not exist if using the external SD card // It might not exist if using the external SD card
cover.parentFile?.mkdirs() cover.parentFile?.mkdirs()
input.use { input.use {
@ -86,7 +84,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
override val lang = "other" override val lang = "other"
override val supportsLatest = true override val supportsLatest = true
override fun toString() = context.getString(R.string.local_source) override fun toString() = name
override fun fetchPopularManga(page: Int) = fetchSearchManga(page, "", POPULAR_FILTERS) override fun fetchPopularManga(page: Int) = fetchSearchManga(page, "", POPULAR_FILTERS)
@ -168,7 +166,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
.asSequence() .asSequence()
.mapNotNull { File(it, manga.url).listFiles()?.toList() } .mapNotNull { File(it, manga.url).listFiles()?.toList() }
.flatten() .flatten()
.firstOrNull { it.extension == "json" } .firstOrNull { it.extension.lowercase() == "json" }
?.apply { ?.apply {
val obj = json.decodeFromStream<JsonObject>(inputStream()) val obj = json.decodeFromStream<JsonObject>(inputStream())
@ -200,15 +198,14 @@ class LocalSource(private val context: Context) : CatalogueSource {
} }
date_upload = chapterFile.lastModified() date_upload = chapterFile.lastModified()
val format = getFormat(this) val format = getFormat(chapterFile)
if (format is Format.Epub) { if (format is Format.Epub) {
EpubFile(format.file).use { epub -> EpubFile(format.file).use { epub ->
epub.fillChapterMetadata(this) epub.fillChapterMetadata(this)
} }
} }
val chapNameCut = stripMangaTitle(name, manga.title) name = getCleanChapterTitle(name, manga.title)
if (chapNameCut.isNotEmpty()) name = chapNameCut
ChapterRecognition.parseChapterNumber(this, manga) ChapterRecognition.parseChapterNumber(this, manga)
} }
} }
@ -222,37 +219,12 @@ class LocalSource(private val context: Context) : CatalogueSource {
} }
/** /**
* Strips the manga title from a chapter name, matching only based on alphanumeric and whitespace * Strips the manga title from a chapter name and trim whitespace/delimiter characters.
* characters.
*/ */
private fun stripMangaTitle(chapterName: String, mangaTitle: String): String { private fun getCleanChapterTitle(chapterName: String, mangaTitle: String): String {
var chapterNameIndex = 0
var mangaTitleIndex = 0
while (chapterNameIndex < chapterName.length && mangaTitleIndex < mangaTitle.length) {
val chapterChar = chapterName[chapterNameIndex]
val mangaChar = mangaTitle[mangaTitleIndex]
if (!chapterChar.equals(mangaChar, true)) {
val invalidChapterChar = !chapterChar.isLetterOrDigit() && !chapterChar.isWhitespace()
val invalidMangaChar = !mangaChar.isLetterOrDigit() && !mangaChar.isWhitespace()
if (!invalidChapterChar && !invalidMangaChar) {
return chapterName return chapterName
} .replace(mangaTitle, "")
.trim(*WHITESPACE_CHARS.toCharArray(), '-', '_', ',', ':')
if (invalidChapterChar) {
chapterNameIndex++
}
if (invalidMangaChar) {
mangaTitleIndex++
}
} else {
chapterNameIndex++
mangaTitleIndex++
}
}
return chapterName.substring(chapterNameIndex).trimStart(' ', '-', '_', ',', ':')
} }
override fun fetchPageList(chapter: SChapter): Observable<List<Page>> { override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
@ -342,3 +314,34 @@ class LocalSource(private val context: Context) : CatalogueSource {
data class Epub(val file: File) : Format() data class Epub(val file: File) : Format()
} }
} }
private val SUPPORTED_ARCHIVE_TYPES = listOf("zip", "cbz", "rar", "cbr", "epub")
private val WHITESPACE_CHARS = arrayOf(
' ',
'\u0009',
'\u000A',
'\u000B',
'\u000C',
'\u000D',
'\u0020',
'\u0085',
'\u00A0',
'\u1680',
'\u2000',
'\u2001',
'\u2002',
'\u2003',
'\u2004',
'\u2005',
'\u2006',
'\u2007',
'\u2008',
'\u2009',
'\u200A',
'\u2028',
'\u2029',
'\u202F',
'\u205F',
'\u3000',
)