Quick hack to support featurecat#785 (<nickname> before the engine co…

…mmand)
kaorahi · Oct 17, 2020 · bf96dcc · bf96dcc
1 parent ebeb446
commit bf96dcc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
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,6 +129,14 @@ public Leelaz(String engineCommand) throws JSONException {
       // substitute in the weights file
       engineCommand = engineCommand.replaceAll("%network-file", config.getString("network-file"));
     }
+    Matcher nicknameMatcher = Pattern.compile("<([^<]*)>\\s*(.*)").matcher(engineCommand);
+    if (nicknameMatcher.matches()) {
+      engineNickname = nicknameMatcher.group(1);
+      engineCommand = nicknameMatcher.group(2);
+    } else {
+      engineNickname = null;
+    }
+
     this.engineCommand = engineCommand;
     if (engineCommand.toLowerCase().contains("override-version")) {
       this.isKataGo = true;
@@ -987,6 +996,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
@@ -761,6 +761,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,7 +1385,7 @@ public void updateEngineMenu(List<Leelaz> engineList) {
       Leelaz engineDt = engineList.get(i);
       if (engineDt != null) {
         if (engineDt.currentWeight() != "")
-          engine[i].setText(engine[i].getText() + " : " + engineDt.currentWeight());
+          engine[i].setText(engine[i].getText() + " : " + engineDt.nicknameOrcurrentWeight());
         engine[i].setVisible(true);
         int a = i;
         engine[i].addActionListener(