Add gzip headers to containers

The headerless gzip compression is only used for pack200 files, not
containers.

Signed-off-by: Graham <gpe@openrs2.dev>
bzip2
Graham 4 years ago
parent ce97775663
commit 24db41a74e
  1. 7
      cache/src/main/java/dev/openrs2/cache/Js5CompressionType.kt
  2. BIN
      cache/src/test/resources/dev/openrs2/cache/gzip-encrypted.dat
  3. BIN
      cache/src/test/resources/dev/openrs2/cache/gzip.dat

@ -1,11 +1,12 @@
package dev.openrs2.cache package dev.openrs2.cache
import dev.openrs2.compress.bzip2.Bzip2 import dev.openrs2.compress.bzip2.Bzip2
import dev.openrs2.compress.gzip.Gzip import dev.openrs2.compress.gzip.GzipLevelOutputStream
import dev.openrs2.compress.lzma.Lzma import dev.openrs2.compress.lzma.Lzma
import java.io.InputStream import java.io.InputStream
import java.io.OutputStream import java.io.OutputStream
import java.util.zip.Deflater import java.util.zip.Deflater
import java.util.zip.GZIPInputStream
enum class Js5CompressionType { enum class Js5CompressionType {
NONE, NONE,
@ -17,7 +18,7 @@ enum class Js5CompressionType {
return when (this) { return when (this) {
NONE -> input NONE -> input
BZIP2 -> Bzip2.createHeaderlessInputStream(input) BZIP2 -> Bzip2.createHeaderlessInputStream(input)
GZIP -> Gzip.createHeaderlessInputStream(input) GZIP -> GZIPInputStream(input)
LZMA -> Lzma.createHeaderlessInputStream(input, length.toLong()) LZMA -> Lzma.createHeaderlessInputStream(input, length.toLong())
} }
} }
@ -26,7 +27,7 @@ enum class Js5CompressionType {
return when (this) { return when (this) {
NONE -> output NONE -> output
BZIP2 -> Bzip2.createHeaderlessOutputStream(output) BZIP2 -> Bzip2.createHeaderlessOutputStream(output)
GZIP -> Gzip.createHeaderlessOutputStream(output, Deflater.BEST_COMPRESSION) GZIP -> GzipLevelOutputStream(output, Deflater.BEST_COMPRESSION)
/* /*
* LZMA at -9 has significantly higher CPU/memory requirements for * LZMA at -9 has significantly higher CPU/memory requirements for
* both compression _and_ decompression, so we use the default of * both compression _and_ decompression, so we use the default of

Loading…
Cancel
Save