unified openings working

joeyksclark · Feb 25, 2016 · 08e0b84 · 08e0b84
1 parent 30316b4
commit 08e0b84
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 86 deletions.
diff --git a/app/controllers/Export.scala b/app/controllers/Export.scala
@@ -23,7 +23,7 @@ object Export extends LilaController {
  initialFen <- GameRepo initialFen game
  pgn = Env.api.pgnDump(game, initialFen)
  analysis ← (~get("as") != "raw") ?? (Env.analyse.analyser getDone game.id)
- } yield Env.analyse.annotator(pgn, analysis, gameOpening(game), game.winnerColor, game.status, game.clock).toString
+ } yield Env.analyse.annotator(pgn, analysis, game.opening, game.winnerColor, game.status, game.clock).toString
  }) map { content =>
  Ok(content).withHeaders(
  CONTENT_TYPE -> ContentTypes.TEXT,
@@ -71,8 +71,4 @@ object Export extends LilaController {
  if (HTTPRequest isFacebookBot ctx.req) result
  else if (HTTPRequest isBot ctx.req) fuccess(NotFound)
  else result
-
- private def gameOpening(game: GameModel) =
- if (game.fromPosition || game.variant.exotic) none
- else chess.OpeningExplorer openingOf game.pgnMoves
 }
diff --git a/app/views/analyse/replay.scala.html b/app/views/analyse/replay.scala.html
@@ -2,7 +2,7 @@
 
 @import pov._
 
-@title = @{ s"${playerText(pov.player)} vs ${playerText(pov.opponent)} in $gameId : ${game.opening.fold(trans.analysis.str())(_.fullName)}" }
+@title = @{ s"${playerText(pov.player)} vs ${playerText(pov.opponent)} in $gameId : ${game.opening.fold(trans.analysis.str())(_.opening.ecoName)}" }
 
 @moreCss = {
 @cssTag("analyse.css")

diff --git a/app/views/analyse/replayBot.scala.html b/app/views/analyse/replayBot.scala.html
@@ -2,7 +2,7 @@
 
 @import pov._
 
-@title = @{ s"${playerText(pov.player)} vs ${playerText(pov.opponent)} in $gameId : ${game.opening.fold(trans.analysis.str())(_.fullName)}" }
+@title = @{ s"${playerText(pov.player)} vs ${playerText(pov.opponent)} in $gameId : ${game.opening.fold(trans.analysis.str())(_.opening.ecoName)}" }
 
 @moreJs = {
 @embedJs {
@@ -57,7 +57,7 @@
  <div class="lichess_ground for_bot">
  <h1>@titleGame(pov.game)</h1>
  <p>@describePov(pov)</p>
- <p>@pov.game.opening.map(_.fullName)</p>
+ <p>@pov.game.opening.map(_.opening.ecoName)</p>
  </div>
  </div>
  </div>

diff --git a/app/views/game/widgets.scala.html b/app/views/game/widgets.scala.html
@@ -86,7 +86,7 @@
  @defining(g openingPgnMoves 20) { pgnMoves =>
  @if(!g.fromPosition) {
  @g.opening.map { opening =>
- <div class="opening">@opening.name</div>
+ <div class="opening">@opening.opening.ecoName</div>
  }
  }
  <div class="pgn">@pgnMoves.take(6).grouped(2).zipWithIndex.map {

diff --git a/app/views/opening/JsData.scala b/app/views/opening/JsData.scala
@@ -12,7 +12,7 @@ object JsData extends lila.Steroids {
 
  def apply(
  opening: Opening,
- identified: List[Identified],
+ identified: List[String],
  userInfos: Option[lila.opening.UserInfos],
  play: Boolean,
  attempt: Option[Attempt],
@@ -35,11 +35,7 @@ object JsData extends lila.Steroids {
  "quality" -> quality.name)
  }),
  "url" -> s"$netBaseUrl${routes.Opening.show(opening.id)}",
- "identified" -> identified.map { ident =>
- Json.obj(
- "name" -> ident.name,
- "moves" -> ident.moves)
- }
+ "identified" -> identified
  ),
  "pref" -> Json.obj(
  "coords" -> ctx.pref.coords

diff --git a/app/views/opening/show.scala.html b/app/views/opening/show.scala.html
@@ -1,4 +1,4 @@
-@(opening: lila.opening.Opening, identified: List[lila.opening.Identified], userInfos: Option[lila.opening.UserInfos], animationDuration: scala.concurrent.duration.Duration)(implicit ctx: Context)
+@(opening: lila.opening.Opening, identified: List[String], userInfos: Option[lila.opening.UserInfos], animationDuration: scala.concurrent.duration.Duration)(implicit ctx: Context)
 
 @evenMoreJs = {
 @helper.javascriptRouter("openingRoutes")(

diff --git a/bin/mongodb/wesley02.js b/bin/mongodb/wesley02.js
@@ -0,0 +1,25 @@
+db.tournament2.insert({
+ "_id": "wesley02",
+ "clock": {
+ "limit": NumberInt(3 * 60),
+ "increment": NumberInt(0)
+ },
+ "createdAt": new Date(),
+ "createdBy": "lichess",
+ "minutes": NumberInt(60),
+ "name": "GM Wesley So Arena",
+ "nbPlayers": NumberInt(0),
+ "startsAt": ISODate("2016-03-02T22:00:00Z"),
+ "schedule": {
+ "freq": "unique",
+ "speed": "blitz"
+ },
+ "status": NumberInt(10),
+ "variant": NumberInt(1),
+ "spotlight": {
+ "homepageHours": 24,
+ "headline": "Tournament by Chess at Three",
+ "description": "Your chance to play Super GM Wesley So! Tournament organized and [livestreamed](www.twitch.tv/chessat3) by [chessat3.com](http:https://chessat3.com).",
+ "iconImg": "chessat3.logo.png"
+ }
+});
diff --git a/modules/analyse/src/main/Annotator.scala b/modules/analyse/src/main/Annotator.scala
@@ -1,15 +1,15 @@
 package lila.analyse
 
 import chess.format.pgn.{ Pgn, Tag, Turn, Move }
-import chess.Opening
+import chess.opening._
 import chess.{ Status, Color, Clock }
 
 private[analyse] final class Annotator(netDomain: String) {
 
  def apply(
  p: Pgn,
  analysis: Option[Analysis],
- opening: Option[Opening],
+ opening: Option[FullOpening.AtPly],
  winner: Option[Color],
  status: Status,
  clock: Option[Clock]): Pgn =
@@ -44,8 +44,8 @@ private[analyse] final class Annotator(netDomain: String) {
  case None => p
  }
 
- private def annotateOpening(opening: Option[Opening])(p: Pgn) = opening.fold(p) { o =>
- p.updatePly(o.size, _.copy(opening = o.name.some))
+ private def annotateOpening(opening: Option[FullOpening.AtPly])(p: Pgn) = opening.fold(p) { o =>
+ p.updatePly(o.ply, _.copy(opening = o.opening.ecoName.some))
  }
 
  private def annotateTurns(p: Pgn, advices: List[Advice]): Pgn =

diff --git a/modules/api/src/main/GameApi.scala b/modules/api/src/main/GameApi.scala
@@ -24,6 +24,8 @@ private[api] final class GameApi(
  pgnDump: PgnDump,
  analysisApi: AnalysisApi) {
 
+ import lila.round.JsonView.openingWriter
+
  def byUser(
  user: User,
  rated: Option[Boolean],
@@ -166,11 +168,7 @@ private[api] final class GameApi(
  }),
  "analysis" -> analysisOption.ifTrue(withAnalysis).|@|(pgnOption).apply(analysisApi.game),
  "moves" -> withMoves.option(g.pgnMoves mkString " "),
- "opening" -> withOpening.?? {
- g.opening map { opening =>
- Json.obj("code" -> opening.code, "name" -> opening.name)
- }
- },
+ "opening" -> withOpening.??(g.opening),
  "fens" -> withFens ?? {
  chess.Replay.boards(g.pgnMoves, initialFen, g.variant).toOption map { boards =>
  JsArray(boards map chess.format.Forsyth.exportBoard map JsString.apply)

diff --git a/modules/api/src/main/UserGameApi.scala b/modules/api/src/main/UserGameApi.scala
@@ -47,9 +47,7 @@ final class UserGameApi(bookmarkApi: lila.bookmark.BookmarkApi) {
  }),
  "fen" -> Forsyth.exportBoard(g.toChess.board),
  "lastMove" -> g.castleLastMoveTime.lastMoveString,
- "opening" -> g.opening.map { o =>
- Json.obj("code" -> o.code, "name" -> o.name)
- },
+ "opening" -> g.opening,
  "winner" -> g.winnerColor.map(_.name),
  "bookmarks" -> g.bookmarks,
  "bookmarked" -> bookmarked.option(true)

diff --git a/modules/chess b/modules/chess
diff --git a/modules/game/src/main/Game.scala b/modules/game/src/main/Game.scala
@@ -465,7 +465,7 @@ case class Game(
 
  def resetTurns = copy(turns = 0, startedAtTurn = 0)
 
- lazy val opening: Option[FullOpening] =
+ lazy val opening: Option[FullOpening.AtPly] =
  if (fromPosition || !Game.openingSensiblevariants(variant)) none
  else FullOpeningDB search pgnMoves
 

diff --git a/modules/game/src/main/PgnDump.scala b/modules/game/src/main/PgnDump.scala
@@ -72,8 +72,8 @@ final class PgnDump(
  Tag("PlyCount", game.turns),
  Tag(_.Variant, game.variant.name.capitalize),
  Tag(_.TimeControl, game.clock.fold("-") { c => s"${c.limit}+${c.increment}" }),
- Tag(_.ECO, game.opening.fold("?")(_.eco)),
- Tag(_.Opening, game.opening.fold("?")(_.name)),
+ Tag(_.ECO, game.opening.fold("?")(_.opening.eco)),
+ Tag(_.Opening, game.opening.fold("?")(_.opening.name)),
  Tag(_.Termination, {
  import chess.Status._
  game.status match {

diff --git a/modules/gameSearch/src/main/GameSearchApi.scala b/modules/gameSearch/src/main/GameSearchApi.scala
@@ -49,7 +49,7 @@ final class GameSearchApi(client: ESClient) extends SearchReadApi[Game, Query] {
  Fields.ai -> game.aiLevel,
  Fields.date -> (lila.search.Date.formatter print game.updatedAtOrCreatedAt),
  Fields.duration -> game.estimateTotalTime,
- Fields.opening -> (game.opening map (_.code.toLowerCase)),
+ Fields.opening -> (game.opening map (_.opening.eco.toLowerCase)),
  Fields.analysed -> analysed,
  Fields.whiteUser -> game.whitePlayer.userId,
  Fields.blackUser -> game.blackPlayer.userId,

diff --git a/modules/gameSearch/src/main/Query.scala b/modules/gameSearch/src/main/Query.scala
@@ -1,6 +1,7 @@
 package lila.gameSearch
 
-import chess.{ Mode, Status, Openings }
+import chess.{ Mode, Status }
+import chess.opening._
 import org.joda.time.DateTime
 
 import lila.rating.RatingRange
@@ -76,8 +77,8 @@ object Query {
 
  val modes = Mode.all map { mode => mode.id -> mode.name.capitalize }
 
- val openings = Openings.generals map {
- case (code, name) => code -> s"$code ${name.take(50)}"
+ val openings = EcopeningDB.all map { o =>
+ o.eco -> s"${o.eco} ${o.name.take(50)}"
  }
 
  val turns = options(

diff --git a/modules/opening/src/main/Identified.scala b/modules/opening/src/main/Identified.scala
diff --git a/modules/opening/src/main/OpeningApi.scala b/modules/opening/src/main/OpeningApi.scala
@@ -71,11 +71,11 @@ private[opening] final class OpeningApi(
  }
 
  object identify {
- def apply(fen: String, max: Int): Fu[List[Identified]] = nameColl.find(
+ def apply(fen: String, max: Int): Fu[List[String]] = nameColl.find(
  BSONDocument("_id" -> fen),
  BSONDocument("_id" -> false)
- ).one[BSONDocument] map { opt =>
- Identified.many(~(opt ?? (_.getAs[List[String]]("names"))), max)
- }
+ ).one[BSONDocument] map { obj =>
+  ~obj.??(_.getAs[List[String]]("names"))
+  }
  }
 }
diff --git a/modules/round/src/main/JsonView.scala b/modules/round/src/main/JsonView.scala
@@ -359,11 +359,11 @@ object JsonView {
  "emerg" -> c.emerg)
  }
 
- implicit val openingWriter: OWrites[chess.Opening] = OWrites { o =>
+ implicit val openingWriter: OWrites[chess.opening.FullOpening.AtPly] = OWrites { o =>
  Json.obj(
- "code" -> o.code,
- "name" -> o.name,
- "size" -> o.size
+ "eco" -> o.opening.eco,
+ "name" -> o.opening.name,
+ "ply" -> o.ply
  )
  }
 }
diff --git a/public/stylesheets/opening.css b/public/stylesheets/opening.css
@@ -25,7 +25,7 @@
  font-size: 1.3em;
  font-weight: bold;
 }
-#opening table.identified td {
+#opening .identified li {
  padding-right: 2em;
 }
 #opening .meter {

diff --git a/public/stylesheets/transp.css b/public/stylesheets/transp.css
@@ -133,7 +133,6 @@ body.transp #video_side,
 body.transp #video_side a,
 body.transp .side div.user_lists,
 body.transp .side div.user_lists a,
-body.transp #opening .identified,
 body.transp #puzzle .right .retry,
 body.transp #trainer .explanation,
 body.transp .tournament_home_side,

diff --git a/ui/analyse/src/view.js b/ui/analyse/src/view.js
@@ -155,13 +155,14 @@ function renderVariationTurn(ctrl, turn, path) {
 }
 
 function renderOpening(ctrl, opening) {
- return m('div.comment.opening', opening.code + ': ' + opening.name);
+ console.log(ctrl.data, opening);
+ return m('div.comment.opening', opening.eco + ' ' + opening.name);
 }
 
 function renderMeta(ctrl, move, path) {
  if (!ctrl.vm.comments) return;
  var opening = ctrl.data.game.opening;
- opening = (move && opening && opening.size === move.ply) ? renderOpening(ctrl, opening) : null;
+ opening = (move && opening && opening.ply === move.ply) ? renderOpening(ctrl, opening) : null;
  if (!move || (!opening && empty(move.comments) && empty(move.variations))) return;
  var children = [];
  if (opening) children.push(opening);

diff --git a/ui/opening/src/view.js b/ui/opening/src/view.js
@@ -274,11 +274,8 @@ module.exports = function(ctrl) {
  m('div.underboard',
  m('div.center', [
  progress(ctrl),
- m('table.identified', ctrl.data.opening.identified.map(function(ident) {
- return m('tr', [
- m('td', ident.name),
- m('td', ident.moves)
- ]);
+ m('ul.identified', ctrl.data.opening.identified.map(function(name) {
+ return m('li', name);
  })), (ctrl.data.user && ctrl.data.user.history) ? renderHistory(ctrl) : null,
  ctrl.data.play ? null : renderContinueLinks(ctrl)
  ])