X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=b66fd2c43acec6f6a9db5703e06e1f42a3fc9d90;hp=d9ddd763f31274001b415fc60151646267155063;hb=aab426550a1da4daea35eb0b0691fe8bd7907348;hpb=bfef365d9a9932c78a17daadde57a2d436fbca25

diff --git a/remoteglot.pl b/remoteglot.pl
index d9ddd76..b66fd2c 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -9,6 +9,11 @@
 # Licensed under the GNU General Public License, version 2.
 #
 
+use AnyEvent;
+use AnyEvent::Handle;
+use AnyEvent::HTTP;
+use Chess::PGN::Parse;
+use EV;
 use Net::Telnet;
 use FileHandle;
 use IPC::Open2;
@@ -37,6 +42,7 @@ my @masters = (
 # Program starts here
 $SIG{ALRM} = sub { output(); };
 my $latest_update = undef;
+my $http_timer = undef;
 
 $| = 1;
 
@@ -54,8 +60,8 @@ $| = 1;
 select(STDOUT);
 
 # open the chess engine
-my $engine = open_engine($engine_cmdline, 'E1');
-my $engine2 = open_engine($engine2_cmdline, 'E2');
+my $engine = open_engine($engine_cmdline, 'E1', sub { handle_uci(@_, 1); });
+my $engine2 = open_engine($engine2_cmdline, 'E2', sub { handle_uci(@_, 0); });
 my $last_move;
 my $last_text = '';
 my ($pos_waiting, $pos_calculating, $pos_calculating_second_engine);
@@ -92,132 +98,28 @@ $t->cmd("set shout 0");
 $t->cmd("set seek 0");
 $t->cmd("set style 12");
 $t->cmd("observe $target");
-
-# main loop
 print "FICS ready.\n";
-while (1) {
-	my $rin = '';
-	my $rout;
-	vec($rin, fileno($engine->{'read'}), 1) = 1;
-	if (defined($engine2)) {
-		vec($rin, fileno($engine2->{'read'}), 1) = 1;
-	}
-	vec($rin, fileno($t), 1) = 1;
-
-	my ($nfound, $timeleft) = select($rout=$rin, undef, undef, 5.0);
-	my $sleep = 1.0;
-
-	while (1) {
-		my $line = $t->getline(Timeout => 0, errmode => 'return');
-		last if (!defined($line));
-
-		chomp $line;
-		$line =~ tr/\r//d;
-		if ($line =~ /^<12> /) {
-			my $pos = Position->new($line);
-			
-			# if this is already in the queue, ignore it
-			next if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen());
-
-			# if we're already chewing on this and there's nothing else in the queue,
-			# also ignore it
-			next if (!defined($pos_waiting) && defined($pos_calculating) &&
-			         $pos->fen() eq $pos_calculating->fen());
-
-			# if we're already thinking on something, stop and wait for the engine
-			# to approve
-			if (defined($pos_calculating)) {
-				if (!defined($pos_waiting)) {
-					uciprint($engine, "stop");
-				}
-				if ($uci_assume_full_compliance) {
-					$pos_waiting = $pos;
-				} else {
-					uciprint($engine, "position fen " . $pos->fen());
-					uciprint($engine, "go infinite");
-					$pos_calculating = $pos;
-				}
-			} else {
-				# it's wrong just to give the FEN (the move history is useful,
-				# and per the UCI spec, we should really have sent "ucinewgame"),
-				# but it's easier
-				uciprint($engine, "position fen " . $pos->fen());
-				uciprint($engine, "go infinite");
-				$pos_calculating = $pos;
-			}
-
-			if (defined($engine2)) {
-				if (defined($pos_calculating_second_engine)) {
-					uciprint($engine2, "stop");
-				} else {
-					uciprint($engine2, "position fen " . $pos->fen());
-					uciprint($engine2, "go infinite");
-					$pos_calculating_second_engine = $pos;
-				}
-				$engine2->{'info'} = {};
-			}
-
-			$engine->{'info'} = {};
-			$last_move = time;
-
-			# 
-			# Output a command every move to note that we're
-			# still paying attention -- this is a good tradeoff,
-			# since if no move has happened in the last half
-			# hour, the analysis/relay has most likely stopped
-			# and we should stop hogging server resources.
-			#
-			$t->cmd("date");
-		}
-		if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
-			my ($who, $msg) = ($1, $2);
 
-			next if (grep { $_ eq $who } (@masters) == 0);
-	
-			if ($msg =~ /^fics (.*?)$/) {
-				$t->cmd("tell $who Executing '$1' on FICS.");
-				$t->cmd($1);
-			} elsif ($msg =~ /^uci (.*?)$/) {
-				$t->cmd("tell $who Sending '$1' to the engine.");
-				print { $engine->{'write'} } "$1\n";
-			} else {
-				$t->cmd("tell $who Couldn't understand '$msg', sorry.");
-			}
-		}
-		#print "FICS: [$line]\n";
-		$sleep = 0;
-	}
-	
-	# any fun on the UCI channel?
-	if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-		my @lines = $engine->read_lines();
-		for my $line (@lines) {
-			next if $line =~ /(upper|lower)bound/;
-			handle_uci($engine, $line, 1);
-		}
-		$sleep = 0;
+my $ev1 = AnyEvent->io(
+	fh => fileno($t),
+	poll => 'r',
+	cb => sub {    # what callback to execute
+		while (1) {
+			my $line = $t->getline(Timeout => 0, errmode => 'return');
+			return if (!defined($line));
 
-		output();
-	}
-	if (defined($engine2) && $nfound > 0 && vec($rout, fileno($engine2->{'read'}), 1) == 1) {
-		my @lines = $engine2->read_lines();
-		for my $line (@lines) {
-			next if $line =~ /(upper|lower)bound/;
-			handle_uci($engine2, $line, 0);
+			chomp $line;
+			$line =~ tr/\r//d;
+			handle_fics($line);
 		}
-		$sleep = 0;
-
-		output();
 	}
-
-	sleep $sleep;
-}
+);
+# Engine events have already been set up by Engine.pm.
+EV::run;
 
 sub handle_uci {
 	my ($engine, $line, $primary) = @_;
 
-	chomp $line;
-	$line =~ tr/\r//d;
 	$line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
 	print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
 	if ($line =~ /^info/) {
@@ -250,6 +152,119 @@ sub handle_uci {
 			$pos_calculating_second_engine = $pos;
 		}
 	}
+	output();
+}
+
+sub handle_fics {
+	my $line = shift;
+	if ($line =~ /^<12> /) {
+		handle_position(Position->new($line));
+	}
+	if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
+		my ($who, $msg) = ($1, $2);
+
+		next if (grep { $_ eq $who } (@masters) == 0);
+
+		if ($msg =~ /^fics (.*?)$/) {
+			$t->cmd("tell $who Executing '$1' on FICS.");
+			$t->cmd($1);
+		} elsif ($msg =~ /^uci (.*?)$/) {
+			$t->cmd("tell $who Sending '$1' to the engine.");
+			print { $engine->{'write'} } "$1\n";
+		} elsif ($msg =~ /^pgn (.*?)$/) {
+			my $url = $1;
+			$t->cmd("tell $who Starting to poll '$url'.");
+			AnyEvent::HTTP::http_get($url, sub {
+				handle_pgn(@_, $url);
+			});
+		} elsif ($msg =~ /^stoppgn$/) {
+			$t->cmd("tell $who Stopping poll.");
+			$http_timer = undef;
+		} else {
+			$t->cmd("tell $who Couldn't understand '$msg', sorry.");
+		}
+	}
+	#print "FICS: [$line]\n";
+}
+
+sub handle_pgn {
+	my ($body, $header, $url) = @_;
+	my $pgn = Chess::PGN::Parse->new(undef, $body);
+	if (!defined($pgn) || !$pgn->read_game()) {
+		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;
+		for my $move (@$moves) {
+			my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move);
+			$pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo);
+		}
+		handle_position($pos);
+	}
+	
+	$http_timer = AnyEvent->timer(after => 1.0, cb => sub {
+		AnyEvent::HTTP::http_get($url, sub {
+			handle_pgn(@_, $url);
+		});
+	});
+}
+
+sub handle_position {
+	my ($pos) = @_;
+		
+	# if this is already in the queue, ignore it
+	return if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen());
+
+	# 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 we're already thinking on something, stop and wait for the engine
+	# to approve
+	if (defined($pos_calculating)) {
+		if (!defined($pos_waiting)) {
+			uciprint($engine, "stop");
+		}
+		if ($uci_assume_full_compliance) {
+			$pos_waiting = $pos;
+		} else {
+			uciprint($engine, "position fen " . $pos->fen());
+			uciprint($engine, "go infinite");
+			$pos_calculating = $pos;
+		}
+	} else {
+		# it's wrong just to give the FEN (the move history is useful,
+		# and per the UCI spec, we should really have sent "ucinewgame"),
+		# but it's easier
+		uciprint($engine, "position fen " . $pos->fen());
+		uciprint($engine, "go infinite");
+		$pos_calculating = $pos;
+	}
+
+	if (defined($engine2)) {
+		if (defined($pos_calculating_second_engine)) {
+			uciprint($engine2, "stop");
+		} else {
+			uciprint($engine2, "position fen " . $pos->fen());
+			uciprint($engine2, "go infinite");
+			$pos_calculating_second_engine = $pos;
+		}
+		$engine2->{'info'} = {};
+	}
+
+	$engine->{'info'} = {};
+	$last_move = time;
+
+	# 
+	# Output a command every move to note that we're
+	# still paying attention -- this is a good tradeoff,
+	# since if no move has happened in the last half
+	# hour, the analysis/relay has most likely stopped
+	# and we should stop hogging server resources.
+	#
+	$t->cmd("date");
 }
 
 sub parse_infos {
@@ -711,24 +726,9 @@ sub book_info {
 }
 
 sub open_engine {
-	my ($cmdline, $tag) = @_;
+	my ($cmdline, $tag, $cb) = @_;
 	return undef if (!defined($cmdline));
-	my $engine = Engine->open($cmdline, $tag);
-
-	uciprint($engine, "uci");
-
-	# gobble the options
-	my $seen_uciok = 0;
-	while (!$seen_uciok) {
-		for my $line ($engine->read_lines()) {
-			if ($line =~ /uciok/) {
-				$seen_uciok = 1;
-			}
-			handle_uci($engine, $line);
-		}
-	}
-	
-	return $engine;
+	return Engine->open($cmdline, $tag, $cb);
 }
 
 sub col_letter_to_num {