mirror of
https://github.com/TheRealOwenRees/chess-endgame-trainer.git
synced 2026-09-19 11:03:52 +00:00
normalise FENs - trim and fuill move to 1 on addition
This commit is contained in:
@@ -30,7 +30,7 @@ defmodule Chesstrainer.Endgames.Endgame do
|
||||
@doc false
|
||||
def changeset(endgame, attrs) do
|
||||
endgame
|
||||
|> cast(attrs, [:fen, :key, :message, :notes, :result, :rating, :color])
|
||||
|> cast(normalize_attrs(attrs), [:fen, :key, :message, :notes, :result, :rating, :color])
|
||||
|> validate_required([:fen, :color], message: "Invalid FEN")
|
||||
|> validate_required([:key, :result, :rating])
|
||||
|> validate_format(:key, ~r/^(?=.{5,10}$)KQ*R*[NB]*P*\sv\sKQ*R*[NB]*P*$/,
|
||||
@@ -45,6 +45,14 @@ defmodule Chesstrainer.Endgames.Endgame do
|
||||
|> unique_constraint(:fen, message: "FEN already exists")
|
||||
end
|
||||
|
||||
defp normalize_attrs(%{"fen" => fen} = attrs) when is_binary(fen),
|
||||
do: Map.put(attrs, "fen", Chesstrainer.FEN.normalize(fen))
|
||||
|
||||
defp normalize_attrs(%{fen: fen} = attrs) when is_binary(fen),
|
||||
do: Map.put(attrs, :fen, Chesstrainer.FEN.normalize(fen))
|
||||
|
||||
defp normalize_attrs(attrs), do: attrs
|
||||
|
||||
# Strict structural validation. Mirrors chess.js rules so the FEN survives
|
||||
# both the server-side parser (Chex, permissive) and the client-side parser
|
||||
# (chess.js, strict).
|
||||
|
||||
@@ -7,6 +7,39 @@ defmodule Chesstrainer.FEN do
|
||||
|> color_initial_to_color_atom()
|
||||
end
|
||||
|
||||
@doc """
|
||||
Normalizes a FEN string for storage.
|
||||
|
||||
Trims surrounding whitespace and rewrites a fullmove number of `"0"` to
|
||||
`"1"`. The fullmove rewrite is a chess.js-compatibility fix — chess.js
|
||||
rejects fullmove `0` as invalid even though many board editors default
|
||||
to it. Other FEN fields are left untouched; structural errors are
|
||||
surfaced by the Endgame changeset, not silently masked here.
|
||||
|
||||
## Examples
|
||||
|
||||
iex> Chesstrainer.FEN.normalize(" 8/8/3k4/8/8/3K1R2/8/8 w - - 0 0\\n ")
|
||||
"8/8/3k4/8/8/3K1R2/8/8 w - - 0 1"
|
||||
|
||||
iex> Chesstrainer.FEN.normalize("8/8/3k4/8/8/3K1R2/8/8 w - - 0 5")
|
||||
"8/8/3k4/8/8/3K1R2/8/8 w - - 0 5"
|
||||
|
||||
iex> Chesstrainer.FEN.normalize("not a fen")
|
||||
"not a fen"
|
||||
"""
|
||||
@spec normalize(String.t()) :: String.t()
|
||||
def normalize(fen) when is_binary(fen) do
|
||||
trimmed = String.trim(fen)
|
||||
|
||||
case String.split(trimmed, " ") do
|
||||
[board, active, castling, en_passant, halfmove, "0"] ->
|
||||
Enum.join([board, active, castling, en_passant, halfmove, "1"], " ")
|
||||
|
||||
_ ->
|
||||
trimmed
|
||||
end
|
||||
end
|
||||
|
||||
defp color_initial_to_color_atom("b"), do: :black
|
||||
defp color_initial_to_color_atom("w"), do: :white
|
||||
defp color_initial_to_color_atom(_), do: nil
|
||||
|
||||
Reference in New Issue
Block a user