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

Merge branch 'master' of github.com:ornicar/lila

Browse source 
* 'master' of github.com:ornicar/lila:
  instanciate analysis replay (TODO: cache) and pass divisions to JS
This commit is contained in:
Thibault Duplessis 2014-11-08 16:48:50 +01:00
parent 4314ee7f61 b9a5ba2861
commit ac7f7d4d56
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/Analyse.scala
View file

@ -55,10 +55,16 @@ object Analyse extends LilaController {
Env.game.pgnDump(pov.game) zip
(env.analyser get pov.game.id) zip
(pov.game.tournamentId ?? lila.tournament.TournamentRepo.byId) zip
(GameRepo initialFen pov.game.id) zip
Env.game.crosstableApi(pov.game) flatMap {
case (((pgn, analysis), tour), crosstable) =>
case ((((pgn, analysis), tour), initialFen), crosstable) =>
Env.api.roundApi.watcher(pov, Env.api.version, tv = none, analysis.map(pgn -> _)) map { data =>
val opening = gameOpening(pov.game)
val replay = chess.Replay(
pgn = pov.game.pgnMoves mkString " ",
initialFen = initialFen,
variant = pov.game.variant
).toOption
Ok(html.analyse.replay(
pov,
data,
@ -68,7 +74,8 @@ object Analyse extends LilaController {
analysis filter (_.done) map { a => AdvantageChart(a.infoAdvices, pov.game.pgnMoves) },
tour,
new TimeChart(pov.game, pov.game.pgnMoves),
crosstable))
crosstable,
replay))
}
}

10
app/views/analyse/replay.scala.html
View file

@ -1,4 +1,4 @@
@(pov: Pov, data: play.api.libs.json.JsObject, pgn: String, opening: Option[chess.OpeningExplorer.Opening], analysis: Option[lila.analyse.Analysis], advantageChart: Option[String], tour: Option[lila.tournament.Tournament], timeChart: lila.analyse.TimeChart, cross: Option[lila.game.Crosstable])(implicit ctx: Context)
@(pov: Pov, data: play.api.libs.json.JsObject, pgn: String, opening: Option[chess.OpeningExplorer.Opening], analysis: Option[lila.analyse.Analysis], advantageChart: Option[String], tour: Option[lila.tournament.Tournament], timeChart: lila.analyse.TimeChart, cross: Option[lila.game.Crosstable], replay: Option[chess.Replay])(implicit ctx: Context)
@import pov._
@ -81,6 +81,14 @@ openGraph = povOpenGraph(pov)) {
@analysis.map { a =>
@advantageChart.map { chart =>
<div
@replay.map { replay =>
@chess.Divider(replay) match {
case (mid, end) => {
data-division-mid="@mid.getOrElse("null")"
data-division-end="@end.getOrElse("null")"
}
}
}
id="adv_chart"
data-title="Advantage (up: white, down: black)"
data-max="@lila.analyse.AdvantageChart.max"