X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=c6815af33932e967e671ee140b139994ef2b8080;hp=5d907d89f7aba97b35ff5849d9627338733e3a6a;hb=b0c4ec18261ba40c2323c83f88e4e647d2039638;hpb=93c084f827a5783b20a3b3349463187c6d342810

diff --git a/remoteglot.pl b/remoteglot.pl
index 5d907d8..c6815af 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -124,7 +124,7 @@ if (defined($remoteglotconf::server)) {
 	);
 }
 if (defined($remoteglotconf::target)) {
-	if ($remoteglotconf::target =~ /^https?:/) {
+	if ($remoteglotconf::target =~ /^(?:\/|https?:)/) {
 		fetch_pgn($remoteglotconf::target);
 	} elsif (defined($t)) {
 		$t->cmd("observe $remoteglotconf::target");
@@ -248,9 +248,26 @@ sub handle_fics {
 # Starts periodic fetching of PGNs from the given URL.
 sub fetch_pgn {
 	my ($url) = @_;
-	AnyEvent::HTTP::http_get($url, sub {
-		handle_pgn(@_, $url);
-	});
+	if ($url =~ m#^/#) {  # Local file.
+		eval {
+			local $/ = undef;
+			open my $fh, "<", $url
+				or die "$url: $!";
+			my $pgn = <$fh>;
+			close $fh;
+			handle_pgn($pgn, '', $url);
+		};
+		if ($@) {
+			warn "$url: $@";
+			$http_timer = AnyEvent->timer(after => 1.0, cb => sub {
+				fetch_pgn($url);
+			});
+		}
+	} else {
+		AnyEvent::HTTP::http_get($url, sub {
+			handle_pgn(@_, $url);
+		});
+	}
 }
 
 my ($last_pgn_white, $last_pgn_black);
@@ -286,7 +303,23 @@ sub handle_pgn {
 			my $black = $pgn->black;
 			$white =~ s/,.*//;  # Remove first name.
 			$black =~ s/,.*//;  # Remove first name.
-			my $pos = Position->start_pos($white, $black);
+			my $tags = $pgn->tags();
+			my $pos;
+			if (exists($tags->{'FEN'})) {
+				$pos = Position->from_fen($tags->{'FEN'});
+				$pos->{'last_move'} = 'none';
+				$pos->{'player_w'} = $white;
+				$pos->{'player_b'} = $black;
+				$pos->{'start_fen'} = $tags->{'FEN'};
+			} else {
+				$pos = Position->start_pos($white, $black);
+			}
+			if (exists($tags->{'Variant'}) &&
+			    $tags->{'Variant'} =~ /960|fischer/i) {
+				$pos->{'chess960'} = 1;
+			} else {
+				$pos->{'chess960'} = 0;
+			}
 			my $moves = $pgn->moves;
 			my @uci_moves = ();
 			my @repretty_moves = ();
@@ -377,6 +410,10 @@ sub handle_position {
 	# It's wrong to just give the FEN (the move history is useful,
 	# and per the UCI spec, we should really have sent "ucinewgame"),
 	# but it's easier, and it works around a Stockfish repetition issue.
+	if ($engine->{'chess960'} != $pos->{'chess960'}) {
+		uciprint($engine, "setoption name UCI_Chess960 value " . ($pos->{'chess960'} ? 'true' : 'false'));
+		$engine->{'chess960'} = $pos->{'chess960'};
+	}
 	uciprint($engine, "position fen " . $pos->fen());
 	uciprint($engine, "go infinite");
 	$pos_calculating = $pos;
@@ -386,6 +423,10 @@ sub handle_position {
 			$engine2->{'stopping'} = 1;
 			uciprint($engine2, "stop");
 		}
+		if ($engine2->{'chess960'} != $pos->{'chess960'}) {
+			uciprint($engine2, "setoption name UCI_Chess960 value " . ($pos->{'chess960'} ? 'true' : 'false'));
+			$engine2->{'chess960'} = $pos->{'chess960'};
+		}
 		uciprint($engine2, "position fen " . $pos->fen());
 		uciprint($engine2, "go infinite");
 		$pos_calculating_second_engine = $pos;
@@ -880,7 +921,13 @@ sub output_json {
 
 		local $dbh->{AutoCommit} = 0;
 		my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
-		my $pos = Position->start_pos('white', 'black');
+		my $pos;
+		if (exists($pos_calculating->{'start_fen'})) {
+			$pos = Position->from_fen($pos_calculating->{'start_fen'});
+		} else {
+			$pos = Position->start_pos('white', 'black');
+		}
+		$pos->{'chess960'} = $pos_calculating->{'chess960'};
 		my $halfmove_num = 0;
 		for my $move (@{$pos_calculating->{'history'}}) {
 			my $id = id_for_pos($pos, $halfmove_num);
@@ -1275,7 +1322,7 @@ sub find_clock_start {
 	}
 
 	my $id = id_for_pos($pos);
-	my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=?', undef, $id);
+	my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=? AND COALESCE(white_clock_target, black_clock_target) >= EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - INTERVAL \'1 day\'));', undef, $id);
 	if (defined($clock_info)) {
 		$pos->{'white_clock'} //= $clock_info->{'white_clock'};
 		$pos->{'black_clock'} //= $clock_info->{'black_clock'};
@@ -1339,7 +1386,7 @@ sub schedule_tb_lookup {
 	return if ($tb_lookup_running);
 
 	$tb_lookup_running = 1;
-	my $url = 'http://158.250.18.203:6904/tasks/addtask?auth.login=' .
+	my $url = 'http://tb7-api.chessok.com:6904/tasks/addtask?auth.login=' .
 		$remoteglotconf::tb_serial_key .
 		'&auth.password=aquarium&type=0&fen=' . 
 		URI::Escape::uri_escape($pos->fen());