Support displaying historic analysis. Not perfect still, though.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index 9b1635c3ebc8955642fb68bff08abf46921dd3a1..62d3aa1dbc84496be887850af91569bc82f9107e 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -210,7 +210,6 @@ sub handle_fics {
                        next if (!defined($pos));
                        if ($pos->fen() eq $pos_for_movelist->fen()) {
                                $pos->{'history'} = \@uci_movelist;
-                               $pos->{'pretty_history'} = \@pretty_movelist;
                        }
                }
                $getting_movelist = 0;
@@ -280,7 +279,6 @@ sub handle_pgn {
                                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. 
@@ -713,7 +711,6 @@ sub output_json {
 
        # single-PV only for now
        $json->{'pv_uci'} = $info->{'pv'};
-       $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
 
        my %refutation_lines = ();
        my @refutation_lines = ();
@@ -734,7 +731,6 @@ sub output_json {
                                        score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
                                        pretty_score => short_score($info, $pos_calculating, $mpv),
                                        pretty_move => $pretty_move,
-                                       pv_pretty => \@pretty_pv,
                                };
                                $refutation_lines{$pv->[0]}->{'pv_uci'} = $pv;
                        };
@@ -751,8 +747,19 @@ sub output_json {
                (my $fen = $pos_calculating->fen()) =~ tr,/ ,-_,;
                my $filename = $remoteglotconf::json_history_dir . "/move$halfmove_num-$fen.json";
 
-               # TODO: Avoid overwriting earlier analysis if it's better.
-               atomic_set_contents($filename, $encoded);
+               # Overwrite old analysis (assuming it exists at all) if we're
+               # using a different engine, or if we've calculated deeper.
+               # nodes is used as a tiebreaker. Don't bother about Multi-PV
+               # data; it's not that important.
+               my ($old_engine, $old_depth, $old_nodes) = get_json_analysis_stats($filename);
+               my $new_depth = $json->{'depth'} // 0;
+               my $new_nodes = $json->{'nodes'} // 0;
+               if (!defined($old_engine) ||
+                   $old_engine ne $json->{'id'}{'name'} ||
+                   $new_depth > $old_depth ||
+                   ($new_depth == $old_depth && $new_nodes >= $old_nodes)) {
+                       atomic_set_contents($filename, $encoded);
+               }
        }
 }
 
@@ -766,6 +773,28 @@ sub atomic_set_contents {
        rename($filename . ".tmp", $filename);
 }
 
+sub get_json_analysis_stats {
+       my $filename = shift;
+
+       my ($engine, $depth, $nodes);
+
+       open my $fh, "<", $filename
+               or return undef;
+       local $/ = undef;
+       eval {
+               my $json = JSON::XS::decode_json(<$fh>);
+               $engine = $json->{'id'}{'name'} // die;
+               $depth = $json->{'depth'} // 0;
+               $nodes = $json->{'nodes'} // 0;
+       };
+       close $fh;
+       if ($@) {
+               warn "Error in decoding $filename: $@";
+               return undef;
+       }
+       return ($engine, $depth, $nodes);
+}
+
 sub uciprint {
        my ($engine, $msg) = @_;
        $engine->print($msg);