From: Steinar H. Gunderson Date: Sat, 15 Nov 2014 01:57:04 +0000 (+0100) Subject: Add support for fetching move history from FICS (entirely from scratch every time... X-Git-Url: https://git.sesse.net/?p=remoteglot;a=commitdiff_plain;h=25b4c5b0537cb335c09c7b1bf4e765c5aa6cf412 Add support for fetching move history from FICS (entirely from scratch every time, though). --- diff --git a/Position.pm b/Position.pm index 90e7c1c..b847d10 100644 --- a/Position.pm +++ b/Position.pm @@ -195,6 +195,16 @@ sub make_move { return bless $np; } +# Returns a new Position object, and the parsed UCI move. +sub make_pretty_move { + my ($pos, $move) = @_; + + my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move); + my $uci_move = Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo); + $pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo); + return ($pos, $uci_move); +} + sub _pos_to_square { my ($row, $col) = @_; return sprintf("%c%d", ord('a') + $col, 8 - $row); diff --git a/remoteglot.pl b/remoteglot.pl index 5982eca..4e6edc6 100755 --- a/remoteglot.pl +++ b/remoteglot.pl @@ -160,10 +160,60 @@ sub handle_uci { output(); } +my $getting_movelist = 0; +my $pos_for_movelist = undef; +my @uci_movelist = (); +my @pretty_movelist = (); + sub handle_fics { my $line = shift; if ($line =~ /^<12> /) { handle_position(Position->new($line)); + $t->cmd("moves"); + } + if ($line =~ /^Movelist for game /) { + my $pos = $pos_waiting // $pos_calculating; + if (defined($pos)) { + @uci_movelist = (); + @pretty_movelist = (); + $pos_for_movelist = Position->start_pos($pos->{'player_w'}, $pos->{'player_b'}); + $getting_movelist = 1; + } + } + if ($getting_movelist && + $line =~ /^\s* \d+\. \s+ # move number + (\S+) \s+ \( [\d:.]+ \) \s* # first move, then time + (?: (\S+) \s+ \( [\d:.]+ \) )? # second move, then time + /x) { + eval { + my $uci_move; + ($pos_for_movelist, $uci_move) = $pos_for_movelist->make_pretty_move($1); + push @uci_movelist, $uci_move; + push @pretty_movelist, $1; + + if (defined($2)) { + ($pos_for_movelist, $uci_move) = $pos_for_movelist->make_pretty_move($2); + push @uci_movelist, $uci_move; + push @pretty_movelist, $2; + } + }; + if ($@) { + warn "Error when getting FICS move history: $@"; + exit; + $getting_movelist = 0; + } + } + if ($getting_movelist && + $line =~ /^\s+ \{.*\} \s+ (?: \* | 1\/2-1\/2 | 0-1 | 1-0 )/x) { + # End of movelist. + for my $pos ($pos_waiting, $pos_calculating) { + next if (!defined($pos)); + if ($pos->fen() eq $pos_for_movelist->fen()) { + $pos->{'history'} = \@uci_movelist; + $pos->{'pretty_history'} = \@pretty_movelist; + } + } + $getting_movelist = 0; } if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) { my ($who, $msg) = ($1, $2); @@ -216,9 +266,8 @@ sub handle_pgn { my $moves = $pgn->moves; my @uci_moves = (); for my $move (@$moves) { - my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move); - push @uci_moves, Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo); - $pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo); + my ($pos, $uci_move) = $pos->make_pretty_move($move); + push @uci_moves, $uci_move; } $pos->{'history'} = \@uci_moves; $pos->{'pretty_history'} = $moves; @@ -881,9 +930,8 @@ sub handle_tb_lookup_return { my $moves = $pgn->moves; my @uci_moves = (); for my $move (@$moves) { - my ($from_row, $from_col, $to_row, $to_col, $promo) = $pvpos->parse_pretty_move($move); - push @uci_moves, Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo); - $pvpos = $pvpos->make_move($from_row, $from_col, $to_row, $to_col, $promo); + my ($pvpos, $uci_move) = $pvpos->make_pretty_move($move); + push @uci_moves, $uci_move; } $tb_cache{$fen} = { result => $pgn->result,