Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle archives with nested directories properly

Browse Source 
Closes #9389

(cherry picked from commit 20bec66a9de5ae34dd437714ff5f80801e2e92b8)
This commit is contained in:
arkon 2023-04-25 22:07:34 -04:00 committed by Jobobby04
parent 72a20eca12
commit 4ade0b3ed4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt
View File

@ -26,9 +26,11 @@ internal class RarPageLoader(file: File) : PageLoader() {
rar.fileHeaders.asSequence() rar.fileHeaders.asSequence()
.filterNot { it.isDirectory } .filterNot { it.isDirectory }
.forEach { header -> .forEach { header ->
val pageFile = File(tmpDir, header.fileName).also { it.createNewFile() } val pageOutputStream = File(tmpDir, header.fileName.substringAfterLast("/"))
.also { it.createNewFile() }
.outputStream()
getStream(rar, header).use { getStream(rar, header).use {
it.copyTo(pageFile.outputStream()) it.copyTo(pageOutputStream)
} }
} }
} }

3
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt
View File

@ -48,7 +48,8 @@ internal class ZipPageLoader(
generateSequence { zipInputStream.nextEntry } generateSequence { zipInputStream.nextEntry }
.filterNot { it.isDirectory } .filterNot { it.isDirectory }
.forEach { entry -> .forEach { entry ->
File(tmpDir, entry.name).also { it.createNewFile() } File(tmpDir, entry.name.substringAfterLast("/"))
.also { it.createNewFile() }
.outputStream().use { pageOutputStream -> .outputStream().use { pageOutputStream ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
pageOutputStream.write(zipInputStream.readNBytes(entry.size.toInt())) pageOutputStream.write(zipInputStream.readNBytes(entry.size.toInt()))