diff --git a/archive/src/main/resources/org/openrs2/archive/templates/caches/show.html b/archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
index e3eba5092f..cc7a5ee8ed 100644
--- a/archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
+++ b/archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
@@ -54,7 +54,7 @@
Cache (.dat2/.idx)
- Cache (Flat file)
diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts
index 0a75fa74c8..4d10c98a93 100644
--- a/cache/build.gradle.kts
+++ b/cache/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
dependencies {
api(projects.crypto)
+ api(libs.commons.compress)
api(libs.fastutil)
api(libs.guice)
api(libs.netty.buffer)
diff --git a/cache/src/main/kotlin/org/openrs2/cache/FlatFileStoreZipWriter.kt b/cache/src/main/kotlin/org/openrs2/cache/FlatFileStoreTarWriter.kt
similarity index 69%
rename from cache/src/main/kotlin/org/openrs2/cache/FlatFileStoreZipWriter.kt
rename to cache/src/main/kotlin/org/openrs2/cache/FlatFileStoreTarWriter.kt
index 3a1b612505..3431ac1613 100644
--- a/cache/src/main/kotlin/org/openrs2/cache/FlatFileStoreZipWriter.kt
+++ b/cache/src/main/kotlin/org/openrs2/cache/FlatFileStoreTarWriter.kt
@@ -1,15 +1,14 @@
package org.openrs2.cache
import io.netty.buffer.ByteBuf
-import java.nio.file.attribute.FileTime
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
import java.time.Instant
-import java.util.zip.Deflater
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
+import java.util.Date
/**
* A specialised [Store] implementation that writes a cache in the
- * [FlatFileStore] format to a [ZipOutputStream].
+ * [FlatFileStore] format to a [TarArchiveOutputStream].
*
* The cache is not buffered to disk.
*
@@ -18,23 +17,17 @@ import java.util.zip.ZipOutputStream
*
* It is only intended for use by the cache archiving service's web interface.
*/
-public class FlatFileStoreZipWriter(
- private val out: ZipOutputStream,
+public class FlatFileStoreTarWriter(
+ private val out: TarArchiveOutputStream,
private val prefix: String = "cache/",
- level: Int = Deflater.BEST_COMPRESSION,
timestamp: Instant = Instant.EPOCH
) : Store {
- private val timestamp = FileTime.from(timestamp)
+ private val timestamp = Date.from(timestamp)
- init {
- out.setLevel(level)
- }
-
- private fun createZipEntry(name: String): ZipEntry {
- val entry = ZipEntry(prefix + name)
- entry.creationTime = timestamp
- entry.lastAccessTime = timestamp
- entry.lastModifiedTime = timestamp
+ private fun createTarEntry(name: String, size: Int): TarArchiveEntry {
+ val entry = TarArchiveEntry(prefix + name)
+ entry.modTime = timestamp
+ entry.size = size.toLong()
return entry
}
@@ -57,7 +50,8 @@ public class FlatFileStoreZipWriter(
override fun create(archive: Int) {
require(archive in 0..Store.MAX_ARCHIVE)
- out.putNextEntry(createZipEntry("$archive/"))
+ out.putArchiveEntry(createTarEntry("$archive/", size = 0))
+ out.closeArchiveEntry()
}
override fun read(archive: Int, group: Int): ByteBuf {
@@ -69,8 +63,9 @@ public class FlatFileStoreZipWriter(
require(group >= 0)
require(buf.readableBytes() <= Store.MAX_GROUP_SIZE)
- out.putNextEntry(createZipEntry("$archive/$group.dat"))
+ out.putArchiveEntry(createTarEntry("$archive/$group.dat", buf.readableBytes()))
buf.readBytes(out, buf.readableBytes())
+ out.closeArchiveEntry()
}
override fun remove(archive: Int) {
diff --git a/cache/src/test/kotlin/org/openrs2/cache/FlatFileStoreZipWriterTest.kt b/cache/src/test/kotlin/org/openrs2/cache/FlatFileStoreTarWriterTest.kt
similarity index 83%
rename from cache/src/test/kotlin/org/openrs2/cache/FlatFileStoreZipWriterTest.kt
rename to cache/src/test/kotlin/org/openrs2/cache/FlatFileStoreTarWriterTest.kt
index 4e371c90e7..c7194f20b0 100644
--- a/cache/src/test/kotlin/org/openrs2/cache/FlatFileStoreZipWriterTest.kt
+++ b/cache/src/test/kotlin/org/openrs2/cache/FlatFileStoreTarWriterTest.kt
@@ -3,21 +3,21 @@ package org.openrs2.cache
import com.google.common.jimfs.Configuration
import com.google.common.jimfs.Jimfs
import io.netty.buffer.Unpooled
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
import org.openrs2.buffer.copiedBuffer
import org.openrs2.buffer.use
import org.openrs2.util.io.recursiveEquals
import java.io.OutputStream
import java.nio.file.Files
import java.nio.file.Path
-import java.util.zip.ZipOutputStream
import kotlin.test.Test
import kotlin.test.assertFailsWith
import kotlin.test.assertTrue
-public class FlatFileStoreZipWriterTest {
+public class FlatFileStoreTarWriterTest {
@Test
fun testBounds() {
- FlatFileStoreZipWriter(ZipOutputStream(OutputStream.nullOutputStream())).use { store ->
+ FlatFileStoreTarWriter(TarArchiveOutputStream(OutputStream.nullOutputStream())).use { store ->
// create
assertFailsWith {
store.create(-1)
@@ -58,7 +58,7 @@ public class FlatFileStoreZipWriterTest {
@Test
fun testUnsupported() {
- FlatFileStoreZipWriter(ZipOutputStream(OutputStream.nullOutputStream())).use { store ->
+ FlatFileStoreTarWriter(TarArchiveOutputStream(OutputStream.nullOutputStream())).use { store ->
assertFailsWith {
store.exists(0)
}
@@ -92,11 +92,11 @@ public class FlatFileStoreZipWriterTest {
@Test
fun testWrite() {
Jimfs.newFileSystem(Configuration.forCurrentPlatform()).use { fs ->
- val actual = fs.rootDirectories.first().resolve("zip")
+ val actual = fs.rootDirectories.first().resolve("tar")
Files.createDirectories(actual)
- Files.newOutputStream(actual.resolve("cache.zip")).use { out ->
- FlatFileStoreZipWriter(ZipOutputStream(out)).use { store ->
+ Files.newOutputStream(actual.resolve("cache.tar")).use { out ->
+ FlatFileStoreTarWriter(TarArchiveOutputStream(out)).use { store ->
store.create(0)
copiedBuffer("OpenRS2").use { buf ->
@@ -119,7 +119,7 @@ public class FlatFileStoreZipWriterTest {
private companion object {
private val ROOT = Path.of(
- FlatFileStoreZipWriterTest::class.java.getResource("flat-file-store-zip").toURI()
+ FlatFileStoreTarWriterTest::class.java.getResource("flat-file-store-tar").toURI()
)
}
}
diff --git a/cache/src/test/resources/org/openrs2/cache/flat-file-store-tar/cache.tar b/cache/src/test/resources/org/openrs2/cache/flat-file-store-tar/cache.tar
new file mode 100644
index 0000000000..f972b2b535
Binary files /dev/null and b/cache/src/test/resources/org/openrs2/cache/flat-file-store-tar/cache.tar differ
diff --git a/cache/src/test/resources/org/openrs2/cache/flat-file-store-zip/cache.zip b/cache/src/test/resources/org/openrs2/cache/flat-file-store-zip/cache.zip
deleted file mode 100644
index 3655fd746b..0000000000
Binary files a/cache/src/test/resources/org/openrs2/cache/flat-file-store-zip/cache.zip and /dev/null differ