my ($pos) = @_;
find_clock_start($pos);
- # if this is already in the queue, ignore it
- return if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen());
+ # if this is already in the queue, ignore it (just update the result)
+ if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen()) {
+ $pos_waiting->{'result'} = $pos->{'result'};
+ return;
+ }
# if we're already chewing on this and there's nothing else in the queue,
# also ignore it
- return if (!defined($pos_waiting) && defined($pos_calculating) &&
- $pos->fen() eq $pos_calculating->fen());
+ if (!defined($pos_waiting) && defined($pos_calculating) &&
+ $pos->fen() eq $pos_calculating->fen()) {
+ $pos_calculating->{'result'} = $pos->{'result'};
+ return;
+ }
# if we're already thinking on something, stop and wait for the engine
# to approve
# Look for extended PGN clock tags.
my $tags = $pgn->tags;
if (exists($tags->{'WhiteClock'}) && exists($tags->{'BlackClock'})) {
- $pos->{'white_clock'} = $tags->{'WhiteClock'};
- $pos->{'black_clock'} = $tags->{'BlackClock'};
-
- $pos->{'white_clock'} =~ s/\b(\d)\b/0$1/g;
- $pos->{'black_clock'} =~ s/\b(\d)\b/0$1/g;
+ $pos->{'white_clock'} = hms_to_sec($tags->{'WhiteClock'});
+ $pos->{'black_clock'} = hms_to_sec($tags->{'BlackClock'});
return;
}
if (exists($comments->{$white_key}) &&
exists($comments->{$black_key}) &&
- $comments->{$white_key} =~ /tl=(\d+:\d+:\d+)/ &&
- $comments->{$black_key} =~ /tl=(\d+:\d+:\d+)/) {
- $comments->{$white_key} =~ /tl=(\d+:\d+:\d+)/;
- $pos->{'white_clock'} = $1;
- $comments->{$black_key} =~ /tl=(\d+:\d+:\d+)/;
- $pos->{'black_clock'} = $1;
+ $comments->{$white_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/ &&
+ $comments->{$black_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/) {
+ $comments->{$white_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/;
+ $pos->{'white_clock'} = hms_to_sec($1);
+ $comments->{$black_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/;
+ $pos->{'black_clock'} = hms_to_sec($1);
return;
}
delete $pos->{'black_clock'};
}
+sub hms_to_sec {
+ my $hms = shift;
+ return undef if (!defined($hms));
+ $hms =~ /(\d+):(\d+):(\d+)/;
+ return $1 * 3600 + $2 * 60 + $3;
+}
+
sub find_clock_start {
my $pos = shift;
}
# TODO(sesse): Maybe we can get the number of moves somehow else for FICS games.
+ # The history is needed for id_for_pos.
if (!exists($pos->{'pretty_history'})) {
return;
}
# No clock information.
return;
}
- $pos->{$key} =~ /(\d+):(\d+):(\d+)/;
- my $time_left = $1 * 3600 + $2 * 60 + $3;
+ my $time_left = $pos->{$key};
$clock_target_for_pos{$id} = time + $time_left;
if ($pos->{'toplay'} eq 'W') {
$pos->{'white_clock_target'} = $clock_target_for_pos{$id};