Skip to content

-color=nerver args and batch suport long lines with the caret (^) #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hymkor merged 2 commits into from
Apr 2, 2021
Merged

-color=nerver args and batch suport long lines with the caret (^) #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc6148
support multi line caret '^' character for bat
a690700752 Mar 24, 2021
2390b73
support color args
a690700752 Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"bufio"
"bytes"
"context"
"errors"
"flag"
Expand All @@ -22,16 +23,17 @@ import (
"github.com/zetamatta/go-console/typekeyas"
)

const (
var (
escEcho = "\x1B[40;31;1m"
escSend = "\x1B[40;35;1m"
escSpawn = "\x1B[40;32;1m"
escEnd = "\x1B[37;1m"
)

var (
eOption = flag.String("e", "", "execute string")
xOption = flag.Bool("x", false, "obsoluted option. Lines startings with '@' are always skipped.")
eOption = flag.String("e", "", "execute string")
xOption = flag.Bool("x", false, "obsoluted option. Lines startings with '@' are always skipped.")
colorOption = flag.String("color", "always", "colorize the output; can be 'always' (default if omitted), 'auto', or 'never'.")
)

var conIn consoleinput.Handle
Expand Down Expand Up @@ -198,17 +200,21 @@ func DoFileExceptForAtmarkLines(L *lua.LState, fname string) (err error) {
}

br := bufio.NewReader(fd)
keepComment := false
in := transform.NewTransformer(func() ([]byte, error) {
bin, err := br.ReadBytes('\n')
if err != nil {
fd.Close()
return nil, err
}
if len(bin) > 0 && bin[0] == '@' {
if keepComment || (len(bin) > 0 && bin[0] == '@') {
rc := make([]byte, 0, len(bin)+2)
rc = append(rc, '-')
rc = append(rc, '-')
rc = append(rc, bin...)

trim := bytes.TrimRight(bin, "\r\n")
keepComment = len(trim) > 0 && bin[len(trim)-1] == '^'
return rc, nil
}
return bin, nil
Expand All @@ -232,6 +238,13 @@ func mains() error {
return fmt.Errorf("Usage: %s xxxx.lua", os.Args[0])
}

if *colorOption == "never" {
escEcho = ""
escSend = ""
escSpawn = ""
escEnd = ""
}

var err error
conIn = consoleinput.New()
defer conIn.Close()
Expand Down