Support pulling PGNs from HTTPS.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index e1f36528b802f1c9023e6e81531cd2999ceb8976..5e1e94aa99cdf28cfbe1909b5f84a5d2817ef689 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -121,7 +121,7 @@ my $ev1 = AnyEvent->io(
        }
 );
 if (defined($remoteglotconf::target)) {
-       if ($remoteglotconf::target =~ /^http:/) {
+       if ($remoteglotconf::target =~ /^https?:/) {
                fetch_pgn($remoteglotconf::target);
        } else {
                $t->cmd("observe $remoteglotconf::target");
@@ -220,7 +220,7 @@ sub handle_fics {
                for my $pos ($pos_waiting, $pos_calculating) {
                        next if (!defined($pos));
                        if ($pos->fen() eq $pos_for_movelist->fen()) {
-                               $pos->{'pretty_history'} = \@pretty_movelist;
+                               $pos->{'history'} = \@pretty_movelist;
                        }
                }
                $getting_movelist = 0;
@@ -312,7 +312,7 @@ sub handle_pgn {
                        if ($pgn->result eq '1-0' || $pgn->result eq '1/2-1/2' || $pgn->result eq '0-1') {
                                $pos->{'result'} = $pgn->result;
                        }
-                       $pos->{'pretty_history'} = \@repretty_moves;
+                       $pos->{'history'} = \@repretty_moves;
 
                        extract_clock($pgn, $pos);
 
@@ -526,7 +526,7 @@ sub prettyprint_pv_no_cache {
 sub prettyprint_pv {
        my ($pos, @pvs) = @_;
 
-       my $cachekey = join('', @pvs);
+       my $cachekey = $pos->{'fen'} . join('', @pvs);
        if (exists($pos->{'prettyprint_cache'}{$cachekey})) {
                return @{$pos->{'prettyprint_cache'}{$cachekey}};
        } else {
@@ -536,6 +536,8 @@ sub prettyprint_pv {
        }
 }
 
+my %tbprobe_cache = ();
+
 sub complete_using_tbprobe {
        my ($pos, $info, $mpv) = @_;
 
@@ -553,11 +555,18 @@ sub complete_using_tbprobe {
        # Run through the PV until we are at a 6-man position.
        # TODO: We could in theory only have 5-man data.
        my @pv = @{$info->{'pv' . $mpv}};
-       my $key = join('', @pv);
+       my $key = $pos->fen() . " " . join('', @pv);
        my @moves = ();
-       if (exists($pos->{'tbprobe_cache'}{$key})) {
-               @moves = $pos->{'tbprobe_cache'}{$key};
+       if (exists($tbprobe_cache{$key})) {
+               @moves = @{$tbprobe_cache{$key}};
        } else {
+               if ($mpv ne '') {
+                       # Force doing at least one move of the PV.
+                       my $move = shift @pv;
+                       push @moves, $move;
+                       $pos = $pos->make_move(parse_uci_move($move));
+               }
+
                while ($pos->num_pieces() > 6 && $#pv > -1) {
                        my $move = shift @pv;
                        push @moves, $move;
@@ -579,6 +588,8 @@ sub complete_using_tbprobe {
                        ($pos, $uci_move) = $pos->make_pretty_move($move);
                        push @moves, $uci_move;
                }
+
+               $tbprobe_cache{$key} = \@moves;
        }
 
        $info->{'pv' . $mpv} = \@moves;
@@ -844,9 +855,7 @@ sub output_json {
        $json->{'tbhits'} = $info->{'tbhits'};
        $json->{'seldepth'} = $info->{'seldepth'};
        $json->{'tablebase'} = $info->{'tablebase'};
-
-       $json->{'pv_uci'} = $info->{'pv'};  # Still needs to be there for the JS to calculate arrows; only for the primary PV, though!
-       $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
+       $json->{'pv'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
 
        my %refutation_lines = ();
        my @refutation_lines = ();
@@ -862,12 +871,11 @@ sub output_json {
                                my $pv = $info->{'pv' . $mpv};
                                my $pretty_move = join('', prettyprint_pv($pos_calculating, $pv->[0]));
                                my @pretty_pv = prettyprint_pv($pos_calculating, @$pv);
-                               $refutation_lines{$pv->[0]} = {
-                                       sort_key => $pretty_move,
+                               $refutation_lines{$pretty_move} = {
                                        depth => $info->{'depth' . $mpv},
                                        score => score_digest($info, $pos_calculating, $mpv),
-                                       pretty_move => $pretty_move,
-                                       pv_pretty => \@pretty_pv,
+                                       move => $pretty_move,
+                                       pv => \@pretty_pv,
                                };
                        };
                }
@@ -875,13 +883,13 @@ sub output_json {
        $json->{'refutation_lines'} = \%refutation_lines;
 
        # Piece together historic score information, to the degree we have it.
-       if (!$historic_json_only && exists($pos_calculating->{'pretty_history'})) {
+       if (!$historic_json_only && exists($pos_calculating->{'history'})) {
                my %score_history = ();
 
                my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
                my $pos = Position->start_pos('white', 'black');
                my $halfmove_num = 0;
-               for my $move (@{$pos_calculating->{'pretty_history'}}) {
+               for my $move (@{$pos_calculating->{'history'}}) {
                        my $id = id_for_pos($pos, $halfmove_num);
                        my $ref = $dbh->selectrow_hashref($q, undef, $id);
                        if (defined($ref)) {
@@ -965,7 +973,7 @@ sub output_json {
                $last_written_json = $encoded;
        }
 
-       if (exists($pos_calculating->{'pretty_history'}) &&
+       if (exists($pos_calculating->{'history'}) &&
            defined($remoteglotconf::json_history_dir)) {
                my $id = id_for_pos($pos_calculating);
                my $filename = $remoteglotconf::json_history_dir . "/" . $id . ".json";
@@ -1011,7 +1019,7 @@ sub atomic_set_contents {
 sub id_for_pos {
        my ($pos, $halfmove_num) = @_;
 
-       $halfmove_num //= scalar @{$pos->{'pretty_history'}};
+       $halfmove_num //= scalar @{$pos->{'history'}};
        (my $fen = $pos->fen()) =~ tr,/ ,-_,;
        return "move$halfmove_num-$fen";
 }
@@ -1082,7 +1090,7 @@ sub score_digest {
                        if ($score == 0 && $info->{'tablebase'}) {
                                return ['d', undef];
                        } else {
-                               return ['cp', $score];
+                               return ['cp', int($score)];
                        }
                }
        }
@@ -1268,7 +1276,7 @@ sub find_clock_start {
 
        # 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'})) {
+       if (!exists($pos->{'history'})) {
                return;
        }