-
-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #26 from sachaos/feature/fix-col-width-bug
Use correct column size and run on PTY option
- Loading branch information
Showing
8 changed files
with
191 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // +build !windows | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "io" | ||
| "time" | ||
|
|
||
| "github.com/creack/pty" | ||
| ) | ||
|
|
||
| func (s *Snapshot) run(finishedQueue chan<- int64, width int, isPty bool) error { | ||
| s.start = time.Now() | ||
| defer func() { | ||
| s.end = time.Now() | ||
| }() | ||
|
|
||
| var b, eb bytes.Buffer | ||
|
|
||
| commands := []string{s.command} | ||
| commands = append(commands, s.args...) | ||
|
|
||
| command := s.prepareCommand(commands) | ||
| command.Stderr = &eb | ||
|
|
||
| if isPty { | ||
| pty, err := pty.StartWithSize(command, &pty.Winsize{ | ||
| Cols: uint16(width), | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| go func() { | ||
| _, _ = io.Copy(&b, pty) | ||
| }() | ||
| } else { | ||
| command.Stdout = &b | ||
| if err := command.Start(); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| go func() { | ||
| if err := command.Wait(); err != nil { | ||
| s.err = err | ||
| } | ||
|
|
||
| s.result = b.Bytes() | ||
| s.errorResult = eb.Bytes() | ||
| s.exitCode = command.ProcessState.ExitCode() | ||
| s.completed = true | ||
| finishedQueue <- s.id | ||
| close(s.finish) | ||
| }() | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // +build windows | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "time" | ||
| ) | ||
|
|
||
| //nolint:unparam | ||
| func (s *Snapshot) run(finishedQueue chan<- int64, width int, isPty bool) error { | ||
| s.start = time.Now() | ||
| defer func() { | ||
| s.end = time.Now() | ||
| }() | ||
|
|
||
| var b, eb bytes.Buffer | ||
|
|
||
| commands := []string{s.command} | ||
| commands = append(commands, s.args...) | ||
|
|
||
| command := s.prepareCommand(commands) | ||
| command.Stderr = &eb | ||
| command.Stdout = &b | ||
|
|
||
| err := command.Start() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| go func() { | ||
| if err := command.Wait(); err != nil { | ||
| s.err = err | ||
| } | ||
|
|
||
| s.result = b.Bytes() | ||
| s.errorResult = eb.Bytes() | ||
| s.exitCode = command.ProcessState.ExitCode() | ||
| s.completed = true | ||
| finishedQueue <- s.id | ||
| close(s.finish) | ||
| }() | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.