fix: fixes log writer handling with interactive commands

Author: nxtcoder17

runner/run-task.go

@@ -1,7 +1,6 @@
 package runner
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -11,8 +10,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/alecthomas/chroma/v2/quick"
-	"github.com/charmbracelet/lipgloss"
+	// "github.com/alecthomas/chroma/v2/quick"
+	// "github.com/charmbracelet/lipgloss"
 	"github.com/muesli/termenv"
 	"github.com/nxtcoder17/fwatcher/pkg/executor"
 	"github.com/nxtcoder17/fwatcher/pkg/watcher"
@@ -54,35 +53,35 @@ func isTTY() bool {
 	return ((stdout.Mode() & os.ModeCharDevice) == os.ModeCharDevice) && ((stderr.Mode() & os.ModeCharDevice) == os.ModeCharDevice)
 }
 
-func printCommand(writer io.Writer, prefix, lang, cmd string) {
-	if isTTY() {
-		borderColor := "#4388cc"
-		if !isDarkTheme() {
-			borderColor = "#3d5485"
-		}
-		s := lipgloss.NewStyle().BorderForeground(lipgloss.Color(borderColor)).PaddingLeft(1).PaddingRight(1).Border(lipgloss.RoundedBorder(), true, true, true, true)
-		// labelStyle := lipgloss.NewStyle().Foreground(lipgloss.Color(borderColor)).Blink(true)
-
-		hlCode := new(bytes.Buffer)
-		// choose colorschemes from `https://swapoff.org/chroma/playground/`
-		colorscheme := "catppuccin-macchiato"
-		if !isDarkTheme() {
-			colorscheme = "monokailight"
-		}
-		_ = colorscheme
-		// quick.Highlight(hlCode, strings.TrimSpace(command.Command), "bash", "terminal16m", colorscheme)
-
-		cmdStr := strings.TrimSpace(cmd)
-
-		quick.Highlight(hlCode, cmdStr, lang, "terminal16m", colorscheme)
-		// cst := styles.Get("gruvbox")
-		// fmt.Println("cst: ", cst.Name, styles.Fallback.Name, styles.Names())
-
-		// fmt.Printf("%s\n", s.Render(args.taskName+" | "+hlCode.String()))
-		fmt.Fprintf(writer, "%s\n", s.Render(padString(hlCode.String(), prefix)))
-	}
+func hasANSISupport() bool {
+	term := os.Getenv("TERM")
+	return strings.Contains(term, "xterm") || strings.Contains(term, "screen") || strings.Contains(term, "vt100")
 }
 
+// func printCommand(writer io.Writer, prefix, lang, cmd string) {
+// 	if isTTY() {
+// 		borderColor := "#4388cc"
+// 		if !isDarkTheme() {
+// 			borderColor = "#3d5485"
+// 		}
+// 		s := lipgloss.NewStyle().BorderForeground(lipgloss.Color(borderColor)).PaddingLeft(1).PaddingRight(1).Border(lipgloss.RoundedBorder(), true, true, true, true)
+//
+// 		hlCode := new(bytes.Buffer)
+// 		// choose colorschemes from `https://swapoff.org/chroma/playground/`
+// 		colorscheme := "catppuccin-macchiato"
+// 		if !isDarkTheme() {
+// 			colorscheme = "monokailight"
+// 		}
+// 		_ = colorscheme
+//
+// 		cmdStr := strings.TrimSpace(cmd)
+//
+// 		quick.Highlight(hlCode, cmdStr, lang, "terminal16m", colorscheme)
+//
+// 		fmt.Fprintf(writer, "\r%s%s\n", s.Render(padString(hlCode.String(), prefix)), s.UnsetBorderStyle())
+// 	}
+// }
+
 type CreateCommandGroupArgs struct {
 	Runfile *types.ParsedRunfile
 	Task    *types.ParsedTask
@@ -141,16 +140,24 @@ func createCommandGroups(ctx Context, args CreateCommandGroupArgs) ([]executor.C
 						}
 					}
 
-					printCommand(args.Stdout.WithPrefix(""), strings.Join(args.Trail, "/"), "bash", strings.Join(commandsList, "\n"))
-
 					return CreateCommand(ctx, CmdArgs{
 						Shell:       args.Task.Shell,
 						Env:         fn.ToEnviron(args.Task.Env),
 						Cmd:         *cmd.Command,
 						WorkingDir:  args.Task.WorkingDir,
 						interactive: args.Task.Interactive,
-						Stdout:      args.Stdout.WithPrefix(strings.Join(args.Trail, "/")),
-						Stderr:      args.Stderr.WithPrefix(strings.Join(args.Trail, "/")),
+						Stdout: func() io.Writer {
+							if args.Task.Interactive {
+								return os.Stdout
+							}
+							return args.Stdout.WithPrefix(args.Task.Name)
+						}(),
+						Stderr: func() io.Writer {
+							if args.Task.Interactive {
+								return os.Stderr
+							}
+							return args.Stderr.WithPrefix(args.Task.Name)
+						}(),
 					})
 				})
 

runner/writer.go

@@ -37,7 +37,7 @@ func (s *LogWriter) WithPrefix(prefix string) io.Writer {
 	s.wg.Add(1)
 	go func() {
 		defer s.wg.Done()
-		copyStream(prefix, s.w, pr)
+		copyStreamLineByLine(prefix, s.w, pr)
 	}()
 	return &LineWriter{w: pw}
 }
@@ -46,22 +46,33 @@ func (s *LogWriter) Wait() {
 	s.wg.Wait()
 }
 
-func copyStream(prefix string, dest io.Writer, src io.Reader) {
+const (
+	Reset = "\033[0m"
+	Bold  = "\033[1m"
+	Green = "\033[32m"
+)
+
+func copyStreamLineByLine(prefix string, dest io.Writer, src io.Reader) {
+	hasPrefix := prefix != ""
+	if hasPrefix && hasANSISupport() {
+		prefix = fmt.Sprintf("%s[%s]%s ", Green, prefix, Reset)
+		// prefix = fmt.Sprintf("%s%s |%s ", Green, prefix, Reset)
+	}
 	r := bufio.NewReader(src)
 	for {
 		b, err := r.ReadBytes('\n')
 		if err != nil {
 			if errors.Is(err, io.EOF) {
-				if prefix != "" {
-					dest.Write([]byte(fmt.Sprintf("[%s] ", prefix)))
+				if hasPrefix {
+					dest.Write([]byte(prefix))
 				}
 				dest.Write(b)
 				return
 			}
 		}
 
-		if prefix != "" {
-			dest.Write([]byte(fmt.Sprintf("[%s] ", prefix)))
+		if hasPrefix {
+			dest.Write([]byte(prefix))
 		}
 		dest.Write(b)
 	}