fix time control parser

lichess-org · Dec 31, 2024 · 4c8d1a0 · 4c8d1a0
1 parent 75b5a36
commit 4c8d1a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/core/src/main/scala/TournamentClock.scala b/core/src/main/scala/TournamentClock.scala
@@ -21,17 +21,17 @@ object TournamentClock:
 
   object parse:
 
-    private val cleanRegex = "(move|minutes|minute|min|m|seconds|second|sec|s|'|\"|/)".r
+    private val cleanRegex = "(/move|minutes|minute|min|m|seconds|second|sec|s|'|\")".r
 
     private def make(a: Int, b: Int) =
       val limit = LimitSeconds(if a > 180 then a else a * 60)
       TournamentClock(limit, IncrementSeconds(b))
 
     def apply(str: String): Option[TournamentClock] =
       cleanRegex
-        .replaceAllIn(str.toLowerCase, "")
-        .replace(" ", "")
-        .split('+') match
-        case Array(a)    => a.toIntOption.map(make(_, 0))
-        case Array(a, b) => (a.toIntOption, b.toIntOption).mapN(make)
-        case _           => none
+        .replaceAllIn(str.toLowerCase.replace(" ", ""), "")
+        .split('+')
+        .match
+          case Array(a)    => a.toIntOption.map(make(_, 0))
+          case Array(a, b) => (a.toIntOption, b.toIntOption).mapN(make)
+          case _           => none
diff --git a/test-kit/src/test/scala/TournamentClockTest.scala b/test-kit/src/test/scala/TournamentClockTest.scala
@@ -43,5 +43,7 @@ class TournamentClockTest extends ChessTest:
     assertEquals(parse("180"), someClock(180, 0))
     assertEquals(parse("240"), someClock(4, 0))
 
+    assertEquals(parse("120 min / 40 moves + 30 min"), None)
+
     // we're not there yet
     // assertEquals(parse("90 min / 40 moves + 30 min + 30 sec / move"), ???)