integrate TournamentClock

lichess-org · Dec 29, 2024 · d394e12 · d394e12
1 parent e9a6e3a
commit d394e12
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/core/src/main/scala/Clock.scala b/core/src/main/scala/Clock.scala
@@ -1,6 +1,5 @@
 package chess
 
-import cats.syntax.option.none
 import chess.Clock.Config
 
 import java.text.DecimalFormat
@@ -207,16 +206,6 @@ object Clock:
       if limitSeconds == 0 then increment.atLeast(Centis(300))
       else limit
 
-  // [TimeControl "600+2"] -> 10+2
-  def readPgnConfig(str: String): Option[Config] =
-    str.split('+') match
-      case Array(initStr, incStr) =>
-        for
-          init <- initStr.toIntOption
-          inc  <- incStr.toIntOption
-        yield Config(init, inc)
-      case _ => none
-
   def apply(limit: LimitSeconds, increment: IncrementSeconds): Clock = apply(Config(limit, increment))
 
   def apply(config: Config): Clock =

diff --git a/core/src/main/scala/TournamentClock.scala b/core/src/main/scala/TournamentClock.scala
@@ -4,7 +4,10 @@ import cats.syntax.all.*
 
 import Clock.{ LimitSeconds, IncrementSeconds }
 
-case class TournamentClock(limitSeconds: LimitSeconds, incrementSeconds: IncrementSeconds)
+case class TournamentClock(limitSeconds: LimitSeconds, incrementSeconds: IncrementSeconds):
+
+  def toClockConfig: Option[Clock.Config] =
+    Clock.Config(limitSeconds, incrementSeconds).some
 
 object TournamentClock:
 

diff --git a/core/src/main/scala/format/pgn/Reader.scala b/core/src/main/scala/format/pgn/Reader.scala
@@ -45,4 +45,4 @@ object Reader:
 
   private def makeGame(tags: Tags) =
     val g = Game(variantOption = tags.variant, fen = tags.fen)
-    g.copy(startedAtPly = g.ply, clock = tags.clockConfig.map(Clock.apply))
+    g.copy(startedAtPly = g.ply, clock = tags.clockConfig.flatMap(_.toClockConfig).map(Clock.apply))
diff --git a/core/src/main/scala/format/pgn/Tag.scala b/core/src/main/scala/format/pgn/Tag.scala
@@ -30,10 +30,10 @@ case class Tags(value: List[Tag]) extends AnyVal:
     val name = which(Tag)
     value.find(_.name == name).map(_.value)
 
-  def clockConfig: Option[Clock.Config] =
+  def clockConfig: Option[TournamentClock] =
     value
       .collectFirst { case Tag(Tag.TimeControl, str) => str }
-      .flatMap(Clock.readPgnConfig)
+      .flatMap(TournamentClock.parse.apply)
 
   def variant: Option[chess.variant.Variant] =
     apply(_.Variant)