From ac9dc8303161bca149631ed0f3379a8e9946f35c Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Sun, 5 Dec 2021 13:25:49 +0000
Subject: [PATCH] Rename legacyData to legacy and make it public

This will be useful for determining if a cache is 3xx or JS5 when
importing it in the archiving service.

Signed-off-by: Graham <gpe@openrs2.org>
---
 .../main/kotlin/org/openrs2/cache/DiskStore.kt   | 16 ++++++++--------
 .../kotlin/org/openrs2/cache/DiskStoreTest.kt    |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cache/src/main/kotlin/org/openrs2/cache/DiskStore.kt b/cache/src/main/kotlin/org/openrs2/cache/DiskStore.kt
index e34028a4..55d2f157 100644
--- a/cache/src/main/kotlin/org/openrs2/cache/DiskStore.kt
+++ b/cache/src/main/kotlin/org/openrs2/cache/DiskStore.kt
@@ -31,11 +31,11 @@ public class DiskStore private constructor(
     private val musicData: BufferedFileChannel?,
     private val indexes: Array<BufferedFileChannel?>,
     private val alloc: ByteBufAllocator,
-    legacyData: Boolean
+    public val legacy: Boolean
 ) : Store {
     private data class IndexEntry(val size: Int, val block: Int)
 
-    private val archiveOffset = if (legacyData) 1 else 0
+    private val archiveOffset = if (legacy) 1 else 0
 
     init {
         require(indexes.size == Store.MAX_ARCHIVE + 1)
@@ -505,9 +505,9 @@ public class DiskStore private constructor(
             val legacyDataPath = legacyDataPath(root)
 
             // We check for js5DataPath first as it takes precedence.
-            val legacyDataFile = !Files.exists(js5DataPath)
+            val legacy = !Files.exists(js5DataPath)
 
-            val dataPath = if (legacyDataFile) {
+            val dataPath = if (legacy) {
                 legacyDataPath
             } else {
                 js5DataPath
@@ -545,17 +545,17 @@ public class DiskStore private constructor(
                 }
             }
 
-            return DiskStore(root, data, musicData, archives, alloc, legacyDataFile)
+            return DiskStore(root, data, musicData, archives, alloc, legacy)
         }
 
         public fun create(
             root: Path,
             alloc: ByteBufAllocator = ByteBufAllocator.DEFAULT,
-            legacyDataFile: Boolean = false
+            legacy: Boolean = false
         ): Store {
             Files.createDirectories(root)
 
-            val dataPath = if (legacyDataFile) {
+            val dataPath = if (legacy) {
                 legacyDataPath(root)
             } else {
                 dataPath(root)
@@ -569,7 +569,7 @@ public class DiskStore private constructor(
 
             val archives = Array<BufferedFileChannel?>(Store.MAX_ARCHIVE + 1) { null }
 
-            return DiskStore(root, data, null, archives, alloc, legacyDataFile)
+            return DiskStore(root, data, null, archives, alloc, legacy)
         }
     }
 }
diff --git a/cache/src/test/kotlin/org/openrs2/cache/DiskStoreTest.kt b/cache/src/test/kotlin/org/openrs2/cache/DiskStoreTest.kt
index d2bf6b9d..72738d7c 100644
--- a/cache/src/test/kotlin/org/openrs2/cache/DiskStoreTest.kt
+++ b/cache/src/test/kotlin/org/openrs2/cache/DiskStoreTest.kt
@@ -808,7 +808,7 @@ class DiskStoreTest {
 
     @Test
     fun testCreateLegacyDataFile() {
-        writeTest("single-block-legacy", legacyDataFile = true) { store ->
+        writeTest("single-block-legacy", legacy = true) { store ->
             copiedBuffer("OpenRS2").use { buf ->
                 store.write(0, 1, buf)
             }
@@ -832,10 +832,10 @@ class DiskStoreTest {
         }
     }
 
-    private fun writeTest(name: String, legacyDataFile: Boolean = false, f: (Store) -> Unit) {
+    private fun writeTest(name: String, legacy: Boolean = false, f: (Store) -> Unit) {
         Jimfs.newFileSystem(Configuration.forCurrentPlatform()).use { fs ->
             val actual = fs.rootDirectories.first().resolve("cache")
-            DiskStore.create(actual, legacyDataFile = legacyDataFile).use { store ->
+            DiskStore.create(actual, legacy = legacy).use { store ->
                 f(store)
             }