From 1bc102f7ee3e30b88a4cc3241d2cf240e53f828f Mon Sep 17 00:00:00 2001 From: Michael Dvorkin Date: Thu, 22 Aug 2013 22:58:15 -0700 Subject: [PATCH] Use generic screen.Draw() to display current time --- cmd/mop.go | 2 +- screen.go | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cmd/mop.go b/cmd/mop.go index 4e1beaa..6b21665 100644 --- a/cmd/mop.go +++ b/cmd/mop.go @@ -92,7 +92,7 @@ loop: case <-timestampQueue.C: if !showingHelp { - screen.DrawTime() + screen.Draw(time.Now()) } case <-quotesQueue.C: diff --git a/screen.go b/screen.go index 11f70c1..28b4894 100644 --- a/screen.go +++ b/screen.go @@ -72,6 +72,9 @@ func (screen *Screen) Draw(objects ...interface{}) *Screen { case *Quotes: object := ptr.(*Quotes) screen.draw(screen.layout.Quotes(object.Fetch())) + case time.Time: + timestamp := ptr.(time.Time).Format(`3:04:05pm PST`) + screen.DrawLine(0, 0, `` + timestamp + ``) default: screen.draw(ptr.(string)) } @@ -100,13 +103,6 @@ func (screen *Screen) DrawLine(x int, y int, str string) { termbox.Flush() } -// DrawTime ... -func (screen *Screen) DrawTime() { - now := time.Now().Format(`3:04:05pm PST`) - screen.DrawLine(0, 0, `` + now + ``) -} - - //----------------------------------------------------------------------------- func (screen *Screen) draw(str string) { if !screen.cleared {