Fix qualities with rating import

fmasa · Sep 3, 2023 · 6d4aa5c · 6d4aa5c
1 parent da8306b
commit 6d4aa5c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/...cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/trappings/Utils.kt b/...cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/trappings/Utils.kt
@@ -35,7 +35,7 @@ inline fun <reified T : Enum<T>> matchEnumSetOrNull(value: String, separator: St
     return enums.toSet()
 }
 
-val FEATURE_REGEX = Regex("([a-zA-Z- ])+ ?\\(?\\+?([0-9])?A?\\)?")
+val FEATURE_REGEX = Regex("([a-zA-Z- ]+) ?\\(?\\+?([0-9])?A?\\)?")
 private val NAME_WITH_COUNT_PATTERN = Regex("(.*) \\((\\d+|dozen)\\)")
 
 inline fun <reified T : Enum<T>> parseFeatures(value: String): Map<T, Int> {
@@ -47,11 +47,11 @@ inline fun <reified T : Enum<T>> parseFeatures(value: String): Map<T, Int> {
         .splitToSequence(",")
         .map { it.trim() }
         .mapNotNull {
-            val (name, rating) = FEATURE_REGEX.matchEntire(it)?.groupValues
+            val (_, name, rating) = FEATURE_REGEX.matchEntire(it)?.groupValues
                 ?: error("Invalid feature $it")
-            val feature = matchEnumOrNull<T>(name) ?: return@mapNotNull null
+            val feature = matchEnumOrNull<T>(name.trim()) ?: return@mapNotNull null
 
-            feature to (rating.toIntOrNull() ?: 0)
+            feature to (rating.toIntOrNull() ?: 1)
         }.toMap()
 }
 

diff --git a/...rantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/trappings/UtilsTest.kt b/...rantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/trappings/UtilsTest.kt
@@ -0,0 +1,20 @@
+package cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.parsers.trappings
+
+import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.WeaponQuality
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class UtilsTest {
+
+    @Test
+    fun `matchEnum() parses all feature types`() {
+        assertEquals(
+            mapOf(
+                WeaponQuality.SLASH to 3,
+                WeaponQuality.DAMAGING to 1,
+                WeaponQuality.SHIELD to 2,
+            ),
+            parseFeatures("Slash (3A), Damaging*, Shield 2, Unknown")
+        )
+    }
+}