X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=8c871084ead93aca57e599d80e1a98aaaf927a8b;hp=9d88db75727817d0324f7c315e301e2f5b95fa22;hb=ec2386e69c22c62ee666fb9a8aab7481335b5b54;hpb=195648946e62e7841af4af86601bde2ab281c5df

diff --git a/remoteglot.pl b/remoteglot.pl
index 9d88db7..8c87108 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -23,6 +23,12 @@ my $target = "22";
 my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 my $telltarget = undef;   # undef to be silent
 my @tell_intervals = (5, 20, 60, 120, 240, 480, 960);  # after each move
+my $uci_assume_full_compliance = 1;                    # dangerous :-)
+my @masters = (
+	'Sesse',
+	'Sessse',
+	'Sesssse'
+);
 
 # Program starts here
 $SIG{ALRM} = sub { output_screen(); };
@@ -60,7 +66,7 @@ while (<UCIREAD>) {
 }
 
 uciprint("setoption name UCI_AnalyseMode value true");
-uciprint("setoption name Preserve Analysis value true");
+# uciprint("setoption name Preserve Analysis value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");
 uciprint("setoption name NalimovUsage value Rarely");
 uciprint("setoption name Hash value 1024");
@@ -116,8 +122,16 @@ while (1) {
 			# if we're already thinking on something, stop and wait for the engine
 			# to approve
 			if (defined($pos_calculating)) {
-				uciprint("stop");
-				$pos_waiting = $pos;
+				if (!defined($pos_waiting)) {
+					uciprint("stop");
+				}
+				if ($uci_assume_full_compliance) {
+					$pos_waiting = $pos;
+				} else {
+					uciprint("position fen " . $pos->{'fen'});
+					uciprint("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"),
@@ -139,13 +153,48 @@ while (1) {
 			#
 			$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 UCIWRITE "$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(UCIREAD), 1) == 1) {
-		my $line = <UCIREAD>;
+		# 
+		# Read until we've got a full line -- if the engine sends part of
+		# a line and then stops we're pretty much hosed, but that should
+		# never happen.
+		#
+		my $line = '';
+		while ($line !~ /\n/) {
+			my $tmp;
+			my $ret = sysread UCIREAD, $tmp, 1;
+
+			if (!defined($ret)) {
+				next if ($!{EINTR});
+				die "error in reading from the UCI engine: $!";
+			} elsif ($ret == 0) {
+				die "EOF from UCI engine";
+			}
+
+			$line .= $tmp;
+		}
+
+		$line =~ tr/\r\n//d;
 		handle_uci($line);
 		$sleep = 0;
 
@@ -161,7 +210,7 @@ sub handle_uci {
 
 	chomp $line;
 	$line =~ tr/\r//d;
-	print UCILOG "<= $line\n";
+	print UCILOG localtime() . " <= $line\n";
 	if ($line =~ /^info/) {
 		my (@infos) = split / /, $line;
 		shift @infos;
@@ -174,7 +223,7 @@ sub handle_uci {
 
 		parse_ids(@ids);
 	}
-	if ($line =~ /^bestmove/) {
+	if ($line =~ /^bestmove/ && $uci_assume_full_compliance) {
 		if (defined($pos_waiting)) {
 			uciprint("position fen " . $pos_waiting->{'fen'});
 			uciprint("go infinite");
@@ -838,7 +887,7 @@ sub can_reach {
 sub uciprint {
 	my $msg = shift;
 	print UCIWRITE "$msg\n";
-	print UCILOG "=> $msg\n";
+	print UCILOG localtime() . " => $msg\n";
 }
 
 sub short_score {