sdk log output

Author: jakubmisek

src/Peachpie.NET.Sdk/BuildTask.cs

@@ -384,6 +384,19 @@ public override bool Execute()
                 UseShellExecute = false,
             };
 
+            var output = new DataReceivedEventHandler((o, e) =>
+            {
+                if (e.Data != null)
+                {
+                    if (this.Log.LogMessageFromText(e.Data, MessageImportance.High) == false)
+                    {
+                        // plain text
+                        this.Log.LogMessage(MessageImportance.High, e.Data);
+                        Console.WriteLine(e.Data);
+                    }
+                }
+            });
+
             // non-windows?
             if (Environment.OSVersion.Platform != PlatformID.Win32NT)
             {
@@ -392,29 +405,35 @@ public override bool Execute()
             }
 
             //
-            var process = Process.Start(pi);
-            var dataReceived = new DataReceivedEventHandler((o, e) =>
+            this.Log.LogCommandLine(MessageImportance.High, $"{pi.FileName} {pi.Arguments}");
+
+            //
+            using (var process = new Process() { StartInfo = pi, })
             {
-                this.Log.LogMessageFromText(e.Data, MessageImportance.High);
-            });
+                process.OutputDataReceived += output;
+                process.ErrorDataReceived += output;
 
-            process.OutputDataReceived += dataReceived;
-            process.ErrorDataReceived += dataReceived;
+                process.Start();
+                
+                process.BeginOutputReadLine();
+                process.BeginErrorReadLine();
 
-            using (var cancellationHandler = cancellation.Register(() =>
-            {
-                if (process.HasExited == false)
+                //
+                using (var cancellationHandler = cancellation.Register(() =>
+                {
+                    if (process.HasExited == false)
+                    {
+                        this.Log.LogMessageFromText("Cancelled by user", MessageImportance.High);
+                        // TODO: send signal first
+                        process.Kill();
+                    }
+                }))
                 {
-                    this.Log.LogMessageFromText("Cancelled by user", MessageImportance.High);
-                    // TODO: send signal first
-                    process.Kill();
+                    process.WaitForExit();
+
+                    //
+                    return process.ExitCode == 0;
                 }
-            }))
-            {
-                process.WaitForExit();
-                process.StandardOutput.ReadToEnd();
-                //
-                return process.ExitCode == 0;
             }
         }
 
@@ -464,8 +483,8 @@ static string FlatternArgs(string[] args)
                 // sanitize {arg}
                 sb.Append('\"');
                 sb.Append(arg.Trim()
-                    //.Replace("\\", "\\\\")
-                    //.Replace("\"", "\\\"")
+                //.Replace("\\", "\\\\")
+                //.Replace("\"", "\\\"")
                 );
                 sb.Append('\"');
             }
@@ -530,77 +549,5 @@ bool HasDebugPlus
                 return false;
             }
         }
-
-        // honestly I don't know why msbuild in VS does not handle Console.Output,
-        // so we have our custom TextWriter that we pass to Log
-        sealed class LogWriter : TextWriter
-        {
-            TaskLoggingHelper Log { get; }
-
-            StringBuilder Buffer { get; } = new StringBuilder();
-
-            public override Encoding Encoding => Encoding.UTF8;
-
-            public LogWriter(TaskLoggingHelper log)
-            {
-                Debug.Assert(log != null);
-
-                this.Log = log;
-                this.NewLine = "\n";
-            }
-
-            bool TryLogCompleteMessage()
-            {
-                string line = null;
-
-                lock (Buffer)   // accessed in parallel
-                {
-                    // get line from the buffer:
-                    for (int i = 0; i < Buffer.Length; i++)
-                    {
-                        if (Buffer[i] == '\n')
-                        {
-                            line = Buffer.ToString(0, i);
-
-                            Buffer.Remove(0, i + 1);
-                        }
-                    }
-                }
-
-                //
-                return line != null && LogCompleteMessage(line);
-            }
-
-            bool LogCompleteMessage(string line)
-            {
-                // TODO: following logs only Warnings and Errors,
-                // to log Info diagnostics properly, parse it by ourselves
-
-                return this.Log.LogMessageFromText(line.Trim(), MessageImportance.High);
-            }
-
-            public override void Write(char value)
-            {
-                lock (Buffer) // accessed in parallel
-                {
-                    Buffer.Append(value);
-                }
-
-                if (value == '\n')
-                {
-                    TryLogCompleteMessage();
-                }
-            }
-
-            public override void Write(string value)
-            {
-                lock (Buffer)
-                {
-                    Buffer.Append(value);
-                }
-
-                TryLogCompleteMessage();
-            }
-        }
     }
 }