Skip to content

Commit 3fa05a3

Browse files
committed
Update dicio-numbers and fix compilation
1 parent 764142d commit 3fa05a3

6 files changed

Lines changed: 8 additions & 12 deletions

File tree

app/src/main/kotlin/org/stypox/dicio/skills/calculator/CalculatorSkill.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class CalculatorSkill(correspondingSkillInfo: SkillInfo, data: StandardRecognize
3838
override suspend fun generateOutput(ctx: SkillContext, inputData: Calculator): SkillOutput {
3939
val textWithNumbers: List<Any>? = when (inputData) {
4040
is Calculator.Calculate -> inputData.calculation
41-
}?.let { ctx.parserFormatter?.extractNumber(it)?.mixedWithText }
41+
}?.let { ctx.parserFormatter?.extractNumber(it)?.parseMixedWithText() }
4242
if (textWithNumbers.isNullOrEmpty()
4343
|| (textWithNumbers.size == 1 && textWithNumbers[0] !is Number)) {
4444
return CalculatorOutput(null, "", "")

app/src/main/kotlin/org/stypox/dicio/skills/navigation/NavigationSkill.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class NavigationSkill(correspondingSkillInfo: SkillInfo, data: StandardRecognize
2626
val strNums: List<Any> = npf
2727
.extractNumber(placeToNavigate)
2828
.preferOrdinal(true)
29-
.mixedWithText
29+
.parseMixedWithText()
3030
.flatMap { item ->
3131
if (item is String) {
3232
// allows checking whether there are two single letters next to each other

app/src/main/kotlin/org/stypox/dicio/skills/telephone/ContactChooserIndex.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.stypox.dicio.skills.telephone
22

3-
import org.dicio.numbers.unit.Number
43
import org.dicio.skill.context.SkillContext
54
import org.dicio.skill.skill.AlwaysBestScore
65
import org.dicio.skill.skill.AlwaysWorstScore
@@ -19,14 +18,11 @@ class ContactChooserIndex internal constructor(private val contacts: List<Pair<S
1918
val index = ctx.parserFormatter!!
2019
.extractNumber(input)
2120
.preferOrdinal(true)
22-
.mixedWithText
23-
.asSequence()
24-
.filter { obj -> (obj as? Number)?.isInteger == true }
25-
.map { obj -> (obj as Number).integerValue().toInt() }
26-
.firstOrNull() ?: 0
21+
.integerOnly(true)
22+
.parseFirstIfInteger() ?: 0
2723
return Pair(
2824
if (index <= 0 || index > contacts.size) AlwaysWorstScore else AlwaysBestScore,
29-
index
25+
index.toInt()
3026
)
3127
}
3228

app/src/main/kotlin/org/stypox/dicio/skills/timer/TimerOutput.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ sealed interface TimerOutput : SkillOutput {
5959
): Pair<Score, Duration?> {
6060
val duration = ctx.parserFormatter!!
6161
.extractDuration(input)
62-
.first
62+
.parseFirst()
6363
?.toJavaDuration()
6464

6565
return Pair(

app/src/main/kotlin/org/stypox/dicio/skills/timer/TimerSkill.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TimerSkill(correspondingSkillInfo: SkillInfo, data: StandardRecognizerData
2626
return when (inputData) {
2727
is Timer.Set -> {
2828
val duration = inputData.duration?.let {
29-
ctx.parserFormatter?.extractDuration(it)?.first?.toJavaDuration()
29+
ctx.parserFormatter?.extractDuration(it)?.parseFirst()?.toJavaDuration()
3030
}
3131
if (duration == null) {
3232
TimerOutput.SetAskDuration { setTimer(ctx, it, inputData.name) }

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ composeBom = "2025.09.01"
99
datastore = "1.1.7"
1010
desugarJdkLibs = "2.1.5"
1111
# used in settings.gradle.kts for git dependencies
12-
dicioNumbers = "19f7166fc1c12136aefa962d213ad4f7da7d11a8"
12+
dicioNumbers = "40e51e8a66e82e5b823c806477bffc4e4e0b8457"
1313
dicioSentencesCompiler = "6d0f1ca0a732c28329b3fd0f7c8f351e00933ad6"
1414
exp4j = "0.4.8"
1515
gradle = "8.13.0"

0 commit comments

Comments
 (0)