NeonXP/micro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

AddLog should be "public" accessible

Browse source
This commit is contained in:
boombuler 2016-09-27 17:52:05 +02:00
parent 50c7441533
commit b195ebad46
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cmd/micro/messenger.go
View file

@ -24,7 +24,7 @@ func TermMessage(msg ...interface{}) {
} }
fmt.Println(msg...) fmt.Println(msg...)
messenger.addLog(fmt.Sprint(msg...)) messenger.AddLog(fmt.Sprint(msg...))
fmt.Print("\nPress enter to continue") fmt.Print("\nPress enter to continue")
reader := bufio.NewReader(os.Stdin) reader := bufio.NewReader(os.Stdin)
@ -69,9 +69,11 @@ type Messenger struct {
gutterMessage bool gutterMessage bool
} }
func (m *Messenger) addLog(msg string) { func (m *Messenger) AddLog(msg string) {
buffer := m.getBuffer() buffer := m.getBuffer()
buffer.Insert(buffer.End(), msg+"\n") buffer.Insert(buffer.End(), msg+"\n")
buffer.Cursor.Loc = buffer.End()
buffer.Cursor.Relocate()
} }
func (m *Messenger) getBuffer() *Buffer { func (m *Messenger) getBuffer() *Buffer {
@ -90,7 +92,7 @@ func (m *Messenger) Message(msg ...interface{}) {
if _, ok := colorscheme["message"]; ok { if _, ok := colorscheme["message"]; ok {
m.style = colorscheme["message"] m.style = colorscheme["message"]
} }
m.addLog(m.message) m.AddLog(m.message)
m.hasMessage = true m.hasMessage = true
} }
@ -106,7 +108,7 @@ func (m *Messenger) Error(msg ...interface{}) {
if _, ok := colorscheme["error-message"]; ok { if _, ok := colorscheme["error-message"]; ok {
m.style = colorscheme["error-message"] m.style = colorscheme["error-message"]
} }
m.addLog(m.message) m.AddLog(m.message)
m.hasMessage = true m.hasMessage = true
} }
@ -128,16 +130,16 @@ func (m *Messenger) YesNoPrompt(prompt string) (bool, bool) {
switch e.Key() { switch e.Key() {
case tcell.KeyRune: case tcell.KeyRune:
if e.Rune() == 'y' { if e.Rune() == 'y' {
m.addLog("\t--> y") m.AddLog("\t--> y")
m.hasPrompt = false m.hasPrompt = false
return true, false return true, false
} else if e.Rune() == 'n' { } else if e.Rune() == 'n' {
m.addLog("\t--> n") m.AddLog("\t--> n")
m.hasPrompt = false m.hasPrompt = false
return false, false return false, false
} }
case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape: case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape:
m.addLog("\t--> (cancel)") m.AddLog("\t--> (cancel)")
m.hasPrompt = false m.hasPrompt = false
return false, true return false, true
} }
@ -164,7 +166,7 @@ func (m *Messenger) LetterPrompt(prompt string, responses ...rune) (rune, bool)
case tcell.KeyRune: case tcell.KeyRune:
for _, r := range responses { for _, r := range responses {
if e.Rune() == r { if e.Rune() == r {
m.addLog("\t--> " + string(r)) m.AddLog("\t--> " + string(r))
m.Clear() m.Clear()
m.Reset() m.Reset()
m.hasPrompt = false m.hasPrompt = false
@ -172,7 +174,7 @@ func (m *Messenger) LetterPrompt(prompt string, responses ...rune) (rune, bool)
} }
} }
case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape: case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape:
m.addLog("\t--> (cancel)") m.AddLog("\t--> (cancel)")
m.Clear() m.Clear()
m.Reset() m.Reset()
m.hasPrompt = false m.hasPrompt = false
@ -218,11 +220,11 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
switch e.Key() { switch e.Key() {
case tcell.KeyCtrlQ, tcell.KeyCtrlC, tcell.KeyEscape: case tcell.KeyCtrlQ, tcell.KeyCtrlC, tcell.KeyEscape:
// Cancel // Cancel
m.addLog("\t--> (cancel)") m.AddLog("\t--> (cancel)")
m.hasPrompt = false m.hasPrompt = false
case tcell.KeyEnter: case tcell.KeyEnter:
// User is done entering their response // User is done entering their response
m.addLog("\t--> " + m.response) m.AddLog("\t--> " + m.response)
m.hasPrompt = false m.hasPrompt = false
response, canceled = m.response, false response, canceled = m.response, false
m.history[historyType][len(m.history[historyType])-1] = response m.history[historyType][len(m.history[historyType])-1] = response