X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=ca5263c82be0688f620ca8797e8dc526de913d0e;hp=9502a715427cae9738f9081ce31559e5f9cebd47;hb=92c3ae694d679a17fe546179c06b54ac8578eb9a;hpb=65d6dd1d5f4d8bf2ddd868339d22d40821b8983c

diff --git a/remoteglot.pl b/remoteglot.pl
index 9502a71..ca5263c 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -15,12 +15,11 @@ use AnyEvent::HTTP;
 use Chess::PGN::Parse;
 use EV;
 use Net::Telnet;
-use FileHandle;
+use File::Slurp;
 use IPC::Open2;
 use Time::HiRes;
 use JSON::XS;
 use URI::Escape;
-use Tie::Persistent;
 use DBI;
 use DBD::Pg;
 require 'Position.pm';
@@ -68,6 +67,7 @@ select(TBLOG);
 $| = 1;
 
 select(STDOUT);
+umask 0022;
 
 # open the chess engine
 my $engine = open_engine($remoteglotconf::engine_cmdline, 'E1', sub { handle_uci(@_, 1); });
@@ -276,8 +276,12 @@ sub handle_pgn {
 	}
 
 	my $pgn = Chess::PGN::Parse->new(undef, $body);
-	if (!defined($pgn) || !$pgn->read_game() || $body !~ /^\[/) {
-		warn "Error in parsing PGN from $url\n";
+	if (!defined($pgn)) {
+		warn "Error in parsing PGN from $url [body='$body']\n";
+	} elsif (!$pgn->read_game()) {
+		warn "Error in reading PGN game from $url [body='$body']\n";
+	} elsif ($body !~ /^\[/) {
+		warn "Malformed PGN from $url [body='$body']\n";
 	} else {
 		eval {
 			# Skip to the right game.
@@ -290,13 +294,19 @@ sub handle_pgn {
 			my $pos = Position->start_pos($pgn->white, $pgn->black);
 			my $moves = $pgn->moves;
 			my @uci_moves = ();
+			my @repretty_moves = ();
 			for my $move (@$moves) {
-				my $uci_move;
-				($pos, $uci_move) = $pos->make_pretty_move($move);
+				my ($npos, $uci_move) = $pos->make_pretty_move($move);
 				push @uci_moves, $uci_move;
+
+				# Re-prettyprint the move.
+				my ($from_row, $from_col, $to_row, $to_col, $promo) = parse_uci_move($uci_move);
+				my ($pretty, undef) = $pos->{'board'}->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
+				push @repretty_moves, $pretty;
+				$pos = $npos;
 			}
 			$pos->{'result'} = $pgn->result;
-			$pos->{'pretty_history'} = $moves;
+			$pos->{'pretty_history'} = \@repretty_moves;
 
 			extract_clock($pgn, $pos);
 
@@ -483,10 +493,9 @@ sub parse_ids {
 	my ($engine, @x) = @_;
 
 	while (scalar @x > 0) {
-		if ($x[0] =~ /^(name|author)$/) {
-			my $key = shift @x;
+		if ($x[0] eq 'name') {
 			my $value = join(' ', @x);
-			$engine->{'id'}{$key} = $value;
+			$engine->{'id'}{'author'} = $value;
 			last;
 		}
 
@@ -503,7 +512,7 @@ sub prettyprint_pv_no_cache {
 	}
 
 	my $pv = shift @pvs;
-	my ($from_col, $from_row, $to_col, $to_row, $promo) = parse_uci_move($pv);
+	my ($from_row, $from_col, $to_row, $to_col, $promo) = parse_uci_move($pv);
 	my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
 	return ( $pretty, prettyprint_pv_no_cache($nb, @pvs) );
 }
@@ -521,6 +530,61 @@ sub prettyprint_pv {
 	}
 }
 
+sub complete_using_tbprobe {
+	my ($pos, $info, $mpv) = @_;
+
+	# We need Fathom installed to do standalone TB probes.
+	return if (!defined($remoteglotconf::fathom_cmdline));
+
+	# If we already have a mate, don't bother; in some cases, it would even be
+	# better than a tablebase score.
+	return if defined($info->{'score_mate' . $mpv});
+
+	# If we have a draw or near-draw score, there's also not much interesting
+	# we could add from a tablebase. We only really want mates.
+	return if ($info->{'score_cp' . $mpv} >= -12250 && $info->{'score_cp' . $mpv} <= 12250);
+
+	# 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 @moves = ();
+	if (exists($pos->{'tbprobe_cache'}{$key})) {
+		@moves = $pos->{'tbprobe_cache'}{$key};
+	} else {
+		while ($pos->num_pieces() > 6 && $#pv > -1) {
+			my $move = shift @pv;
+			push @moves, $move;
+			$pos = $pos->make_move(parse_uci_move($move));
+		}
+
+		return if ($pos->num_pieces() > 6);
+
+		my $fen = $pos->fen();
+		my $pgn_text = `fathom --path=/srv/syzygy "$fen"`;
+		my $pgn = Chess::PGN::Parse->new(undef, $pgn_text);
+		return if (!defined($pgn) || !$pgn->read_game() || ($pgn->result ne '0-1' && $pgn->result ne '1-0'));
+		$pgn->quick_parse_game;
+		$info->{'pv' . $mpv} = \@moves;
+
+		# Splice the PV from the tablebase onto what we have so far.
+		for my $move (@{$pgn->moves}) {
+			my $uci_move;
+			($pos, $uci_move) = $pos->make_pretty_move($move);
+			push @moves, $uci_move;
+		}
+	}
+
+	$info->{'pv' . $mpv} = \@moves;
+
+	my $matelen = int((1 + scalar @moves) / 2);
+	if ((scalar @moves) % 2 == 0) {
+		$info->{'score_mate' . $mpv} = -$matelen;
+	} else {
+		$info->{'score_mate' . $mpv} = $matelen;
+	}
+}
+
 sub output {
 	#return;
 
@@ -585,6 +649,8 @@ sub output {
 		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
 			if (exists($info->{$key . '1'})) {
 				$info->{$key} = $info->{$key . '1'};
+			} else {
+				delete $info->{$key};
 			}
 		}
 	}
@@ -611,6 +677,17 @@ sub output {
 		return;
 	}
 
+	# Now do our own Syzygy tablebase probes to convert scores like +123.45 to mate.
+	if (exists($info->{'pv'})) {
+		complete_using_tbprobe($pos_calculating, $info, '');
+	}
+
+	my $mpv = 1;
+	while (exists($info->{'pv' . $mpv})) {
+		complete_using_tbprobe($pos_calculating, $info, $mpv);
+		++$mpv;
+	}
+
 	output_screen();
 	output_json(0);
 	$latest_update = [Time::HiRes::gettimeofday];
@@ -699,8 +776,8 @@ sub output_screen {
 			my $info = $engine2->{'info'};
 			last if (!exists($info->{'pv' . $mpv}));
 			eval {
+				complete_using_tbprobe($pos_calculating_second_engine, $info, $mpv);
 				my $pv = $info->{'pv' . $mpv};
-
 				my $pretty_move = join('', prettyprint_pv($pos_calculating_second_engine, $pv->[0]));
 				my @pretty_pv = prettyprint_pv($pos_calculating_second_engine, @$pv);
 				if (scalar @pretty_pv > 5) {
@@ -739,10 +816,23 @@ sub output_json {
 
 	my $json = {};
 	$json->{'position'} = $pos_calculating->to_json_hash();
-	$json->{'id'} = $engine->{'id'};
+	$json->{'engine'} = $engine->{'id'};
+	if (defined($remoteglotconf::engine_url)) {
+		$json->{'engine'}{'url'} = $remoteglotconf::engine_url;
+	}
+	if (defined($remoteglotconf::engine_details)) {
+		$json->{'engine'}{'details'} = $remoteglotconf::engine_details;
+	}
+	if (defined($remoteglotconf::move_source)) {
+		$json->{'move_source'} = $remoteglotconf::move_source;
+	}
+	if (defined($remoteglotconf::move_source_url)) {
+		$json->{'move_source_url'} = $remoteglotconf::move_source_url;
+	}
 	$json->{'score'} = long_score($info, $pos_calculating, '');
 	$json->{'short_score'} = short_score($info, $pos_calculating, '');
 	$json->{'plot_score'} = plot_score($info, $pos_calculating, '');
+	$json->{'using_lomonosov'} = defined($remoteglotconf::tb_serial_key);
 
 	$json->{'nodes'} = $info->{'nodes'};
 	$json->{'nps'} = $info->{'nps'};
@@ -764,6 +854,7 @@ sub output_json {
 			last if (!exists($info->{'pv' . $mpv}));
 
 			eval {
+				complete_using_tbprobe($pos_calculating, $info, $mpv);
 				my $pv = $info->{'pv' . $mpv};
 				my $pretty_move = join('', prettyprint_pv($pos_calculating, $pv->[0]));
 				my @pretty_pv = prettyprint_pv($pos_calculating, @$pv);
@@ -823,6 +914,37 @@ sub output_json {
 		$json->{'score_history'} = \%score_history;
 	}
 
+	# Give out a list of other games going on. (Empty is fine.)
+	if (!$historic_json_only) {
+		my @games = ();
+
+		my $q = $dbh->prepare('SELECT * FROM current_games ORDER BY priority DESC, id');
+		$q->execute;
+		while (my $ref = $q->fetchrow_hashref) {
+			eval {
+				my $other_game_contents = File::Slurp::read_file($ref->{'json_path'});
+				my $other_game_json = JSON::XS::decode_json($other_game_contents);
+
+				die "Missing position" if (!exists($other_game_json->{'position'}));
+				my $white = $other_game_json->{'position'}{'player_w'} // die 'Missing white';
+				my $black = $other_game_json->{'position'}{'player_b'} // die 'Missing black';
+
+				push @games, {
+					id => $ref->{'id'},
+					name => "$white–$black",
+					url => $ref->{'url'}
+				};
+			};
+			if ($@) {
+				warn "Could not add external game " . $ref->{'json_path'} . ": $@";
+			}
+		}
+
+		if (scalar @games > 0) {
+			$json->{'games'} = \@games;
+		}
+	}
+
 	my $json_enc = JSON::XS->new;
 	$json_enc->canonical(1);
 	my $encoded = $json_enc->encode($json);
@@ -845,17 +967,21 @@ sub output_json {
 		my $new_depth = $json->{'depth'} // 0;
 		my $new_nodes = $json->{'nodes'} // 0;
 		if (!defined($old_engine) ||
-		    $old_engine ne $json->{'id'}{'name'} ||
+		    $old_engine ne $json->{'engine'}{'name'} ||
 		    $new_depth > $old_depth ||
 		    ($new_depth == $old_depth && $new_nodes >= $old_nodes)) {
 			atomic_set_contents($filename, $encoded);
 			if (defined($json->{'plot_score'})) {
-				local $dbh->{AutoCommit} = 0;
-				$dbh->do('DELETE FROM scores WHERE id=?', undef, $id);
-				$dbh->do('INSERT INTO scores (id, plot_score, short_score, engine, depth, nodes) VALUES (?,?,?,?,?,?)', undef,
+				$dbh->do('INSERT INTO scores (id, plot_score, short_score, engine, depth, nodes) VALUES (?,?,?,?,?,?) ' .
+				         '    ON CONFLICT (id) DO UPDATE SET ' .
+				         '        plot_score=EXCLUDED.plot_score, ' .
+					 '        short_score=EXCLUDED.short_score, ' .
+					 '        engine=EXCLUDED.engine, ' .
+					 '        depth=EXCLUDED.depth, ' .
+					 '        nodes=EXCLUDED.nodes',
+					undef,
 					$id, $json->{'plot_score'}, $json->{'short_score'},
-					$json->{'id'}{'name'}, $new_depth, $new_nodes);
-				$dbh->commit;
+					$json->{'engine'}{'name'}, $new_depth, $new_nodes);
 			}
 		}
 	}
@@ -1183,7 +1309,7 @@ sub find_clock_start {
 	}
 	local $dbh->{AutoCommit} = 0;
 	$dbh->do('DELETE FROM clock_info WHERE id=?', undef, $id);
-	$dbh->do('INSERT INTO clock_info (id, white_clock, black_clock, white_clock_target, black_clock_target)', undef,
+	$dbh->do('INSERT INTO clock_info (id, white_clock, black_clock, white_clock_target, black_clock_target) VALUES (?, ?, ?, ?, ?)', undef,
 		$id, $pos->{'white_clock'}, $pos->{'black_clock'}, $white_clock_target, $black_clock_target);
 	$dbh->commit;
 }
@@ -1287,5 +1413,5 @@ sub parse_uci_move {
 	my $to_col   = col_letter_to_num(substr($move, 2, 1));
 	my $to_row   = row_letter_to_num(substr($move, 3, 1));
 	my $promo    = substr($move, 4, 1);
-	return ($from_col, $from_row, $to_col, $to_row, $promo);
+	return ($from_row, $from_col, $to_row, $to_col, $promo);
 }