radiostar_gitea/tach-extension
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

using map instead

Browse Source
This commit is contained in:
Mio.
2025-07-14 00:34:12 +02:00
parent 39ea1cd5fd
commit 34a1f20284
1 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt
View File

@@ -1583,27 +1583,23 @@ class Kavita(private val suffix: String = "") : ConfigurableSource, UnmeteredSou
val matchingChapter = volume.chapters.firstOrNull() // or match a chapterId if available val matchingChapter = volume.chapters.firstOrNull() // or match a chapterId if available
?: throw IOException(helper.intl["error_no_chapters_found"]) ?: throw IOException(helper.intl["error_no_chapters_found"])
val pages = mutableListOf<Page>() val pages = (0 until matchingChapter.pages).map { i ->
for (i in 0 until matchingChapter.pages) { Page(
pages.add( index = i,
Page( imageUrl = "$apiUrl/Rreader/image?chapterId=${matchingChapter.id}&page=$i&extractPdf=true&apiKey=$apiKey"
index = i,
imageUrl = "$apiUrl/Reader/image?chapterId=${matchingChapter.id}&page=$i&extractPdf=true&apiKey=$apiKey",
),
) )
} }.toMutableList()
var pageOffset = 0 var pageOffset = matchingChapter.pages
volume.chapters.sortedBy { it.number.toFloatOrNull() ?: 0f }.forEach { chapterDto -> volume.chapters.sortedBy { it.number.toFloatOrNull() ?: 0f }.forEach { chapterDto ->
for (i in 0 until chapterDto.pages) { val chapterPages = (0 until chapterDto.pages).map { i ->
pages.add( Page(
Page( index = pageOffset + i,
index = pageOffset + i, imageUrl = "$apiUrl/Reader/image?chapterId=${chapterDto.id}&page=$i&extractPdf=true&apiKey=$apiKey"
imageUrl = "$apiUrl/Reader/image?chapterId=${chapterDto.id}&page=$i&extractPdf=true&apiKey=$apiKey",
),
) )
} }
pages.addAll(chapterPages)
pageOffset += chapterDto.pages pageOffset += chapterDto.pages
} }
@@ -1624,13 +1620,10 @@ class Kavita(private val suffix: String = "") : ConfigurableSource, UnmeteredSou
throw IOException("${helper.intl["error_failed_parse_chapter"]}: ${e.message}") throw IOException("${helper.intl["error_failed_parse_chapter"]}: ${e.message}")
} }
val pages = mutableListOf<Page>() val pages = (0 until chapterDetails.pages).map { i ->
for (i in 0 until chapterDetails.pages) { Page(
pages.add( index = i,
Page( imageUrl = "$apiUrl/Reader/image?chapterId=$chapterId&page=$i&extractPdf=true&apiKey=$apiKey"
index = i,
imageUrl = "$apiUrl/Reader/image?chapterId=$chapterId&page=$i&extractPdf=true&apiKey=$apiKey",
),
) )
} }
pages.toList() pages.toList()
@@ -1639,13 +1632,10 @@ class Kavita(private val suffix: String = "") : ConfigurableSource, UnmeteredSou
// Fallback to using the scanlator field if we can't get chapter details // Fallback to using the scanlator field if we can't get chapter details
Log.e(LOG_TAG, "Error fetching chapter details, using fallback", error) Log.e(LOG_TAG, "Error fetching chapter details, using fallback", error)
val fallbackPageCount = chapter.scanlator?.replace(" pages", "")?.toIntOrNull() ?: 1 val fallbackPageCount = chapter.scanlator?.replace(" pages", "")?.toIntOrNull() ?: 1
val pages = mutableListOf<Page>() val pages = (0 until fallbackPageCount).map { i ->
for (i in 0 until fallbackPageCount) { Page(
pages.add( index = i,
Page( imageUrl = "$apiUrl/Reader/image?chapterId=${chapter.url.substringBefore("_")}&page=$i&extractPdf=true&apiKey=$apiKey"
index = i,
imageUrl = "$apiUrl/Reader/image?chapterId=${chapter.url.substringBefore("_")}&page=$i&extractPdf=true&apiKey=$apiKey",
),
) )
} }
Observable.just(pages.toList()) Observable.just(pages.toList())