deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

preserve imported PGN date - fixes #1064

pull/1069/head
Thibault Duplessis 2015-10-01 09:54:38 +02:00
parent f55dababac
commit 65ee21210a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/api/src/main/PgnDump.scala
View File

@ -15,11 +15,7 @@ final class PgnDump(
def apply(game: Game, initialFen: Option[String]): Pgn = {
val pgn = dumper(game, initialFen)
game.tournamentId.flatMap(tournamentName).orElse {
game.simulId.flatMap(simulName).orElse {
game.pgnImport.flatMap { pgni =>
Parser.full(pgni.pgn).toOption.flatMap(_ tag "event")
}
}
game.simulId.flatMap(simulName)
}.fold(pgn)(pgn.withEvent)
}

19
modules/game/src/main/PgnDump.scala
View File

@ -3,7 +3,7 @@ package lila.game
import akka.actor._
import akka.pattern.ask
import chess.format.Forsyth
import chess.format.pgn.{ Pgn, Tag }
import chess.format.pgn.{ Pgn, Tag, Parser, ParsedPgn }
import chess.format.{ pgn => chessPgn }
import chess.OpeningExplorer
import makeTimeout.short
@ -18,7 +18,10 @@ final class PgnDump(
import PgnDump._
def apply(game: Game, initialFen: Option[String]): Pgn = {
val ts = tags(game, initialFen)
val imported = game.pgnImport.flatMap { pgni =>
Parser.full(pgni.pgn).toOption
}
val ts = tags(game, initialFen, imported)
val fenSituation = ts find (_.name == Tag.FEN) flatMap { case Tag(_, fen) => Forsyth <<< fen }
val moves2 = fenSituation.??(_.situation.color.black).fold(".." :: game.pgnMoves, game.pgnMoves)
Pgn(ts, turns(moves2, fenSituation.map(_.fullMoveNumber) | 1))
@ -47,13 +50,17 @@ final class PgnDump(
private val customStartPosition: Set[chess.variant.Variant] =
Set(chess.variant.Chess960, chess.variant.FromPosition, chess.variant.Horde)
private def tags(game: Game, initialFen: Option[String]): List[Tag] = gameLightUsers(game) match {
private def tags(
game: Game,
initialFen: Option[String],
imported: Option[ParsedPgn]): List[Tag] = gameLightUsers(game) match {
case (wu, bu) => List(
Tag(_.Event,
Tag(_.Event, imported.flatMap(_ tag "event") | {
if (game.imported) "Import"
else game.rated.fold("Rated game", "Casual game")),
else game.rated.fold("Rated game", "Casual game")
}),
Tag(_.Site, gameUrl(game.id)),
Tag(_.Date, dateFormat.print(game.createdAt)),
Tag(_.Date, imported.flatMap(_ tag "date") | dateFormat.print(game.createdAt)),
Tag(_.White, player(game.whitePlayer, wu)),
Tag(_.Black, player(game.blackPlayer, bu)),
Tag(_.Result, result(game)),