Fixed implicitly dropping first keys

diareuse · Aug 24, 2022 · 4724877 · 4724877
1 parent c5871f5
commit 4724877
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/dragapult-plugin/plugin-csv/src/main/java/dragapult/csv/LocalizationKeyReaderCsv.kt b/dragapult-plugin/plugin-csv/src/main/java/dragapult/csv/LocalizationKeyReaderCsv.kt
@@ -15,7 +15,8 @@ class LocalizationKeyReaderCsv(
     override val keys: Sequence<String>
         get() = sequence {
             file.csvParser().use {
-                for (line in it.drop(1)) {
+                val lines = it.dropWhile { key -> keyRegex.matches(key.firstOrNull().orEmpty()) }
+                for (line in lines) {
                     yield(line[0])
                 }
             }
@@ -40,7 +41,7 @@ class LocalizationKeyReaderCsv(
 
     private fun CSVParser.asTranslationSequence(key: String): Sequence<Pair<Locale, String>> {
         return sequence {
-            val languages = headerMap.entries.drop(1)
+            val languages = headerMap.entries.dropWhile { keyRegex.matches(it.key) }
             val translations = find { it[0] == key } ?: return@sequence
             for ((language, index) in languages) {
                 val locale = Locale.forLanguageTag(language)
@@ -62,4 +63,10 @@ class LocalizationKeyReaderCsv(
 
     }
 
+    companion object {
+
+        private val keyRegex = Regex("^[kK][eE][yY][sS]?")
+
+    }
+
 }