Do not stop polling PGNs if they are invalid.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index 4e6edc68308f3524b252c765d61394126107f6cc..d82c20bed25034896c341b979aa9a5b36bb0fac9 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -28,9 +28,10 @@ use warnings;
 no warnings qw(once);
 
 # Program starts here
-$SIG{ALRM} = sub { output(); };
 my $latest_update = undef;
+my $output_timer = undef;
 my $http_timer = undef;
+my $stop_pgn_fetch = 0;
 my $tb_retry_timer = undef;
 my %tb_cache = ();
 my $tb_lookup_running = 0;
@@ -199,7 +200,6 @@ sub handle_fics {
                };
                if ($@) {
                        warn "Error when getting FICS move history: $@";
-                       exit;
                        $getting_movelist = 0;
                }
        }
@@ -232,6 +232,7 @@ sub handle_fics {
                        fetch_pgn($url);
                } elsif ($msg =~ /^stoppgn$/) {
                        $t->cmd("tell $who Stopping poll.");
+                       $stop_pgn_fetch = 1;
                        $http_timer = undef;
                } elsif ($msg =~ /^quit$/) {
                        $t->cmd("tell $who Bye bye.");
@@ -257,40 +258,53 @@ my $pgn_hysteresis_counter = 0;
 
 sub handle_pgn {
        my ($body, $header, $url) = @_;
+
+       if ($stop_pgn_fetch) {
+               $stop_pgn_fetch = 0;
+               $http_timer = undef;
+               return;
+       }
+
        my $pgn = Chess::PGN::Parse->new(undef, $body);
        if (!defined($pgn) || !$pgn->read_game()) {
                warn "Error in parsing PGN from $url\n";
        } else {
-               $pgn->quick_parse_game;
-               my $pos = Position->start_pos($pgn->white, $pgn->black);
-               my $moves = $pgn->moves;
-               my @uci_moves = ();
-               for my $move (@$moves) {
-                       my ($pos, $uci_move) = $pos->make_pretty_move($move);
-                       push @uci_moves, $uci_move;
-               }
-               $pos->{'history'} = \@uci_moves;
-               $pos->{'pretty_history'} = $moves;
-
-               # Sometimes, PGNs lose a move or two for a short while,
-               # or people push out new ones non-atomically. 
-               # Thus, if we PGN doesn't change names but becomes
-               # shorter, we mistrust it for a few seconds.
-               my $trust_pgn = 1;
-               if (defined($last_pgn_white) && defined($last_pgn_black) &&
-                   $last_pgn_white eq $pgn->white &&
-                   $last_pgn_black eq $pgn->black &&
-                   scalar(@uci_moves) < scalar(@last_pgn_uci_moves)) {
-                       if (++$pgn_hysteresis_counter < 3) {
-                               $trust_pgn = 0; 
+               eval {
+                       $pgn->quick_parse_game;
+                       my $pos = Position->start_pos($pgn->white, $pgn->black);
+                       my $moves = $pgn->moves;
+                       my @uci_moves = ();
+                       for my $move (@$moves) {
+                               my $uci_move;
+                               ($pos, $uci_move) = $pos->make_pretty_move($move);
+                               push @uci_moves, $uci_move;
                        }
-               }
-               if ($trust_pgn) {
-                       $last_pgn_white = $pgn->white;
-                       $last_pgn_black = $pgn->black;
-                       @last_pgn_uci_moves = @uci_moves;
-                       $pgn_hysteresis_counter = 0;
-                       handle_position($pos);
+                       $pos->{'history'} = \@uci_moves;
+                       $pos->{'pretty_history'} = $moves;
+
+                       # Sometimes, PGNs lose a move or two for a short while,
+                       # or people push out new ones non-atomically. 
+                       # Thus, if we PGN doesn't change names but becomes
+                       # shorter, we mistrust it for a few seconds.
+                       my $trust_pgn = 1;
+                       if (defined($last_pgn_white) && defined($last_pgn_black) &&
+                           $last_pgn_white eq $pgn->white &&
+                           $last_pgn_black eq $pgn->black &&
+                           scalar(@uci_moves) < scalar(@last_pgn_uci_moves)) {
+                               if (++$pgn_hysteresis_counter < 3) {
+                                       $trust_pgn = 0; 
+                               }
+                       }
+                       if ($trust_pgn) {
+                               $last_pgn_white = $pgn->white;
+                               $last_pgn_black = $pgn->black;
+                               @last_pgn_uci_moves = @uci_moves;
+                               $pgn_hysteresis_counter = 0;
+                               handle_position($pos);
+                       }
+               };
+               if ($@) {
+                       warn "Error in parsing moves from $url\n";
                }
        }
        
@@ -477,7 +491,8 @@ sub output {
        # Don't update too often.
        my $age = Time::HiRes::tv_interval($latest_update);
        if ($age < $remoteglotconf::update_max_interval) {
-               Time::HiRes::alarm($remoteglotconf::update_max_interval + 0.01 - $age);
+               my $wait = $remoteglotconf::update_max_interval + 0.01 - $age;
+               $output_timer = AnyEvent->timer(after => $wait, cb => \&output);
                return;
        }
        
@@ -501,7 +516,7 @@ sub output {
 
                my $t = $tb_cache{$fen};
                my $pv = $t->{'pv'};
-               my $matelen = int((1 + scalar @$pv) / 2);
+               my $matelen = int((1 + $t->{'score'}) / 2);
                if ($t->{'result'} eq '1/2-1/2') {
                        $info->{'score_cp'} = 0;
                } elsif ($t->{'result'} eq '1-0') {
@@ -930,12 +945,14 @@ sub handle_tb_lookup_return {
                                my $moves = $pgn->moves;
                                my @uci_moves = ();
                                for my $move (@$moves) {
-                                       my ($pvpos, $uci_move) = $pvpos->make_pretty_move($move);
+                                       my $uci_move;
+                                       ($pvpos, $uci_move) = $pvpos->make_pretty_move($move);
                                        push @uci_moves, $uci_move;
                                }
                                $tb_cache{$fen} = {
                                        result => $pgn->result,
-                                       pv => \@uci_moves
+                                       pv => \@uci_moves,
+                                       score => $response->{'Response'}{'Score'},
                                };
                                output();
                        }