deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

show PGN import error - closes #5320

Browse source
This commit is contained in:
Thibault Duplessis 2019-08-25 09:35:51 +02:00
parent a66ab63c19
commit b73a4d5011
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/views/game/importGame.scala
View file

@ -27,6 +27,15 @@ object importGame {
p(cls := "explanation")(trans.importGameExplanation()),
postForm(cls := "form3 import", action := routes.Importer.sendGame())(
form3.group(form("pgn"), trans.pasteThePgnStringHere())(form3.textarea(_)()),
form("pgn").value flatMap { pgn =>
lila.importer.ImportData(pgn, none).preprocess(none).fold(
err => frag(
pre(cls := "error")(err.toList mkString "\n"),
br, br
).some,
_ => none
)
},
form3.group(form("pgnFile"), raw("Or upload a PGN file"), klass = "upload") { f =>
form3.file.pgn(f.name)
},

5
modules/importer/src/main/DataForm.scala
View file

@ -12,12 +12,11 @@ import lila.game._
private[importer] final class DataForm {
lazy val importForm = Form(mapping(
"pgn" -> nonEmptyText.verifying("invalidPgn", checkPgn _),
"pgn" -> nonEmptyText.verifying("invalidPgn", p => checkPgn(p).isSuccess),
"analyse" -> optional(nonEmptyText)
)(ImportData.apply)(ImportData.unapply))
private def checkPgn(pgn: String): Boolean =
ImportData(pgn, none).preprocess(none).isSuccess
def checkPgn(pgn: String): Valid[Preprocessed] = ImportData(pgn, none).preprocess(none)
}
private[importer] case class TagResult(status: Status, winner: Option[Color])