mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-02-15 03:28:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(local/7z): Fix loading previous pages (#2)

Browse Source
This commit is contained in:
Claudemirovsky 2024-01-03 20:26:31 -03:00 committed by GitHub
parent 9e8b14d141
commit 329bf1039d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/SevenZipPageLoader.kt
View File

@ -19,7 +19,7 @@ internal class SevenZipPageLoader(file: File) : PageLoader() {
return zip.getImages() return zip.getImages()
.mapIndexed { i, entry -> .mapIndexed { i, entry ->
ReaderPage(i).apply { ReaderPage(i).apply {
stream = { entry } stream = { entry.copyOf().inputStream() }
status = Page.State.READY status = Page.State.READY
} }
}.toList() }.toList()

4
core/src/main/java/eu/kanade/tachiyomi/util/storage/SevenZUtil.kt
View File

@ -6,11 +6,11 @@ import tachiyomi.core.util.system.ImageUtil
import java.io.InputStream import java.io.InputStream
object SevenZUtil { object SevenZUtil {
fun SevenZFile.getImages(): Sequence<InputStream> { fun SevenZFile.getImages(): Sequence<ByteArray> {
return generateSequence { runCatching { getNextEntry() }.getOrNull() } return generateSequence { runCatching { getNextEntry() }.getOrNull() }
.filter { !it.isDirectory && ImageUtil.isImage(it.name) { getInputStream(it) } } .filter { !it.isDirectory && ImageUtil.isImage(it.name) { getInputStream(it) } }
.sortedWith { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) } .sortedWith { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) }
.map(::getInputStream) .map(::getInputStream)
.map { it.use(InputStream::readBytes).inputStream() } // ByteArrayInputStream .map { it.use(InputStream::readBytes) } // ByteArray
} }
} }

2
source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
View File

@ -345,7 +345,7 @@ actual class LocalSource(
SevenZFile(format.file.toTempFile(context)).use { archive -> SevenZFile(format.file.toTempFile(context)).use { archive ->
val entry = archive.getImages().firstOrNull() val entry = archive.getImages().firstOrNull()
entry?.let { coverManager.update(manga, it) } entry?.let { coverManager.update(manga, it.inputStream()) }
} }
} }
is Format.Rar -> { is Format.Rar -> {