Merge pull request #4288 from arduino/builder-log-levels

arduino-builder uses log levels

Author: ffissore

app/test/cc/arduino/i18n/ExternalProcessOutputParserTest.java

@@ -92,4 +92,29 @@ public void testParser5() throws Exception {
     assertEquals("", args[0]);
   }
 
+  @Test
+  public void testParser6() throws Exception {
+    Map<String, Object> output = new ExternalProcessOutputParser().parse("===info ||| Progress {0} ||| [79.31]");
+
+    assertEquals("info", output.get("level"));
+    assertEquals("Progress {0}", output.get("msg"));
+    Object[] args = (Object[]) output.get("args");
+    assertEquals(1, args.length);
+    assertEquals("79.31", args[0]);
+  }
+
+  @Test
+  public void testParser7() throws Exception {
+    Map<String, Object> output = new ExternalProcessOutputParser().parse("===info ||| Using library {0} at version {1} in folder: {2} {3} ||| [Bridge 1.6.0 %2Fhome%2Ffederico%2Fmateriale%2Fworks_Arduino%2FArduino%2Fbuild%2Flinux%2Fwork%2Flibraries%2FBridge ]");
+
+    assertEquals("info", output.get("level"));
+    assertEquals("Using library {0} at version {1} in folder: {2} {3}", output.get("msg"));
+    Object[] args = (Object[]) output.get("args");
+    assertEquals(4, args.length);
+    assertEquals("Bridge", args[0]);
+    assertEquals("1.6.0", args[1]);
+    assertEquals("/home/federico/materiale/works_Arduino/Arduino/build/linux/work/libraries/Bridge", args[2]);
+    assertEquals("", args[3]);
+  }
+
 }

arduino-core/src/cc/arduino/Compiler.java

@@ -137,7 +137,7 @@ public String build(CompilerProgressListener progListener, boolean exportHex) th
 
     PreferencesMap prefs = loadPreferences(board, platform, aPackage, vidpid);
 
-    MessageConsumerOutputStream out = new MessageConsumerOutputStream(new ProgressAwareMessageConsumer(new I18NAwareMessageConsumer(System.out), progListener), "\n");
+    MessageConsumerOutputStream out = new MessageConsumerOutputStream(new ProgressAwareMessageConsumer(new I18NAwareMessageConsumer(System.out, System.err), progListener), "\n");
     MessageConsumerOutputStream err = new MessageConsumerOutputStream(new I18NAwareMessageConsumer(System.err, Compiler.this), "\n");
 
     callArduinoBuilder(board, platform, aPackage, vidpid, BuilderAction.COMPILE, new PumpStreamHandler(out, err));

arduino-core/src/cc/arduino/ProgressAwareMessageConsumer.java

@@ -48,7 +48,7 @@ public ProgressAwareMessageConsumer(MessageConsumer parent, CompilerProgressList
 
   @Override
   public void message(String s) {
-    if (s.startsWith("===Progress")) {
+    if (s.startsWith("===info ||| Progress") || s.startsWith("===Progress")) {
       Map<String, Object> parsedMessage = parser.parse(s);
       Object[] args = (Object[]) parsedMessage.get("args");
       progressListener.progress(Double.valueOf(args[0].toString()).intValue());

arduino-core/src/cc/arduino/i18n/ExternalProcessOutputParser.java

@@ -50,8 +50,12 @@ public Map<String, Object> parse(String s) {
 
     String[] parts = SPLIT.split(s);
 
-    output.put("msg", parts[0]);
-    output.put("args", parseArgs(parts[1]));
+    int idx = 0;
+    if (parts.length == 3) {
+      output.put("level", parts[idx++]);
+    }
+    output.put("msg", parts[idx++]);
+    output.put("args", parseArgs(parts[idx++]));
 
     return output;
   }

arduino-core/src/cc/arduino/i18n/I18NAwareMessageConsumer.java

@@ -39,16 +39,26 @@
 
 public class I18NAwareMessageConsumer implements MessageConsumer {
 
-  private final PrintStream ps;
+  private final PrintStream out;
+  private final PrintStream err;
   private final MessageConsumer parent;
   private final ExternalProcessOutputParser parser;
 
-  public I18NAwareMessageConsumer(PrintStream ps) {
-    this(ps, null);
+  public I18NAwareMessageConsumer(PrintStream out) {
+    this(out, out, null);
   }
 
-  public I18NAwareMessageConsumer(PrintStream ps, MessageConsumer parent) {
-    this.ps = ps;
+  public I18NAwareMessageConsumer(PrintStream out, MessageConsumer parent) {
+    this(out, out, parent);
+  }
+
+  public I18NAwareMessageConsumer(PrintStream out, PrintStream err) {
+    this(out, err, null);
+  }
+
+  public I18NAwareMessageConsumer(PrintStream out, PrintStream err, MessageConsumer parent) {
+    this.out = out;
+    this.err = err;
     this.parent = parent;
     this.parser = new ExternalProcessOutputParser();
   }
@@ -57,14 +67,19 @@ public I18NAwareMessageConsumer(PrintStream ps, MessageConsumer parent) {
   public void message(String s) {
     if (s.startsWith("===")) {
       Map<String, Object> parsedMessage = parser.parse(s);
-      ps.println(I18n.format(tr((String) parsedMessage.get("msg")), (Object[]) parsedMessage.get("args")));
+      String translatedMessage = I18n.format(tr((String) parsedMessage.get("msg")), (Object[]) parsedMessage.get("args"));
+      if (!parsedMessage.containsKey("level") || "".equals(parsedMessage.get("level")) || "info".equals(parsedMessage.get("level"))) {
+        out.println(translatedMessage);
+      } else {
+        err.println(translatedMessage);
+      }
       return;
     }
 
     if (parent != null) {
       parent.message(s);
     } else {
-      ps.println(s);
+      out.println(s);
     }
   }
 }

build/arduino-builder-linux32-1.3.6.tar.bz2.sha

@@ -0,0 +1 @@
+616acac0908c873b01b627a7902d4ffe454048bd

build/arduino-builder-linux32-1.3.7.tar.bz2.sha

@@ -0,0 +1 @@
+5b427ca5f56cd38ac90b0cf2beb236dde6d7e576

build/arduino-builder-linux64-1.3.6.tar.bz2.sha

@@ -0,0 +1 @@
+ae2c591c663ce417c03bd04cb119ae2bc721d379

build/arduino-builder-linux64-1.3.7.tar.bz2.sha

@@ -0,0 +1 @@
+6ec1252e3d8c5d7975b89eb221854ed3c0d7494f

build/arduino-builder-macosx-1.3.6.tar.bz2.sha

@@ -73,7 +73,7 @@
 
   <property name="portable" value="false" />
 
-  <property name="ARDUINO-BUILDER-VERSION" value="1.3.6" />
+  <property name="ARDUINO-BUILDER-VERSION" value="1.3.7" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">