Skip to content

Commit

Permalink
di: flags, streams
Browse files Browse the repository at this point in the history
  • Loading branch information
@itayd
itayd committed May 24, 2022
1 parent ebe116c commit 3be48f7
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 65 deletions.
31 changes: 16 additions & 15 deletions apply.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ import (
"github.com/urfave/cli/v2"
)

var applyFlags = struct {
print bool
nowd bool
bak string
}{}
type applyFlags struct {
print, nowd bool
bak string
}

var cliApplyFlags applyFlags

var applyCmd = cli.Command{
Name: "apply",
Expand All @@ -26,27 +27,27 @@ var applyCmd = cli.Command{
&cli.BoolFlag{
Name: "print",
Aliases: []string{"p"},
Destination: &applyFlags.print,
Destination: &cliApplyFlags.print,
Usage: "print each incoming line",
},
&cli.StringFlag{
Name: "bak",
Aliases: []string{"i"},
Destination: &applyFlags.bak,
Destination: &cliApplyFlags.bak,
Usage: "if not empty, backup originals with given suffix",
},
&cli.BoolFlag{
Name: "nowd",
Destination: &applyFlags.nowd,
Destination: &cliApplyFlags.nowd,
Usage: "ignore wd comment",
},
},
Action: func(c *cli.Context) error {
return processReplaceInput(os.Stdin)
return apply(cliApplyFlags, os.Stdin)
},
}

func processReplaceInput(r io.Reader) error {
func apply(flags applyFlags, r io.Reader) error {
s := bufio.NewScanner(r)

acc := struct {
Expand All @@ -61,7 +62,7 @@ func processReplaceInput(r io.Reader) error {
return nil
}

if err := apply(acc.path, acc.data); err != nil {
if err := apply1(flags, acc.path, acc.data); err != nil {
return fmt.Errorf("%s: %w", acc.path, err)
}

Expand All @@ -74,7 +75,7 @@ func processReplaceInput(r io.Reader) error {
for i := 0; s.Scan(); i++ {
text := strings.TrimLeft(s.Text(), " \t")

if !applyFlags.nowd && strings.HasPrefix(text, wdprefix) {
if !flags.nowd && strings.HasPrefix(text, wdprefix) {
expectedwd := text[len(wdprefix):]

wd, err := os.Getwd()
Expand All @@ -93,7 +94,7 @@ func processReplaceInput(r io.Reader) error {
continue
}

if applyFlags.print {
if flags.print {
fmt.Fprintln(os.Stderr, text)
}

Expand Down Expand Up @@ -128,13 +129,13 @@ func processReplaceInput(r io.Reader) error {
}

// TODO: all contents is read into memory. Need to do it piecewise.
func apply(path string, data map[int]string) error {
func apply1(flags applyFlags, path string, data map[int]string) error {
content, err := os.ReadFile(path)
if err != nil {
return fmt.Errorf("%s: %w", path, err)
}

if bak := applyFlags.bak; len(bak) > 0 {
if bak := flags.bak; len(bak) > 0 {
if err := os.WriteFile(path+bak, content, 0755); err != nil {
return fmt.Errorf("backup %s%s: %w", path, bak, err)
}
Expand Down
99 changes: 49 additions & 50 deletions collect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,12 @@ import (

const wdprefix = "# wd="

var collectFlags = struct {
exts cli.StringSlice
regexs cli.StringSlice
strs cli.StringSlice
print bool
bin bool
recursive bool
abs bool
nowd bool
}{}
type collectFlags struct {
exts, regexs, strs cli.StringSlice
print, bin, recursive, abs, nowd bool
}

var cliCollectFlags collectFlags

var collectCmd = cli.Command{
Name: "collect",
Expand All @@ -38,88 +34,91 @@ var collectCmd = cli.Command{
&cli.BoolFlag{
Name: "print",
Aliases: []string{"p"},
Destination: &collectFlags.print,
Destination: &cliCollectFlags.print,
Usage: "print matched files to stderr",
},
&cli.BoolFlag{
Name: "recursive",
Aliases: []string{"r"},
Destination: &collectFlags.recursive,
Destination: &cliCollectFlags.recursive,
Usage: "process subdirectories recursively",
},
&cli.StringSliceFlag{
Name: "ext",
Aliases: []string{"x"},
Destination: &collectFlags.exts,
Destination: &cliCollectFlags.exts,
Usage: "only process files with extention",
},
&cli.StringSliceFlag{
Name: "regex",
Aliases: []string{"e"},
Destination: &collectFlags.regexs,
Destination: &cliCollectFlags.regexs,
Usage: "filter content for regexp",
},
&cli.StringSliceFlag{
Name: "str",
Aliases: []string{"s"},
Destination: &collectFlags.strs,
Destination: &cliCollectFlags.strs,
Usage: "filter content for strings",
},
&cli.BoolFlag{
Name: "bin",
Destination: &collectFlags.bin,
Destination: &cliCollectFlags.bin,
Usage: "also search in binary files",
},
&cli.BoolFlag{
Name: "abs",
Aliases: []string{"a"},
Destination: &collectFlags.abs,
Destination: &cliCollectFlags.abs,
Usage: "write all file's absolute paths",
},
&cli.BoolFlag{
Name: "nowd",
Destination: &collectFlags.nowd,
Destination: &cliCollectFlags.nowd,
Usage: "supress working directory comment",
},
},
Action: func(c *cli.Context) error {
m, err := matcher()
if err != nil {
return err
}
return collect(os.Stdout, os.Stderr, cliCollectFlags, c.Args().Slice())
},
}

if !collectFlags.abs && !collectFlags.nowd {
cwd, err := os.Getwd()
if err != nil {
return fmt.Errorf("getwd: %w", err)
}
func collect(wout, werr io.Writer, flags collectFlags, args []string) error {
m, err := matcher(flags)
if err != nil {
return err
}

fmt.Printf("%s%s\n", wdprefix, cwd)
if !flags.abs && !flags.nowd {
cwd, err := os.Getwd()
if err != nil {
return fmt.Errorf("getwd: %w", err)
}

args := c.Args().Slice()
if len(args) == 0 {
return gather("", ".", m)
}
fmt.Fprintf(wout, "%s%s\n", wdprefix, cwd)
}

for _, arg := range args {
if err := gather("", arg, m); err != nil {
return err
}
if len(args) == 0 {
return gather(wout, werr, flags, "", ".", m)
}

for _, arg := range args {
if err := gather(wout, werr, flags, "", arg, m); err != nil {
return err
}
}

return nil
},
return nil
}

func matcher() (func(string) bool, error) {
func matcher(flags collectFlags) (func(string) bool, error) {
var ms []func(string) bool

for _, s := range collectFlags.strs.Value() {
for _, s := range flags.strs.Value() {
ms = append(ms, func(x string) bool { return strings.Contains(x, s) })
}

for _, s := range collectFlags.regexs.Value() {
for _, s := range flags.regexs.Value() {
re, err := regexp.Compile(s)
if err != nil {
return nil, fmt.Errorf("matcher %q: %w", s, err)
Expand All @@ -143,7 +142,7 @@ func matcher() (func(string) bool, error) {
}, nil
}

func gather(prev, path string, matcher func(string) bool) error {
func gather(wout, werr io.Writer, flags collectFlags, prev, path string, matcher func(string) bool) error {
f, err := os.OpenFile(path, os.O_RDONLY, 0)
if err != nil {
return fmt.Errorf("open %s: %w", path, err)
Expand All @@ -157,7 +156,7 @@ func gather(prev, path string, matcher func(string) bool) error {
}

if fi.IsDir() {
if prev != "" && !collectFlags.recursive {
if prev != "" && !flags.recursive {
return nil
}

Expand All @@ -167,7 +166,7 @@ func gather(prev, path string, matcher func(string) bool) error {
}

for _, name := range names {
if err := gather(path, filepath.Join(path, name), matcher); err != nil {
if err := gather(wout, werr, flags, path, filepath.Join(path, name), matcher); err != nil {
return err
}
}
Expand All @@ -179,7 +178,7 @@ func gather(prev, path string, matcher func(string) bool) error {
return nil
}

if exts := collectFlags.exts.Value(); len(exts) > 0 {
if exts := flags.exts.Value(); len(exts) > 0 {
ext := filepath.Ext(path)
if len(ext) > 0 && ext[0] == '.' {
ext = ext[1:]
Expand All @@ -192,7 +191,7 @@ func gather(prev, path string, matcher func(string) bool) error {

var r io.Reader = f

if !collectFlags.bin {
if !flags.bin {
pre := make([]byte, 32)
n, err := f.Read(pre)
if err != nil && err != io.EOF {
Expand All @@ -208,7 +207,7 @@ func gather(prev, path string, matcher func(string) bool) error {
r = io.MultiReader(bytes.NewReader(pre), f)
}

if collectFlags.abs {
if flags.abs {
apath, err := filepath.Abs(path)
if err != nil {
return fmt.Errorf("abs %s: %w", path, err)
Expand All @@ -217,15 +216,15 @@ func gather(prev, path string, matcher func(string) bool) error {
path = apath
}

if collectFlags.print {
fmt.Fprintln(os.Stderr, path)
if flags.print {
fmt.Fprintln(werr, path)
}

s := bufio.NewScanner(r)
for lineNum := 1; s.Scan(); lineNum++ {

if text := s.Text(); matcher(text) {
fmt.Printf("%s:%d:%s\n", path, lineNum, text)
fmt.Fprintf(wout, "%s:%d:%s\n", path, lineNum, text)
}
}

Expand Down

0 comments on commit 3be48f7

Please sign in to comment.