X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=9cc82e318fd3b79d617c2128ac3418647a8ce35c;hp=8cfb0be553049e74ba03fef87597a76bc02838b7;hb=bc53c53fedfe3c5514e4a5c01bde99133e7584af;hpb=7b820e6d4213ba6a8e7d618edc473668acd141aa

diff --git a/remoteglot.pl b/remoteglot.pl
index 8cfb0be..9cc82e3 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -20,6 +20,7 @@ use IPC::Open2;
 use Time::HiRes;
 use JSON::XS;
 use URI::Escape;
+use Tie::Persistent;
 require 'Position.pm';
 require 'Engine.pm';
 require 'config.pm';
@@ -31,9 +32,15 @@ no warnings qw(once);
 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;
+my $last_written_json = undef;
+
+# Persisted so that we can restart.
+tie my %clock_info_for_pos, 'Tie::Persistent', 'clock_info.db', 'rw';
+(tied %clock_info_for_pos)->autosync(1);       # turn on write back on every modify
 
 $| = 1;
 
@@ -199,7 +206,6 @@ sub handle_fics {
 		};
 		if ($@) {
 			warn "Error when getting FICS move history: $@";
-			exit;
 			$getting_movelist = 0;
 		}
 	}
@@ -209,7 +215,6 @@ sub handle_fics {
 		for my $pos ($pos_waiting, $pos_calculating) {
 			next if (!defined($pos));
 			if ($pos->fen() eq $pos_for_movelist->fen()) {
-				$pos->{'history'} = \@uci_movelist;
 				$pos->{'pretty_history'} = \@pretty_movelist;
 			}
 		}
@@ -232,6 +237,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,41 +263,61 @@ 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()) {
+	if (!defined($pgn) || !$pgn->read_game() || $body !~ /^\[/) {
 		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 $uci_move;
-			($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 {
+			# Skip to the right game.
+			while (defined($remoteglotconf::pgn_filter) &&
+			       !&$remoteglotconf::pgn_filter($pgn)) {
+				$pgn->read_game() or die "Out of games during filtering";
 			}
-		}
-		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);
+
+			$pgn->parse_game({ save_comments => 'yes' });
+			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;
+			}
+			$pos->{'result'} = $pgn->result;
+			$pos->{'pretty_history'} = $moves;
+
+			extract_clock($pgn, $pos);
+
+			# 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";
 		}
 	}
 	
@@ -302,18 +328,38 @@ sub handle_pgn {
 
 sub handle_position {
 	my ($pos) = @_;
+	find_clock_start($pos, $pos_calculating);
 		
-	# if this is already in the queue, ignore it
-	return if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen());
+	# if this is already in the queue, ignore it (just update the result)
+	if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen()) {
+		$pos_waiting->{'result'} = $pos->{'result'};
+		return;
+	}
 
 	# if we're already chewing on this and there's nothing else in the queue,
 	# also ignore it
-	return if (!defined($pos_waiting) && defined($pos_calculating) &&
-		 $pos->fen() eq $pos_calculating->fen());
+	if (!defined($pos_waiting) && defined($pos_calculating) &&
+	    $pos->fen() eq $pos_calculating->fen()) {
+		$pos_calculating->{'result'} = $pos->{'result'};
+		return;
+	}
 
 	# if we're already thinking on something, stop and wait for the engine
 	# to approve
 	if (defined($pos_calculating)) {
+		# Store the final data we have for this position in the history,
+		# with the precise clock information we just got from the new
+		# position. (Historic positions store the clock at the end of
+		# the position.)
+		#
+		# Do not output anything new to the main analysis; that's
+		# going to be obsolete really soon.
+		$pos_calculating->{'white_clock'} = $pos->{'white_clock'};
+		$pos_calculating->{'black_clock'} = $pos->{'black_clock'};
+		delete $pos_calculating->{'white_clock_target'};
+		delete $pos_calculating->{'black_clock_target'};
+		output_json(1);
+
 		if (!defined($pos_waiting)) {
 			uciprint($engine, "stop");
 		}
@@ -503,7 +549,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') {
@@ -561,7 +607,7 @@ sub output {
 	}
 
 	output_screen();
-	output_json();
+	output_json(0);
 	$latest_update = [Time::HiRes::gettimeofday];
 }
 
@@ -683,6 +729,7 @@ sub output_screen {
 }
 
 sub output_json {
+	my $historic_json_only = shift;
 	my $info = $engine->{'info'};
 
 	my $json = {};
@@ -698,8 +745,7 @@ sub output_json {
 	$json->{'seldepth'} = $info->{'seldepth'};
 	$json->{'tablebase'} = $info->{'tablebase'};
 
-	# single-PV only for now
-	$json->{'pv_uci'} = $info->{'pv'};
+	$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'}}) ];
 
 	my %refutation_lines = ();
@@ -723,17 +769,76 @@ sub output_json {
 					pretty_move => $pretty_move,
 					pv_pretty => \@pretty_pv,
 				};
-				$refutation_lines{$pv->[0]}->{'pv_uci'} = $pv;
 			};
 		}
 	}
 	$json->{'refutation_lines'} = \%refutation_lines;
 
-	open my $fh, ">", $remoteglotconf::json_output . ".tmp"
+	my $encoded = JSON::XS::encode_json($json);
+	unless ($historic_json_only || !defined($remoteglotconf::json_output) ||
+	        (defined($last_written_json) && $last_written_json eq $encoded)) {
+		atomic_set_contents($remoteglotconf::json_output, $encoded);
+		$last_written_json = $encoded;
+	}
+
+	if (exists($pos_calculating->{'pretty_history'}) &&
+	    defined($remoteglotconf::json_history_dir)) {
+		my $filename = $remoteglotconf::json_history_dir . "/" . id_for_pos($pos_calculating) . ".json";
+
+		# 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);
+		}
+	}
+}
+
+sub atomic_set_contents {
+	my ($filename, $contents) = @_;
+
+	open my $fh, ">", $filename . ".tmp"
 		or return;
-	print $fh JSON::XS::encode_json($json);
+	print $fh $contents;
+	close $fh;
+	rename($filename . ".tmp", $filename);
+}
+
+sub id_for_pos {
+	my $pos = shift;
+
+	my $halfmove_num = scalar @{$pos->{'pretty_history'}};
+	(my $fen = $pos->fen()) =~ tr,/ ,-_,;
+	return "move$halfmove_num-$fen";
+}
+
+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;
-	rename($remoteglotconf::json_output . ".tmp", $remoteglotconf::json_output);
+	if ($@) {
+		warn "Error in decoding $filename: $@";
+		return undef;
+	}
+	return ($engine, $depth, $nodes);
 }
 
 sub uciprint {
@@ -887,6 +992,122 @@ sub book_info {
 	return $text;
 }
 
+sub extract_clock {
+	my ($pgn, $pos) = @_;
+
+	# Look for extended PGN clock tags.
+	my $tags = $pgn->tags;
+	if (exists($tags->{'WhiteClock'}) && exists($tags->{'BlackClock'})) {
+		$pos->{'white_clock'} = hms_to_sec($tags->{'WhiteClock'});
+		$pos->{'black_clock'} = hms_to_sec($tags->{'BlackClock'});
+		return;
+	}
+
+	# Look for TCEC-style time comments.
+	my $moves = $pgn->moves;
+	my $comments = $pgn->comments;
+	my $last_black_move = int((scalar @$moves) / 2);
+	my $last_white_move = int((1 + scalar @$moves) / 2);
+
+	my $black_key = $last_black_move . "b";
+	my $white_key = $last_white_move . "w";
+
+	if (exists($comments->{$white_key}) &&
+	    exists($comments->{$black_key}) &&
+	    $comments->{$white_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/ &&
+	    $comments->{$black_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/) {
+		$comments->{$white_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/;
+		$pos->{'white_clock'} = hms_to_sec($1);
+		$comments->{$black_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/;
+		$pos->{'black_clock'} = hms_to_sec($1);
+		return;
+	}
+
+	delete $pos->{'white_clock'};
+	delete $pos->{'black_clock'};
+}
+
+sub hms_to_sec {
+	my $hms = shift;
+	return undef if (!defined($hms));
+	$hms =~ /(\d+):(\d+):(\d+)/;
+	return $1 * 3600 + $2 * 60 + $3;
+}
+
+sub find_clock_start {
+	my ($pos, $prev_pos) = @_;
+
+	# If the game is over, the clock is stopped.
+	if (exists($pos->{'result'}) &&
+	    ($pos->{'result'} eq '1-0' ||
+	     $pos->{'result'} eq '1/2-1/2' ||
+	     $pos->{'result'} eq '0-1')) {
+		return;
+	}
+
+	# When we don't have any moves, we assume the clock hasn't started yet.
+	if ($pos->{'move_num'} == 1 && $pos->{'toplay'} eq 'W') {
+		if (defined($remoteglotconf::adjust_clocks_before_move)) {
+			&$remoteglotconf::adjust_clocks_before_move(\$pos->{'white_clock'}, \$pos->{'black_clock'}, 1, 'W');
+		}
+		return;
+	}
+
+	# 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'})) {
+		return;
+	}
+
+	my $id = id_for_pos($pos);
+	if (exists($clock_info_for_pos{$id})) {
+		$pos->{'white_clock'} //= $clock_info_for_pos{$id}{'white_clock'};
+		$pos->{'black_clock'} //= $clock_info_for_pos{$id}{'black_clock'};
+		if ($pos->{'toplay'} eq 'W') {
+			$pos->{'white_clock_target'} = $clock_info_for_pos{$id}->{'white_clock_target'};
+		} else {
+			$pos->{'black_clock_target'} = $clock_info_for_pos{$id}->{'black_clock_target'};
+		}
+		return;
+	}
+
+	# OK, we haven't seen this position before, so we assume the move
+	# happened right now.
+
+	# See if we should do our own clock management (ie., clock information
+	# is spurious or non-existent).
+	if (defined($remoteglotconf::adjust_clocks_before_move)) {
+		my $wc = $pos->{'white_clock'} // $prev_pos->{'white_clock'};
+		my $bc = $pos->{'black_clock'} // $prev_pos->{'black_clock'};
+		if (defined($prev_pos->{'white_clock_target'})) {
+			$wc = $prev_pos->{'white_clock_target'} - time;
+		}
+		if (defined($prev_pos->{'black_clock_target'})) {
+			$bc = $prev_pos->{'black_clock_target'} - time;
+		}
+		&$remoteglotconf::adjust_clocks_before_move(\$wc, \$bc, $pos->{'move_num'}, $pos->{'toplay'});
+		$pos->{'white_clock'} = $wc;
+		$pos->{'black_clock'} = $bc;
+	}
+
+	my $key = ($pos->{'toplay'} eq 'W') ? 'white_clock' : 'black_clock';
+	if (!exists($pos->{$key})) {
+		# No clock information.
+		return;
+	}
+	my $time_left = $pos->{$key};
+	my $clock_info = {
+		white_clock => $pos->{'white_clock'},
+		black_clock => $pos->{'black_clock'}
+	};
+	if ($pos->{'toplay'} eq 'W') {
+		$clock_info->{'white_clock_target'} = $pos->{'white_clock_target'} = time + $time_left;
+	} else {
+		$clock_info->{'black_clock_target'} = $pos->{'black_clock_target'} = time + $time_left;
+	}
+	$clock_info_for_pos{$id} = $clock_info;
+}
+
 sub schedule_tb_lookup {
 	return if (!defined($remoteglotconf::tb_serial_key));
 	my $pos = $pos_waiting // $pos_calculating;
@@ -938,7 +1159,8 @@ sub handle_tb_lookup_return {
 				}
 				$tb_cache{$fen} = {
 					result => $pgn->result,
-					pv => \@uci_moves
+					pv => \@uci_moves,
+					score => $response->{'Response'}{'Score'},
 				};
 				output();
 			}