Changeset 5996

Timestamp:

Aug 26, 2020, 7:45:23 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #1263: The ScriptBuilder? API should perform simple indentation automatically

Indentation is now automatically performed for the following commands: if, elif, else, case, while, until, for

File:

• extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/ScriptBuilder.java (modified) (9 diffs)

extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/ScriptBuilder.java

@@ -1 +1 @@
 package net.sf.basedb.opengrid;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 
@@ -18 +22 @@
   private Map<String, String> bgProcesses;
   
+  private int indentLevel;
+  private String indentString;
+  private Set<String> autoIndent;
+  private Set<String> autoUnindent;
   
   /**
@@ -39 +47 @@
     this.script = new StringBuilder();
     this.logFolder = logFolder == null ? "${WD}" : logFolder;
+    this.indentLevel = 0;
+    this.indentString = "";
+    this.autoIndent = new HashSet<String>(Arrays.asList("if", "elif", "else", "case", "while", "until", "for"));
+    this.autoUnindent = new HashSet<String>(Arrays.asList("elif", "else", "fi", "esac", "done"));
   }
 
@@ -47 +59 @@
   public void comment(String comment)
   {
-    script.append("# ").append(comment).append("\n");
+    script.append(indentString).append("# ").append(comment).append("\n");
   }
   
@@ -64 +76 @@
   public void time(String comment)
   {
-    script.append("echo \"`date +%H:%M:%S` ").append(comment).append("\" >> ").append(logFolder).append("/time.log\n");
+    script.append(indentString).append("echo \"`date +%H:%M:%S` ").append(comment).append("\" >> ").append(logFolder).append("/time.log\n");
   }
   
@@ -74 +86 @@
   public void progress(int progress, String status)
   {
-    script.append("echo ").append(progress).append(" \"").append(status).append("\" > ").append(logFolder).append("/progress\n");
+    script.append(indentString).append("echo ").append(progress).append(" \"").append(status).append("\" > ").append(logFolder).append("/progress\n");
   }
   
@@ -82 +94 @@
   public void cmd(String cmd)
   {
-    script.append(cmd).append("\n");
+    checkIndent(cmd, autoUnindent, -1);
+    script.append(indentString).append(cmd).append("\n");
+    checkIndent(cmd, autoIndent, 1);
+  }
+  
+  /**
+    If cmd starts with one of the given keys, apply delta to the
+    indentation level and create a new indent-string.
+  */
+  private void checkIndent(String cmd, Collection<String> keys, int delta)
+  {
+    for (String k : keys)
+    {
+      if (cmd.startsWith(k)) 
+      {
+        indentLevel = Math.max(0, indentLevel+delta);
+        indentString = " ".repeat(indentLevel*3);
+        return;
+      }
+    }
   }
   
@@ -105 +136 @@
     nextBgPid++;
     bgProcesses.put(pid, cmd);
-    script.append(cmd).append(" &\n");
-    script.append(pid).append("=$!\n");
+    script.append(indentString).append(cmd).append(" &\n");
+    script.append(indentString).append(pid).append("=$!\n");
     return pid;
   }
@@ -142 +173 @@
     }
     bgProcesses.remove(pid);
-    script.append("wait $").append(pid).append("\n");
+    script.append(indentString).append("wait $").append(pid).append("\n");
   }