jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #696 from ckoehn/fix/center-log-indicator 

Center log indicator
mine
Fernand Galiana 2020-05-07 06:34:52 -06:00 committed by GitHub
parent d38b0b21a7 5f228f1f9a
commit b293395249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/view/log_indicator.go
View File

@ -93,10 +93,10 @@ func (l *LogIndicator) ToggleAutoScroll() {
// Refresh updates the view.
func (l *LogIndicator) Refresh() {
l.Clear()
l.update("Autoscroll: " + l.onOff(l.AutoScroll()))
l.update("FullScreen: " + l.onOff(l.fullScreen))
l.update("Timestamps: " + l.onOff(l.showTime))
l.update("Wrap: " + l.onOff(l.textWrap))
l.update("Autoscroll", l.AutoScroll(), true)
l.update("FullScreen", l.fullScreen, true)
l.update("Timestamps", l.showTime, true)
l.update("Wrap", l.textWrap, false)
}
func (l *LogIndicator) onOff(b bool) string {
@ -106,6 +106,11 @@ func (l *LogIndicator) onOff(b bool) string {
return "Off"
}
func (l *LogIndicator) update(status string) {
fmt.Fprintf(l, "[::b]%-20s", status)
func (l *LogIndicator) update(title string, state bool, pad bool) {
const spacer = " "
var padding string
if pad {
padding = spacer
}
fmt.Fprintf(l, "[::b]%s: %s%s", title, l.onOff(state), padding)
}

2
internal/view/log_indicator_test.go
View File

@ -13,5 +13,5 @@ func TestLogIndicatorRefresh(t *testing.T) {
v := view.NewLogIndicator(config.NewConfig(nil), defaults)
v.Refresh()
assert.Equal(t, "[::b]Autoscroll: On [::b]FullScreen: Off [::b]Timestamps: Off [::b]Wrap: Off \n", v.GetText(false))
assert.Equal(t, "[::b]Autoscroll: On [::b]FullScreen: Off [::b]Timestamps: Off [::b]Wrap: Off\n", v.GetText(false))
}

2
internal/view/log_int_test.go
View File

@ -19,7 +19,7 @@ func TestLogAutoScroll(t *testing.T) {
assert.Equal(t, 13, len(v.Hints()))
v.toggleAutoScrollCmd(nil)
assert.Equal(t, "Autoscroll: Off FullScreen: Off Timestamps: Off Wrap: Off ", v.Indicator().GetText(true))
assert.Equal(t, "Autoscroll: Off FullScreen: Off Timestamps: Off Wrap: Off", v.Indicator().GetText(true))
}
func TestLogViewNav(t *testing.T) {