1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

A ton of cleanup around how config is handled and go rountines are executed

This commit is contained in:
Chris Cummer
2018-04-04 18:02:59 -07:00
committed by Chris Cummer
parent dd51994d8d
commit 71f8fc789f
13 changed files with 99 additions and 30 deletions

View File

@@ -1,28 +1,23 @@
package git
import (
"fmt"
"os/exec"
"strings"
"github.com/senorprogrammer/wtf/wtf"
)
type Client struct {
CommitCount int
}
type Client struct{}
func NewClient() *Client {
client := Client{
CommitCount: 10,
}
return &client
return &Client{}
}
/* -------------------- Unexported Functions -------------------- */
/* -------------------- Exported Functions -------------------- */
func (client *Client) Branch() string {
arg := []string{"rev-parse", "--abbrev-ref", "HEAD"}
arg := []string{client.gitDir(), client.workTree(), "rev-parse", "--abbrev-ref", "HEAD"}
cmd := exec.Command("git", arg...)
str := wtf.ExecuteCommand(cmd)
@@ -30,7 +25,7 @@ func (client *Client) Branch() string {
}
func (client *Client) ChangedFiles() []string {
arg := []string{"status", "--porcelain"}
arg := []string{client.gitDir(), client.workTree(), "status", "--porcelain"}
cmd := exec.Command("git", arg...)
str := wtf.ExecuteCommand(cmd)
@@ -40,7 +35,9 @@ func (client *Client) ChangedFiles() []string {
}
func (client *Client) Commits() []string {
arg := []string{"log", "--date=format:\"%b %d, %Y\"", "-n 10", "--pretty=format:\"[forestgreen]%h [white]%s [grey]%an on %cd[white]\""}
numStr := fmt.Sprintf("-n %d", Config.UInt("wtf.git.commitCount", 10))
arg := []string{client.gitDir(), client.workTree(), "log", "--date=format:\"%b %d, %Y\"", numStr, "--pretty=format:\"[forestgreen]%h [white]%s [grey]%an on %cd[white]\""}
cmd := exec.Command("git", arg...)
str := wtf.ExecuteCommand(cmd)
@@ -50,9 +47,19 @@ func (client *Client) Commits() []string {
}
func (client *Client) Repository() string {
arg := []string{"rev-parse", "--show-toplevel"}
arg := []string{client.gitDir(), client.workTree(), "rev-parse", "--show-toplevel"}
cmd := exec.Command("git", arg...)
str := wtf.ExecuteCommand(cmd)
return str
}
/* -------------------- Exported Functions -------------------- */
func (client *Client) gitDir() string {
return fmt.Sprintf("--git-dir=%s/.git", Config.UString("wtf.git.repository"))
}
func (client *Client) workTree() string {
return fmt.Sprintf("--work-tree=%s", Config.UString("wtf.git.repository"))
}

View File

@@ -29,7 +29,6 @@ func NewWidget() *Widget {
}
widget.addView()
go wtf.Refresh(&widget)
return &widget
}