temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-03 19:04:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

depricate zero based chapters

Browse Source
This commit is contained in:
Aria Moradi
2021-09-17 16:31:47 +04:30
parent 47e04c08d0
commit 6c62ddf927
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
View File

@@ -222,11 +222,14 @@ object Chapter {
} }
} }
private fun firstPageExists(mangaId: Int, chapterId: Int): Boolean = private fun firstPageExists(mangaId: Int, chapterId: Int): Boolean {
CachedImageResponse.findFileNameStartingWith( val chapterDir = Page.getChapterDir(mangaId, chapterId)
Page.getChapterDir(mangaId, chapterId),
getPageName(0) return CachedImageResponse.findFileNameStartingWith(
chapterDir,
getPageName(0, chapterDir)
) != null ) != null
}
fun modifyChapter( fun modifyChapter(
mangaId: Int, mangaId: Int,

26
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt
View File

@@ -18,6 +18,7 @@ import org.kodein.di.conf.global
import org.kodein.di.instance import org.kodein.di.instance
import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse
import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
import suwayomi.tachidesk.manga.impl.util.storage.SafePath import suwayomi.tachidesk.manga.impl.util.storage.SafePath
import suwayomi.tachidesk.manga.model.table.ChapterTable import suwayomi.tachidesk.manga.model.table.ChapterTable
@@ -49,7 +50,8 @@ object Page {
} }
val chapterId = chapterEntry[ChapterTable.id].value val chapterId = chapterEntry[ChapterTable.id].value
val pageEntry = transaction { PageTable.select { (PageTable.chapter eq chapterId) and (PageTable.index eq index) }.first() } val pageEntry =
transaction { PageTable.select { (PageTable.chapter eq chapterId) and (PageTable.index eq index) }.first() }
val tachiyomiPage = Page( val tachiyomiPage = Page(
pageEntry[PageTable.index], pageEntry[PageTable.index],
@@ -66,16 +68,28 @@ object Page {
} }
} }
val saveDir = getChapterDir(mangaId, chapterId) val chapterDir = getChapterDir(mangaId, chapterId)
File(saveDir).mkdirs() File(chapterDir).mkdirs()
val fileName = getPageName(index) // e.g. 001 val fileName = getPageName(index, chapterDir) // e.g. 001
return getCachedImageResponse(saveDir, fileName) { return getCachedImageResponse(chapterDir, fileName) {
source.fetchImage(tachiyomiPage).awaitSingle() source.fetchImage(tachiyomiPage).awaitSingle()
} }
} }
fun getPageName(index: Int): String = String.format("%03d", index) // TODO(v0.6.0) : zero based pages are deprecated
fun getPageName(index: Int, chapterDir: String): String {
val zeroBasedPageExists = CachedImageResponse.findFileNameStartingWith(
chapterDir,
formatPageName(0)
) != null
if (zeroBasedPageExists) return formatPageName(index)
return formatPageName(index + 1)
}
private fun formatPageName(index: Int) = String.format("%03d", index)
private val applicationDirs by DI.global.instance<ApplicationDirs>() private val applicationDirs by DI.global.instance<ApplicationDirs>()