From 35910dfcb34a442657bb5508cda8059f9f0ba32c Mon Sep 17 00:00:00 2001
From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Sat, 8 Dec 2018 23:36:34 +0100
Subject: [PATCH] Fix periodic updates

The move and move number were not available for the stat01 commands,
because the code to collect the moves for the go-searchmoves command
would prevent parsing of the entire info command. So this collection
is now done last, and also made responsible for extracting the
current move.
---
 UCI2WB.c |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/UCI2WB.c b/UCI2WB.c
index bac4bcb..0a1de9f 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -294,17 +294,6 @@ HandleEngineOutput()
 		}
 		continue;
 	    }
-	    if(collect && (pv = strstr(line+5, "currmove "))) {
-		if(p = strstr(line+5, "currmovenumber ")) {
-		    n = atoi(p+15);
-		    if(collect == 1 && n != 1) continue; // wait for move 1
-		    if(collect + (n == 1) > 2) { // done collecting
-			if(inex && collect == 2) printf("%d 0 0 0 OK to exclude\n", lastDepth);
-			collect = 3; continue;
-		    }
-		    collect = 2; on[nr=n] = 1; sscanf(pv+9, "%s", moveMap[n]); continue; // store move
-		}
-	    }
 	    if(!post) continue;
 	    if(sscanf(line+5, "string %c", &dummy) == 1) printf("%d 0 0 0 %s", lastDepth, line+12); else {
 		if(p = strstr(line+4, " depth "))      sscanf(p+7, "%d", &d), statDepth = d;
@@ -313,8 +302,6 @@ HandleEngineOutput()
 		if(p = strstr(line+4, " score "))      sscanf(p+7, "%d", &s), statScore = s;
 		if(p = strstr(line+4, " nodes "))      sscanf(p+7, "%d", &n), statNodes = n;
 		if(p = strstr(line+4, " time "))       sscanf(p+6, "%d", &t), t /= 10, statTime = t;
-		if(p = strstr(line+4, " currmove "))   sscanf(p+10,"%s", currMove);
-		if(p = strstr(line+4, " currmovenumber ")) sscanf(p+16,"%d", &currNr);
 		if(pv = strstr(line+4, " pv ")) { // convert PV info to WB thinking output
 		  if(d > maxDepth) maxDepth = d, mpvSP = 0; else if(d < maxDepth) continue; // ignore depth regressions
 		  if(p = strstr(line+4, " upperbound ")) strcat(p, "?\n"); else
@@ -324,6 +311,18 @@ HandleEngineOutput()
 		    printf("%3d  %6d %6d %10d %s", lastDepth=d, lastScore=s, t, n, Convert(pv+4));
 		} else if(s == -100000) lastScore = s; // when checkmated score is valid even without PV (which might not come)
 	    }
+	    if(collect && (pv = strstr(line+4, " currmove "))) {
+		sscanf(pv+10,"%s", currMove);
+		if(p = strstr(line+4, " currmovenumber ")) {
+		    n = currNr = atoi(p+16);
+		    if(collect == 1 && n != 1) continue; // wait for move 1
+		    if(collect + (n == 1) > 2) { // done collecting
+			if(inex && collect == 2) printf("%d 0 0 0 OK to exclude\n", lastDepth);
+			collect = 3; continue;
+		    }
+		    collect = 2; on[nr=n] = 1; strcpy(moveMap[n], currMove); continue; // store move
+		}
+	    }
 	}
 	else if(!strcmp(command, "option")) { // USI option: extract data fields
 	    char name[80], type[80], buf[1024], val[256], *q;
@@ -460,7 +459,7 @@ GUI2Engine()
 	else if(!strcmp(command, "post"))  post = 1;
 	else if(!strcmp(command, "nopost"))post = 0;
 	else if(!strcmp(command, ".")) {
-	    printf("stat01: %d %d %d %d 100 %s\n", statTime, statNodes, statDepth, 100-currNr, currMove);
+	    printf("stat01: %d %d %d %d %d %s\n", statTime, statNodes, statDepth, nr-currNr, nr, currMove);
 	}
 	else if(!strcmp(command, "pause")) {
 	    if(computer == stm) myTime -= GetTickCount() - startTime;
-- 
1.7.0.4