moved a bunch of view stuff into internal/views

Author: cswank

internal/views/body.go

@@ -24,7 +24,7 @@ type body struct {
 	view         *ui.View
 }
 
-func newBody(w, h int, flashMessage chan string, opts ...Init) (*body, error) {
+func newBody(w, h int, flashMessage chan string, opts ...func(*stack) error) (*body, error) {
 	r, err := newRoot(w, h-2, flashMessage)
 	if err != nil {
 		return nil, err
@@ -158,7 +158,7 @@ type stack struct {
 	feeders []feeder
 }
 
-func newStack(f feeder, opts ...Init) (stack, error) {
+func newStack(f feeder, opts ...func(*stack) error) (stack, error) {
 	s := stack{top: f, feeders: []feeder{f}}
 	for _, o := range opts {
 		if err := o(&s); err != nil {
@@ -188,9 +188,7 @@ func (s *stack) pop() {
 	s.top = s.feeders[len(s.feeders)-1]
 }
 
-type Init func(*stack) error
-
-func EnterTopic(t string) func(*stack) error {
+func enterTopic(t string) func(*stack) error {
 	return func(s *stack) error {
 		r, ok := s.top.(*root)
 		if !ok {
@@ -214,7 +212,7 @@ func EnterTopic(t string) func(*stack) error {
 	}
 }
 
-func EnterPartition(p int) func(*stack) error {
+func enterPartition(p int) func(*stack) error {
 	return func(s *stack) error {
 		t, ok := s.top.(*topic)
 		if !ok {
@@ -226,7 +224,7 @@ func EnterPartition(p int) func(*stack) error {
 	}
 }
 
-func EnterOffset(o int) func(*stack) error {
+func enterOffset(o int) func(*stack) error {
 	return func(s *stack) error {
 		p, ok := s.top.(*partition)
 		if !ok {

internal/views/screen.go

@@ -46,7 +46,7 @@ type Screen struct {
 	After func()
 }
 
-func NewScreen(g *ui.Gui, width, height int, opts ...Init) (*Screen, error) {
+func newScreen(g *ui.Gui, width, height int, opts ...func(*stack) error) (*Screen, error) {
 	ch := make(chan string)
 	searchCh := make(chan string)
 	b, err := newBody(width, height, ch, opts...)

internal/views/views.go

@@ -0,0 +1,76 @@
+package views
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/cswank/kcli/internal/kafka"
+	ui "github.com/jroimartin/gocui"
+)
+
+func NewGui(topic string, partition, offset int) error {
+	g, err := ui.NewGui(ui.Output256)
+	if err != nil {
+		return fmt.Errorf("could not create gui: %s", err)
+	}
+
+	w, h := g.Size()
+	opts := getOpts(topic, partition, offset)
+	s, err := newScreen(g, w, h, opts...)
+	if err != nil {
+		g.Close()
+		kafka.Close()
+		log.Fatalf("error: %s", err)
+	}
+
+	g.SetManagerFunc(s.GetLayout(g, w, h))
+	g.Cursor = true
+	g.InputEsc = true
+
+	if err := s.Keybindings(g); err != nil {
+		return err
+	}
+
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	var closed bool
+	defer func() {
+		if !closed {
+			g.Close()
+		}
+		kafka.Close()
+	}()
+
+	if err := g.MainLoop(); err != nil {
+		if err != ui.ErrQuit {
+			log.SetOutput(os.Stderr)
+			log.Println(err)
+			return err
+		}
+	}
+
+	closed = true
+	g.Close()
+	if s.After != nil {
+		s.After()
+	}
+
+	return nil
+}
+
+func getOpts(topic string, partition, offset int) []func(*stack) error {
+	var out []func(*stack) error
+	if topic != "" {
+		out = append(out, enterTopic(topic))
+		if partition != -1 {
+			out = append(out, enterPartition(partition))
+			if offset != -1 {
+				out = append(out, enterOffset(offset))
+			}
+		}
+	}
+	return out
+}

main.go

@@ -33,24 +33,18 @@ func init() {
 }
 
 func main() {
-	var err error
-	g, err = ui.NewGui(ui.Output256)
-	if err != nil {
-		g.Close()
-		kafka.Close()
-		log.Fatal("could not create gui", err)
+	setLogout()
+	err := views.NewGui(*topic, *partition, *offset)
+	if f != nil {
+		f.Close()
+		log.SetOutput(os.Stderr)
 	}
-
-	w, h := g.Size()
-
-	opts := getOpts()
-	s, err := views.NewScreen(g, w, h, opts...)
 	if err != nil {
-		g.Close()
-		kafka.Close()
-		log.Fatalf("error: %s", err)
+		log.Fatal(err)
 	}
+}
 
+func setLogout() {
 	if *logout != "" {
 		var err error
 		f, err = os.Create(*logout)
@@ -61,54 +55,6 @@ func main() {
 	} else {
 		log.SetOutput(ioutil.Discard)
 	}
-
-	g.SetManagerFunc(s.GetLayout(g, w, h))
-	g.Cursor = true
-	g.InputEsc = true
-
-	var closed bool
-	defer func() {
-		if !closed {
-			g.Close()
-		}
-		if f != nil {
-			f.Close()
-		}
-		kafka.Close()
-	}()
-
-	if err := s.Keybindings(g); err != nil {
-		log.Println(err)
-		return
-	}
-
-	if err := g.MainLoop(); err != nil {
-		if err != ui.ErrQuit {
-			log.SetOutput(os.Stderr)
-			log.Println(err)
-			return
-		}
-	}
-
-	closed = true
-	g.Close()
-	if s.After != nil {
-		s.After()
-	}
-}
-
-func getOpts() []views.Init {
-	var out []views.Init
-	if *topic != "" {
-		out = append(out, views.EnterTopic(*topic))
-		if *partition != -1 {
-			out = append(out, views.EnterPartition(*partition))
-			if *offset != -1 {
-				out = append(out, views.EnterOffset(*offset))
-			}
-		}
-	}
-	return out
 }
 
 func getAddresses(addrs []string) []string {