temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-06-30 17:34:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix/extracting assets from apks (#644)

Browse Source 
* Get rid of multiple static "assets/" usage

* Correctly add new zip entry

The name of the entry has to be a "/" separated path, otherwise, the files can't be found.
This commit is contained in:
schroda
2023-08-07 05:21:31 +02:00
committed by GitHub
parent 2889029b70
commit f6fec2424c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt
View File

@@ -213,7 +213,7 @@ object Extension {
var zipEntry = zipInputStream.nextEntry var zipEntry = zipInputStream.nextEntry
while (zipEntry != null) { while (zipEntry != null) {
if (zipEntry.name.startsWith("assets/")) { if (zipEntry.name.startsWith("assets/")) {
val assetFile = File(assetsFolder, zipEntry.name.substringAfter("assets/")) val assetFile = File(assetsFolder, zipEntry.name)
assetFile.parentFile.mkdirs() assetFile.parentFile.mkdirs()
FileOutputStream(assetFile).use { outputStream -> FileOutputStream(assetFile).use { outputStream ->
zipInputStream.copyTo(outputStream) zipInputStream.copyTo(outputStream)
@@ -236,7 +236,7 @@ object Extension {
} }
assetsFolder.walkTopDown().forEach { file -> assetsFolder.walkTopDown().forEach { file ->
if (file.isFile) { if (file.isFile) {
jarZipOutputStream.putNextEntry(ZipEntry("assets/${file.relativeTo(assetsFolder)}")) jarZipOutputStream.putNextEntry(ZipEntry(file.relativeTo(assetsFolder).toString().replace("\\", "/")))
file.inputStream().use { inputStream -> file.inputStream().use { inputStream ->
inputStream.copyTo(jarZipOutputStream) inputStream.copyTo(jarZipOutputStream)
} }