Print out who's doing the analysis.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index ea1e13de9be03d4b1be1698eb931d2f6d18b10a4..d457e9297eb3cb6c2135092db68cae7d2fd99eb5 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -21,7 +21,7 @@ $SIG{ALRM} = sub { output_screen(); };
 $| = 1;
 
 my $server = "freechess.org";
-my $target = "GMCarlsen";
+my $target = "Sesse";
 # my $engine = "/usr/games/toga2";
 my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 
@@ -41,6 +41,7 @@ select(STDOUT);
 # open the chess engine
 my $pid = IPC::Open2::open2(*UCIREAD, *UCIWRITE, $engine);
 my %uciinfo = ();
+my %uciid = ();
 my %ficsinfo = ();
 
 uciprint("uci");
@@ -48,12 +49,14 @@ uciprint("uci");
 # gobble the options
 while (<UCIREAD>) {
        /uciok/ && last;
+       handle_uci($_);
 }
 
 uciprint("setoption name UCI_AnalyseMode value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");
-uciprint("setoption name NalimovUsage value Normally");
-uciprint("setoption name MultiPV value 3");
+uciprint("setoption name NalimovUsage value Rarely");
+uciprint("setoption name Hash value 1024");
+# uciprint("setoption name MultiPV value 3");
 # uciprint("setoption name Contempt value 1000");
 # uciprint("setoption name Outlook value Ultra Optimistic");
 uciprint("ucinewgame");
@@ -104,15 +107,7 @@ while (1) {
        # any fun on the UCI channel?
        if ($nfound > 0 && vec($rout, fileno(UCIREAD), 1) == 1) {
                my $line = <UCIREAD>;
-               chomp $line;
-               $line =~ tr/\r//d;
-               print UCILOG "<= $line\n";
-               if ($line =~ /^info/) {
-                       my (@infos) = split / /, $line;
-                       shift @infos;
-
-                       parse_infos(@infos);
-               }
+               handle_uci($line);
                $sleep = 0;
 
                # don't update too often
@@ -122,6 +117,26 @@ while (1) {
        sleep $sleep;
 }
 
+sub handle_uci {
+       my ($line) = @_;
+
+       chomp $line;
+       $line =~ tr/\r//d;
+       print UCILOG "<= $line\n";
+       if ($line =~ /^info/) {
+               my (@infos) = split / /, $line;
+               shift @infos;
+
+               parse_infos(@infos);
+       }
+       if ($line =~ /^id/) {
+               my (@ids) = split / /, $line;
+               shift @ids;
+
+               parse_ids(@ids);
+       }
+}
+
 sub parse_infos {
        my (@x) = @_;
        my $mpv = '';
@@ -178,6 +193,22 @@ sub parse_infos {
        }
 }
 
+sub parse_ids {
+       my (@x) = @_;
+
+       while (scalar @x > 0) {
+               if ($x[0] =~ /^(name|author)$/) {
+                       my $key = shift @x;
+                       my $value = join(' ', @x);
+                       $uciid{$key} = $value;
+                       last;
+               }
+
+               # unknown
+               shift @x;
+       }
+}
+
 sub style12_to_fen {
        my $str = shift; 
        my (@x) = split / /, $str;
@@ -253,6 +284,8 @@ sub prettyprint_pv {
        if (scalar @pvs == 0 || !defined($pvs[0])) {
                return ();
        }
+       
+       my @nb = @$board;
 
        my $pv = shift @pvs;
        my $from_col = ord(substr($pv, 0, 1)) - ord('a');
@@ -263,10 +296,12 @@ sub prettyprint_pv {
        my $pretty;
        my $piece = substr($board->[$from_row], $from_col, 1);
 
+       if ($piece eq '-') {
+               die "Invalid move";
+       }
+
        # white short castling
        if ($pv eq 'e1g1' && $piece eq 'K') {
-               my @nb = @$board;
-
                # king
                substr($nb[7], 4, 1, '-');
                substr($nb[7], 6, 1, $piece);
@@ -280,8 +315,6 @@ sub prettyprint_pv {
 
        # white long castling
        if ($pv eq 'e1c1' && $piece eq 'K') {
-               my @nb = @$board;
-
                # king
                substr($nb[7], 4, 1, '-');
                substr($nb[7], 2, 1, $piece);
@@ -295,30 +328,26 @@ sub prettyprint_pv {
 
        # black short castling
        if ($pv eq 'e8g8' && $piece eq 'k') {
-               my @nb = @$board;
-
                # king
                substr($nb[0], 4, 1, '-');
                substr($nb[0], 6, 1, $piece);
                
                # rook
                substr($nb[0], 7, 1, '-');
-               substr($nb[0], 5, 1, 'R');
+               substr($nb[0], 5, 1, 'r');
                                
                return ('0-0', prettyprint_pv(\@nb, @pvs));
        }
 
        # black long castling
        if ($pv eq 'e8c8' && $piece eq 'k') {
-               my @nb = @$board;
-
                # king
                substr($nb[0], 4, 1, '-');
                substr($nb[0], 2, 1, $piece);
                
                # rook
                substr($nb[0], 0, 1, '-');
-               substr($nb[0], 3, 1, 'R');
+               substr($nb[0], 3, 1, 'r');
                                
                return ('0-0-0', prettyprint_pv(\@nb, @pvs));
        }
@@ -326,8 +355,17 @@ sub prettyprint_pv {
        # check if the from-piece is a pawn
        if (lc($piece) eq 'p') {
                # attack?
-               if (substr($board->[$to_row], $to_col, 1) ne '-') {
+               if ($from_col != $to_col) {
                        $pretty = substr($pv, 0, 1) . 'x' . substr($pv, 2, 2);
+
+                       # en passant?
+                       if (substr($board->[$to_row], $to_col, 1) eq '-') {
+                               if ($piece eq 'p') {
+                                       substr($nb[$to_row + 1], $to_col, 1, '-');
+                               } else {
+                                       substr($nb[$to_row - 1], $to_col, 1, '-');
+                               }
+                       }
                } else {
                        $pretty = substr($pv, 2, 2);
 
@@ -389,7 +427,6 @@ sub prettyprint_pv {
        }
 
        # update the board
-       my @nb = @$board;
        substr($nb[$from_row], $from_col, 1, '-');
        substr($nb[$to_row], $to_col, 1, $piece);
 
@@ -405,7 +442,33 @@ sub prettyprint_pv {
 sub output_screen {
        #return;
 
-       print  "\ecAnalysis:\n";
+       #
+       # Check the PVs first. if they're invalid, just wait, as our data
+       # is most likely out of sync. This isn't a very good solution, as
+       # it can frequently miss stuff, but it's good enough for most users.
+       #
+       eval {
+               my $dummy;
+               if (exists($uciinfo{'pv'})) {
+                       $dummy = prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}});
+               }
+       
+               my $mpv = 1;
+               while (exists($uciinfo{'pv' . $mpv})) {
+                       $dummy = prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}});
+                       ++$mpv;
+               }
+       };
+       if ($@) {
+               return;
+       }
+
+       print "\e[H\e[2J"; # clear the screen
+       if (exists($uciid{'name'})) {
+               print "Analysis by $uciid{'name'}:\n\n";
+       } else {
+               print "Analysis:\n\n";
+       }
 
        return unless (exists($ficsinfo{'board'}));
 
@@ -440,7 +503,15 @@ sub output_screen {
        } else {
                # single-PV
                if (defined($uciinfo{'score_mate'})) {
-                       printf "  Mate in %d\n", $uciinfo{'score_mate'};
+                       my $mate = $uciinfo{'score_mate'};
+                       if ($ficsinfo{'toplay'} eq 'B') {
+                               $mate = -$mate;
+                       }
+                       if ($mate > 0) {
+                               printf "  White mates in %u\n", $mate;
+                       } else {
+                               printf "  Black mates in %u\n", -$mate;
+                       }
                } else {
                        if (exists($uciinfo{'score_cp'})) {
                                my $score = $uciinfo{'score_cp'} * 0.01;
@@ -533,7 +604,7 @@ sub in_check {
        for my $row (0..7) {
                for my $col (0..7) {
                        my $piece = substr($board->[$row], $col, 1);
-                       next if ($piece eq '-' || lc($piece) eq 'k');
+                       next if ($piece eq '-');
                
                        if (uc($piece) eq $piece) {
                                # white piece