X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=a94a618035eea6860c40f11afbb9fc6271436e44;hp=63cdac205d89a57e036e12b59d604212e0cbfbba;hb=35725006988891aae7234a39c4f7c603c8b17bd9;hpb=01b91aa7e25d94d3cc26db79271d8e6f05a60462

diff --git a/remoteglot.pl b/remoteglot.pl
index 63cdac2..a94a618 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -35,6 +35,7 @@ my $stop_pgn_fetch = 0;
 my $tb_retry_timer = undef;
 my %tb_cache = ();
 my $tb_lookup_running = 0;
+my $last_written_json = undef;
 
 # TODO: Persist (parts of) this so that we can restart.
 my %clock_target_for_pos = ();
@@ -268,10 +269,16 @@ sub handle_pgn {
 	}
 
 	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 {
 		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";
+			}
+
 			$pgn->parse_game({ save_comments => 'yes' });
 			my $pos = Position->start_pos($pgn->white, $pgn->black);
 			my $moves = $pgn->moves;
@@ -308,7 +315,7 @@ sub handle_pgn {
 			}
 		};
 		if ($@) {
-			warn "Error in parsing moves from $url\n";
+			warn "Error in parsing moves from $url: $@\n";
 		}
 	}
 	
@@ -321,13 +328,19 @@ sub handle_position {
 	my ($pos) = @_;
 	find_clock_start($pos);
 		
-	# 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
@@ -760,8 +773,10 @@ sub output_json {
 	$json->{'refutation_lines'} = \%refutation_lines;
 
 	my $encoded = JSON::XS::encode_json($json);
-	unless ($historic_json_only) {
+	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'}) &&
@@ -981,11 +996,8 @@ sub extract_clock {
 	# Look for extended PGN clock tags.
 	my $tags = $pgn->tags;
 	if (exists($tags->{'WhiteClock'}) && exists($tags->{'BlackClock'})) {
-		$pos->{'white_clock'} = $tags->{'WhiteClock'};
-		$pos->{'black_clock'} = $tags->{'BlackClock'};
-
-		$pos->{'white_clock'} =~ s/\b(\d)\b/0$1/g;
-		$pos->{'black_clock'} =~ s/\b(\d)\b/0$1/g;
+		$pos->{'white_clock'} = hms_to_sec($tags->{'WhiteClock'});
+		$pos->{'black_clock'} = hms_to_sec($tags->{'BlackClock'});
 		return;
 	}
 
@@ -1000,23 +1012,34 @@ sub extract_clock {
 
 	if (exists($comments->{$white_key}) &&
 	    exists($comments->{$black_key}) &&
-	    $comments->{$white_key} =~ /tl=(\d+:\d+:\d+)/ &&
-	    $comments->{$black_key} =~ /tl=(\d+:\d+:\d+)/) {
-		$comments->{$white_key} =~ /tl=(\d+:\d+:\d+)/;
-		$pos->{'white_clock'} = $1;
-		$comments->{$black_key} =~ /tl=(\d+:\d+:\d+)/;
-		$pos->{'black_clock'} = $1;
+	    $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 = shift;
 
 	# If the game is over, the clock is stopped.
-	if ($pos->{'result'} eq '1-0' ||
-	    $pos->{'result'} eq '1/2-1/2' ||
-	    $pos->{'result'} eq '0-1') {
+	if (exists($pos->{'result'}) &&
+	    ($pos->{'result'} eq '1-0' ||
+	     $pos->{'result'} eq '1/2-1/2' ||
+	     $pos->{'result'} eq '0-1')) {
 		return;
 	}
 
@@ -1025,6 +1048,12 @@ sub find_clock_start {
 		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_target_for_pos{$id})) {
 		if ($pos->{'toplay'} eq 'W') {
@@ -1042,8 +1071,7 @@ sub find_clock_start {
 		# No clock information.
 		return;
 	}
-	$pos->{$key} =~ /(\d+):(\d+):(\d+)/;
-	my $time_left = $1 * 3600 + $2 * 60 + $3;
+	my $time_left = $pos->{$key};
 	$clock_target_for_pos{$id} = time + $time_left;
 	if ($pos->{'toplay'} eq 'W') {
 		$pos->{'white_clock_target'} = $clock_target_for_pos{$id};