-
Notifications
You must be signed in to change notification settings - Fork 294
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
wip: Show detect screen during detect phase
Signed-off-by: Anthony Emengo <aemengo@vmware.com>
- Loading branch information
Anthony Emengo
committed
Jul 26, 2021
1 parent
66a4f32
commit 55f34f3
Showing
16 changed files
with
362 additions
and
1 deletion.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "encoding/json" | ||
| "fmt" | ||
| "github.com/buildpacks/pack/internal/screen" | ||
| "io" | ||
| "os" | ||
| "os/exec" | ||
| "strings" | ||
| ) | ||
|
|
||
| func main() { | ||
| command := exec.Command(os.Args[1], os.Args[2:]...) | ||
|
|
||
| reader, err := start(command) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| err = command.Start() | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| err = handleOutput(reader) | ||
|
|
||
| err = command.Wait() | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| log(screen.NewEvent("EXPORT", "Ending")) | ||
| os.Exit(command.ProcessState.ExitCode()) | ||
| } | ||
|
|
||
| func log(evt screen.Event) { | ||
| data, _ := json.Marshal(evt) | ||
| fmt.Println(string(data)) | ||
| } | ||
|
|
||
| func handleOutput(reader io.Reader) error { | ||
| scanner := bufio.NewScanner(reader) | ||
|
|
||
| for scanner.Scan() { | ||
| text := scanner.Text() | ||
|
|
||
| switch { | ||
| case strings.Contains(text, "===> DETECTING"): | ||
| log(screen.NewEvent("DETECT", "Starting")) | ||
| case strings.Contains(text, "===> ANALYZING"): | ||
| log(screen.NewEvent("DETECT", "Ending")) | ||
| log(screen.NewEvent("ANALYZE", "Starting")) | ||
| } | ||
| } | ||
|
|
||
| return scanner.Err() | ||
| } | ||
|
|
||
| func start(command *exec.Cmd) (io.Reader, error) { | ||
| stdout, err := command.StdoutPipe() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| stderr, err := command.StderrPipe() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| reader := io.MultiReader(stdout, stderr) | ||
| return reader, 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
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
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,29 @@ | ||
| package screen | ||
|
|
||
| import "github.com/rivo/tview" | ||
|
|
||
| type Blank struct { | ||
| app *tview.Application | ||
| textView *tview.TextView | ||
| doneChan chan bool | ||
| } | ||
|
|
||
| func NewBlank(app *tview.Application) *Blank { | ||
| return &Blank{ | ||
| app: app, | ||
| doneChan: make(chan bool, 1), | ||
| } | ||
| } | ||
|
|
||
| func (d *Blank) Start() { | ||
| box := tview.NewBox() | ||
| box.SetBackgroundColor(backgroundColor) | ||
|
|
||
| flex := tview.NewFlex() | ||
| flex.AddItem(box, 0, 1, false) | ||
| d.app.SetRoot(flex, true) | ||
| } | ||
|
|
||
| func (d *Blank) Stop() { | ||
| // no-op | ||
| } |
Oops, something went wrong.