From 353d291ef578c314ae805644531ca06f67a604b3 Mon Sep 17 00:00:00 2001
From: Sander Land <sander.land@cognite.com>
Date: Mon, 7 Dec 2020 14:30:51 +0100
Subject: [PATCH] no status/lock engine/no thread

---
 katrain/core/engine.py                        |  14 +++++++-------
 katrain/core/game.py                          |   5 +----
 .../i18n/locales/cn/LC_MESSAGES/katrain.po    |   5 -----
 .../i18n/locales/de/LC_MESSAGES/katrain.po    |   5 -----
 .../i18n/locales/en/LC_MESSAGES/katrain.mo    | Bin 15645 -> 15533 bytes
 .../i18n/locales/en/LC_MESSAGES/katrain.po    |   6 ------
 .../i18n/locales/es/LC_MESSAGES/katrain.po    |   5 -----
 .../i18n/locales/fr/LC_MESSAGES/katrain.po    |   6 ------
 .../i18n/locales/jp/LC_MESSAGES/katrain.po    |   6 ------
 .../i18n/locales/ko/LC_MESSAGES/katrain.po    |   5 -----
 .../i18n/locales/ru/LC_MESSAGES/katrain.po    |   5 -----
 11 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/katrain/core/engine.py b/katrain/core/engine.py
index d3c1a9e..3934539 100644
--- a/katrain/core/engine.py
+++ b/katrain/core/engine.py
@@ -228,13 +228,13 @@ class KataGoEngine:
             if "id" not in query:
                 query["id"] = f"QUERY:{str(self.query_counter)}"
             self.queries[query["id"]] = (callback, error_callback, time.time(), next_move)
-        if self.katago_process:
-            self.katrain.log(f"Sending query {query['id']}: {json.dumps(query)}", OUTPUT_DEBUG)
-            try:
-                self.katago_process.stdin.write((json.dumps(query) + "\n").encode())
-                self.katago_process.stdin.flush()
-            except OSError as e:
-                self.check_alive(os_error=str(e), exception_if_dead=True)
+            if self.katago_process:
+                self.katrain.log(f"Sending query {query['id']}: {json.dumps(query)}", OUTPUT_DEBUG)
+                try:
+                    self.katago_process.stdin.write((json.dumps(query) + "\n").encode())
+                    self.katago_process.stdin.flush()
+                except OSError as e:
+                    self.check_alive(os_error=str(e), exception_if_dead=True)
 
     def terminate_query(self, query_id):
         if query_id is not None:
diff --git a/katrain/core/game.py b/katrain/core/game.py
index ceab62f..078c7a3 100644
--- a/katrain/core/game.py
+++ b/katrain/core/game.py
@@ -550,7 +550,6 @@ class Game:
             if move.is_pass:
                 if self.current_node == cn:
                     self.set_current_node(node)
-                self.katrain.controls.set_status("", STATUS_INFO, cn)
                 return
             count += 1
             new_node = GameNode(parent=node, move=move)
@@ -559,8 +558,6 @@ class Game:
             cn.add_shortcut(new_node)
             self.katrain.controls.move_tree.redraw_tree_trigger()
 
-            self.katrain.controls.set_status(i18n._("playtoend:status").format(num_moves=count), STATUS_INFO, cn)
-
             def set_analysis(result, _partial):
                 new_node.set_analysis(result)
                 analyze_and_play_policy(new_node)
@@ -569,7 +566,7 @@ class Game:
                 new_node, callback=set_analysis, priority=-1000, analyze_fast=True,
             )
 
-        threading.Thread(target=analyze_and_play_policy, args=(cn,), daemon=True).start()
+        analyze_and_play_policy(cn)
 
     def analyze_undo(self, node):
         train_config = self.katrain.config("trainer")
diff --git a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po
index 842ae99..03e3ce5 100644
--- a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po
@@ -762,8 +762,3 @@ msgstr "Expand/Collapse"
 msgid "analysis:playtoend"
 msgstr "Fast playout to game end"
 
-#. TODO - Status message
-msgid "playtoend:status"
-msgstr ""
-"Playing game to the end with policy strategy, please wait ... {num_moves} "
-"moves played."
diff --git a/katrain/i18n/locales/de/LC_MESSAGES/katrain.po b/katrain/i18n/locales/de/LC_MESSAGES/katrain.po
index 1f56f40..1b83019 100644
--- a/katrain/i18n/locales/de/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/de/LC_MESSAGES/katrain.po
@@ -814,8 +814,3 @@ msgstr "Expand/Collapse"
 msgid "analysis:playtoend"
 msgstr "Fast playout to game end"
 
-#. TODO - Status message
-msgid "playtoend:status"
-msgstr ""
-"Playing the game quickly to the end, please wait ... {num_moves} moves "
-"played."
diff --git a/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo
index b13f739d4ba8cc5895a3b3901e3c2ca8cfa1eab0..b21422bafb28e696957b881452457134de5ee46c 100644
GIT binary patch
delta 3544
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

delta 3654
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
Uib|bUn33Vl%Jfvbi5|cI0B;R^mH+?%

diff --git a/katrain/i18n/locales/en/LC_MESSAGES/katrain.po b/katrain/i18n/locales/en/LC_MESSAGES/katrain.po
index 935d239..40971e8 100644
--- a/katrain/i18n/locales/en/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/en/LC_MESSAGES/katrain.po
@@ -122,12 +122,6 @@ msgstr ""
 msgid "analysis:playtoend"
 msgstr "Fast playout to game end"
 
-#. Status message
-msgid "playtoend:status"
-msgstr ""
-"Playing the game quickly to the end, please wait ... {num_moves} moves "
-"played."
-
 #. Keep improving current position analysis when there is nothing else to do
 msgid "analysis:continuous"
 msgstr "Toggle continuous analysis"
diff --git a/katrain/i18n/locales/es/LC_MESSAGES/katrain.po b/katrain/i18n/locales/es/LC_MESSAGES/katrain.po
index c3bc833..c7fdd84 100644
--- a/katrain/i18n/locales/es/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/es/LC_MESSAGES/katrain.po
@@ -821,8 +821,3 @@ msgstr "Expand/Collapse"
 msgid "analysis:playtoend"
 msgstr "Fast playout to game end"
 
-#. TODO - Status message
-msgid "playtoend:status"
-msgstr ""
-"Playing the game quickly to the end, please wait ... {num_moves} moves "
-"played."
diff --git a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po
index e65855d..d0f5097 100644
--- a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po
@@ -847,9 +847,3 @@ msgstr "Expand/Collapse"
 #. TODO - Menu option
 msgid "analysis:playtoend"
 msgstr "Fast playout to game end"
-
-#. TODO - Status message
-msgid "playtoend:status"
-msgstr ""
-"Playing the game quickly to the end, please wait ... {num_moves} moves "
-"played."
diff --git a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po
index b0e571a..bc164b3 100644
--- a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po
@@ -804,9 +804,3 @@ msgstr "Expand/Collapse"
 #. TODO - Menu option
 msgid "analysis:playtoend"
 msgstr "Fast playout to game end"
-
-#. TODO - Status message
-msgid "playtoend:status"
-msgstr ""
-"Playing the game quickly to the end, please wait ... {num_moves} moved "
-"played.moves played."
diff --git a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po
index e309685..b96207c 100644
--- a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po
@@ -775,8 +775,3 @@ msgstr "Expand/Collapse"
 msgid "analysis:playtoend"
 msgstr "Fast playout to game end"
 
-#. TODO - Status message
-msgid "playtoend:status"
-msgstr ""
-"Playing the game quickly to the end, please wait ... {num_moves} moves "
-"played."
diff --git a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po
index 4d6d839..41d000d 100644
--- a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po
@@ -811,8 +811,3 @@ msgstr "Expand/Collapse"
 msgid "analysis:playtoend"
 msgstr "Fast playout to game end"
 
-#. TODO - Status message
-msgid "playtoend:status"
-msgstr ""
-"Playing the game quickly to the end, please wait ... {num_moves} moves "
-"played."