Merge featurecat#787 (squashed): <nickname> before the engine command

commit 8bf2209 Author: Hiraoka <[email protected]> Date: Mon Oct 19 21:32:00 2020 +0900 fixup commit 33cb711 Author: Hiraoka <[email protected]> Date: Sun Oct 18 00:05:28 2020 +0900 fixup commit bf96dcc Author: Hiraoka <[email protected]> Date: Sat Oct 17 23:55:27 2020 +0900 Quick hack to support featurecat#785 (<nickname> before the engine command)
kaorahi · Oct 24, 2020 · 3ae2d96 · 3ae2d96
1 parent 36183e6
commit 3ae2d96
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/main/java/featurecat/lizzie/analysis/Leelaz.java b/src/main/java/featurecat/lizzie/analysis/Leelaz.java
@@ -78,6 +78,7 @@ public class Leelaz {
 
   // for Multiple Engine
   private String engineCommand;
+  private String engineNickname;
   private List<String> commands;
   private JSONObject config;
   private String currentWeightFile = "";
@@ -128,7 +129,8 @@ public Leelaz(String engineCommand) throws JSONException {
       // substitute in the weights file
       engineCommand = engineCommand.replaceAll("%network-file", config.getString("network-file"));
     }
-    this.engineCommand = engineCommand;
+    updateEngineCommandAndNickname(engineCommand);
+    engineCommand = this.engineCommand;
     if (engineCommand.toLowerCase().contains("override-version")) {
       this.isKataGo = true;
     }
@@ -949,7 +951,8 @@ public List<String> splitCommand(String commandLine) {
   }
 
   public boolean isCommandChange(String command) {
-    List<String> newList = splitCommand(command);
+    updateEngineCommandAndNickname(command);
+    List<String> newList = splitCommand(engineCommand);
     if (this.commands.size() != newList.size()) {
       engineIndex++;
       return true;
@@ -967,6 +970,17 @@ public boolean isCommandChange(String command) {
     }
   }
 
+  private void updateEngineCommandAndNickname(String command) {
+    Matcher nicknameMatcher = Pattern.compile("<(.*?)>\\s*(.*)").matcher(command);
+    if (nicknameMatcher.matches()) {
+      engineNickname = nicknameMatcher.group(1);
+      engineCommand = nicknameMatcher.group(2);
+    } else {
+      engineNickname = null;
+      engineCommand = command;
+    }
+  }
+
   public boolean isStarted() {
     return started;
   }
@@ -990,6 +1004,10 @@ public boolean supportScoremean() {
     return isKataGo || supportScoremean;
   }
 
+  public String nicknameOrCurrentWeight() {
+    return (engineNickname == null) ? currentWeight : engineNickname;
+  }
+
   public String currentWeight() {
     return currentWeight;
   }

diff --git a/src/main/java/featurecat/lizzie/gui/ConfigDialog.java b/src/main/java/featurecat/lizzie/gui/ConfigDialog.java
@@ -757,6 +757,9 @@ protected DocumentFilter getDocumentFilter() {
                     txts[i].setText(a.getString(i));
                   });
         });
+    Arrays.asList(txts)
+        .stream()
+        .forEach(t -> t.setToolTipText("Engine Command or <Label> Engine Command"));
 
     chkPreloads =
         new JCheckBox[] {

diff --git a/src/main/java/featurecat/lizzie/gui/Menu.java b/src/main/java/featurecat/lizzie/gui/Menu.java
@@ -1385,8 +1385,8 @@ public void updateEngineMenu(List<Leelaz> engineList) {
       engine[i].setVisible(false);
       Leelaz engineDt = engineList.get(i);
       if (engineDt != null) {
-        if (engineDt.currentWeight() != "")
-          engine[i].setText(engine[i].getText() + " : " + engineDt.currentWeight());
+        if (engineDt.nicknameOrCurrentWeight() != "")
+          engine[i].setText(engine[i].getText() + " : " + engineDt.nicknameOrCurrentWeight());
         engine[i].setVisible(true);
         int a = i;
         engine[i].addActionListener(