fixes

Author: lamba92

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 allprojects {
     group = "com.github.lamba92"
-    version = "1.0.4"
+    version = "1.0.5"
 
     extensions.findByName("buildScan")?.withGroovyBuilder {
         setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")

data/src/commonMain/kotlin/com/github/lamba92/dragalialost/data/mappers/AbilityTypeMapper.kt

@@ -11,7 +11,7 @@ class AbilityTypeMapper : SingleFromRemoteMapper<AbilityGroupJSON, AbilityType>
         "support" -> AbilityType.SUPPORT
         "anti-poison", "anti-burn", "anti-freeze", "anti-paralysis",
         "anti-blindness", "anti-stun", "anti-curse", "anti-bog",
-        "anti-sleep" -> AbilityType.AFFLICTIONS_RESISTANCE
+        "anti-sleep", "afflictions" -> AbilityType.AFFLICTIONS_RESISTANCE
         "anti-flame", "anti-water", "anti-wind",
         "anti-light", "anti-shadow" -> AbilityType.ELEMENT_RESISTANCE
         "anti-class" -> AbilityType.ANTI_CLASS

data/src/commonMain/kotlin/com/github/lamba92/dragalialost/data/utils/Utils.kt

@@ -51,18 +51,46 @@ inline infix fun <T, R> T.with(function: T.() -> R) =
 inline infix fun <T, R, K> T.withPair(function: T.() -> Pair<R, K>) =
     function(this).let { Triple(this, it.first, it.second) }
 
-internal val sanitizationRegex1 = Regex("(&lt;span )?style=.*&gt;(\\d*%)&lt.*;( |\\.)")
-internal val sanitizationRegex2 = Regex("(&lt;span )?style=.*&gt;(\\d{1,2}%) \\((\\d{1,3}%)\\).*")
-internal val sanitizationRegex3 = Regex("\\[\\[.*\\|(.*)\\]\\]")
-internal val sanitizationRegex4 = Regex("\\[\\[(.*)\\]\\]")
-internal val sanitizationRegex5 = Regex("&quot;(.*)\\.&quot;")
-
-fun String.sanitize() =
-    replace("'''", "")
-        .replace(sanitizationRegex1, "$2 ")
-        .replace(sanitizationRegex2, "$2 ($3)")
-        .replace(sanitizationRegex3, "$1")
-        .replace(sanitizationRegex4, "$1")
-        .replace("&lt;br&gt;", "")
-        .replace("\n", "")
-        .replace(sanitizationRegex5, "$1")
+internal val sanitizationRegexes = listOf(
+    Regex("\\[\\[.*\\|(.*)\\]\\]") to "$1",
+    Regex("\\[\\[(.*)\\]\\]") to "$1",
+    Regex("color:#(.{6});") to "",
+    Regex(" br([A-Z])") to " $1",
+    Regex("\\.(\\w)") to ". $1",
+    Regex("(\\d)\\. (\\d)") to "$1.$2"
+)
+
+internal val sanitizationRemoves = listOf(
+    "&lt;span ", "&quot;", "&gt;", "&lt;", "/span", "brbr",
+    "style=", "&lt;br&gt;", "\n", "]]", "[[", "'''", "font-weight:bold;"
+)
+
+internal val sanitizationSubstitutions = listOf(
+    "  " to " ", "br/" to ". "
+)
+
+@JvmName("replaceRegex")
+fun String.replace(values: Pair<Regex, String>) =
+    replace(values.first, values.second)
+
+@JvmName("replaceString")
+fun String.replace(values: Pair<String, String>) =
+    replace(values.first, values.second)
+
+fun String.remove(chars: String) =
+    replace(chars, "")
+
+fun String.sanitize(): String {
+    var me = this
+    sanitizationRegexes.forEach {
+        me = me.replace(it)
+    }
+    sanitizationRemoves.forEach {
+        me = me.remove(it)
+    }
+    sanitizationSubstitutions.forEach {
+        me = me.replace(it)
+    }
+    return me.replace(Regex(" br([A-Z])"), " $1")
+
+}

gradle.properties

@@ -7,7 +7,7 @@ coroutinesVersion=1.3.2
 kodeinVersion=6.4.1
 textEncodingVersion=0.7.0
 logbackVersion=1.2.3
-coroutineRunTestVersion=0.0.2-alpha
+coroutineRunTestVersion=0.0.6-alpha
 bufferutilVersion=4.0.1
 utf8ValidateVersion=5.0.2
 nodeFetchVersion=2.6.0

kodein-di/src/commonTest/kotlin/com/github/lamba92/dragalialost/kodeindi/tests/Test.kt

@@ -1,7 +1,13 @@
 package com.github.lamba92.dragalialost.kodeindi.tests
 
 import com.github.lamba92.dragalialost.domain.repositories.DragaliaLostRepository
+import com.github.lamba92.dragalialost.domain.repositories.searchAdventurers
+import com.github.lamba92.dragalialost.domain.repositories.searchAllAdventurers
 import com.github.lamba92.dragalialost.kodeindi.dragaliaLostModule
+import com.github.lamba92.utils.runTest
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.*
 import org.kodein.di.Kodein
 import org.kodein.di.KodeinAware
 import org.kodein.di.erased.instance
@@ -14,5 +20,50 @@ class AdventurerTests : KodeinAware {
 
     private val repository by instance<DragaliaLostRepository>()
 
+    @FlowPreview
+    @ExperimentalCoroutinesApi
+    fun f() = runTest {
+        repository.searchAllAdventurers()
+            .flatMapMerge {
+                flowOf(
+                    it.skill1.level1.description,
+                    it.skill1.level2.description,
+                    it.skill1.level3?.description,
+                    it.skill2.level1.description,
+                    it.skill2.level2.description,
+                    it.skill2.level3?.description,
+
+                    it.ability1.level1.description,
+                    it.ability1.level2?.description,
+                    it.ability1.level3?.description,
+
+                    it.ability2?.level1?.description,
+                    it.ability2?.level2?.description,
+                    it.ability2?.level3?.description,
+
+                    it.ability3?.level1?.description,
+                    it.ability3?.level2?.description,
+                    it.ability3?.level3?.description,
+
+                    it.coAbility.level1.description,
+                    it.coAbility.level2.description,
+                    it.coAbility.level3.description,
+                    it.coAbility.level4.description,
+                    it.coAbility.level5.description
+                ).filterNotNull()
+            }
+            .distinctUntilChanged()
+            .toList()
+            .sorted()
+            .forEach { println(it) }
+    }
+
+    fun f2() = runTest {
+        repository.searchAdventurers {
+            name = "Lathna"
+        }.collect {
+            println(it)
+        }
+    }
 
 }