Remove a ton of duplication around TextView widget creation

bamboohr/widget.go

@@ -13,18 +13,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("BambooHR", "bamboohr"),
-			Name:        "BambooHR",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.bamboohr.refreshInterval", 900),
-		},
 	}
 
 	widget.addView()

config.yml

@@ -1,36 +1,96 @@
 wtf:
   refreshInterval: 1
   bamboohr:
+    enabled: false
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 900
     url: "https://api.bamboohr.com/api/gateway.php"
   gcal:
     currentIcon: "💥"
+    enabled: true
     eventCount: 10
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 300
     secretFile: "~/.wtf/gcal/client_secret.json"
   git:
     commitCount: 5
+    enabled: true
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 8
     repository: "/Users/chris/go/src/github.com/senorprogrammer/wtf"
   github:
+    enabled: true
     organization: "BetterOfficeApps"
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 300
     repo: "core-api"
     username: "senorprogrammer"
   jira:
+    enabled: true
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 900
   newrelic:
     applicationId: 10549735
+    enabled: true
     deployCount: 5
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 900
   opsgenie:
+    enabled: true
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 21600
   security:
+    enabled: true
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 3600
   status:
+    enabled: true
+    position:
+      top:
+      left:
+      width:
+      height:
     refreshInterval: 1
   weather:
     cityId: 6173331
+    enabled: true
     language: "EN"
+    position:
+      top:
+      left:
+      width:
+      height:
     tempUnit: "C"
     refreshInterval: 900

gcal/widget.go

@@ -15,18 +15,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("Calendar", "gcal"),
-			Name:        "Calendar",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.gcal.refreshInterval", 300),
-		},
 	}
 
 	widget.addView()

git/widget.go

@@ -15,17 +15,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("Git", "git"),
-			Name:        "Git",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.git.refreshInterval", 15),
-		},
 	}
 
 	widget.addView()

github/widget.go

@@ -14,17 +14,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("Github", "github"),
-			Name:        "Github",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.github.refreshInterval", 900),
-		},
 	}
 
 	widget.addView()

jira/widget.go

@@ -13,17 +13,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("JIRA", "jira"),
-			Name:        "JIRA",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.jira.refreshInterval", 900),
-		},
 	}
 
 	widget.addView()

newrelic/widget.go

@@ -14,18 +14,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("New Relic", "newrelic"),
-			Name:        "New Relic",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.newrelic.refreshInterval", 900),
-		},
 	}
 
 	widget.addView()

opsgenie/widget.go

@@ -14,17 +14,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("OpsGenie", "opsgenie"),
-			Name:        "OpsGenie",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.opsgenie.refreshInterval", 21600),
-		},
 	}
 
 	widget.addView()

security/widget.go

@@ -14,17 +14,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("Security", "security"),
-			Name:        "Security",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.security.refreshInterval", 3600),
-		},
 	}
 
 	widget.addView()

status/widget.go

@@ -13,20 +13,15 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
 
 	Current int
-	View    *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("Status", "status"),
-			Name:        "Status",
+		Current:    0,
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.status.refreshInterval", 1),
-		},
-		Current: 0,
 	}
 
 	widget.addView()

weather/widget.go

@@ -15,17 +15,12 @@ import (
 var Config *config.Config
 
 type Widget struct {
-	wtf.BaseWidget
+	wtf.TextWidget
-	View *tview.TextView
 }
 
 func NewWidget() *Widget {
 	widget := Widget{
-		BaseWidget: wtf.BaseWidget{
+		TextWidget: wtf.NewTextWidget("Weather", "weather"),
-			Name:        "Weather",
-			RefreshedAt: time.Now(),
-			RefreshInt:  Config.UInt("wtf.weather.refreshInterval", 900),
-		},
 	}
 
 	widget.addView()

wtf.go

@@ -38,6 +38,7 @@ var Config = wtf.LoadConfigFile()
 /* -------------------- Main -------------------- */
 
 func main() {
+	wtf.Config = Config
 
 	bamboohr.Config = Config
 	bamboo := bamboohr.NewWidget()

wtf/base_widget.go

@@ -1,16 +0,0 @@
-package wtf
-
-import (
-	//"fmt"
-	"time"
-)
-
-type BaseWidget struct {
-	Name        string
-	RefreshedAt time.Time
-	RefreshInt  int
-}
-
-func (widget *BaseWidget) RefreshInterval() int {
-	return widget.RefreshInt
-}

wtf/text_widget.go

@@ -0,0 +1,47 @@
+package wtf
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/olebedev/config"
+	"github.com/rivo/tview"
+)
+
+var Config *config.Config
+
+type Position struct {
+	Top    int
+	Left   int
+	Width  int
+	Height int
+}
+
+type TextWidget struct {
+	Enabled     bool
+	Name        string
+	Position    Position
+	RefreshedAt time.Time
+	RefreshInt  int
+	View        *tview.TextView
+}
+
+func NewTextWidget(name string, configKey string) TextWidget {
+	widget := TextWidget{
+		Enabled:    Config.UBool(fmt.Sprintf("wtf.%s.refreshInterval", configKey), false),
+		Name:       name,
+		RefreshInt: Config.UInt(fmt.Sprintf("wtf.%s.refreshInterval", configKey)),
+	}
+
+	return widget
+}
+
+/* -------------------- Exported Functions -------------------- */
+
+func (widget *TextWidget) RefreshInterval() int {
+	return widget.RefreshInt
+}
+
+func (widget *TextWidget) TextView() *tview.TextView {
+	return widget.View
+}