prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support multiple branches in saved manga

Browse Source
This commit is contained in:
Koitharu
2022-04-19 13:09:44 +03:00
parent 83eb0d9f23
commit cbd3d439cd
4 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
View File

@@ -87,7 +87,7 @@ class MangaIndex(source: String?) {
jo.put("uploadDate", chapter.uploadDate)
jo.put("scanlator", chapter.scanlator)
jo.put("branch", chapter.branch)
jo.put("entries", "%03d\\d{3}".format(chapter.number))
jo.put("entries", "%08d_%03d\\d{3}".format(chapter.branch.hashCode(), chapter.number))
chapters.put(chapter.id.toString(), jo)
}
}

6
app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
View File

@@ -36,7 +36,7 @@ class CbzMangaOutput(
suspend fun addCover(file: File, ext: String) {
val name = buildString {
append(FILENAME_PATTERN.format(0, 0))
append(FILENAME_PATTERN.format(0, 0, 0))
if (ext.isNotEmpty() && ext.length <= 4) {
append('.')
append(ext)
@@ -50,7 +50,7 @@ class CbzMangaOutput(
suspend fun addPage(chapter: MangaChapter, file: File, pageNumber: Int, ext: String) {
val name = buildString {
append(FILENAME_PATTERN.format(chapter.number, pageNumber))
append(FILENAME_PATTERN.format(chapter.branch.hashCode(), chapter.number, pageNumber))
if (ext.isNotEmpty() && ext.length <= 4) {
append('.')
append(ext)
@@ -105,7 +105,7 @@ class CbzMangaOutput(
companion object {
private const val FILENAME_PATTERN = "%03d%03d"
private const val FILENAME_PATTERN = "%08d_%03d%03d"
const val ENTRY_NAME_INDEX = "index.json"