📝Updates for Ahead or Behind (#17)

* Basic Updates

* i1

* Trying on git2go

* Trying on git2go

* All in One

* Made the Ahead Behind Arrows working

* Tidy Up

* Added `clean` state

* Update README.md

* Clean Icon

* Refactors

* Updated GIF

* Git Repo Full PAth Display

README.md

@@ -6,7 +6,7 @@
 
 </div>
 
-Shelby is a fast ⚡️ ,lightweight 🎈 ,minimal✨, shell prompt written in Pure Go. 
+Shelby is a fast ⚡️ ,lightweight ☁️ ,minimal✨, shell prompt written in Pure Go. 
 
 ![](assets/shelby.gif)
 

mods/directories.go

@@ -26,20 +26,22 @@ func getDir(cwd string) string {
 
 	pathToDisplay := stripHomeDir(cwd)
 	//pathToDisplay = shortenLongPath(pathToDisplay, 2)
-	gbpath := pathToDisplay[strings.LastIndex(pathToDisplay, "/")+1:]
+	//gbpath := pathToDisplay[strings.LastIndex(pathToDisplay, "/")+1:]
 	gitDir, err := findGitRepo(cwd)
 	handleError(err)
 	env := getenv()
-	isconmod := iscontentmodified(gitDir)
+
 	if gitDir != "" && env != "" && env != "." {
+		isconmod := iscontentmodified(gitDir)
 		status := make(chan string)
-		go findstatus(isconmod, gbpath, gitDir, status)
+		go dispstats(isconmod, pathToDisplay, gitDir, status)
 		imod := <-status
 		return imod + color.Sprintf(color.BrightBlack, "("+env+")")
 	}
 	if gitDir != "" {
+		isconmod := iscontentmodified(gitDir)
 		status := make(chan string)
-		go findstatus(isconmod, gbpath, gitDir, status)
+		go dispstats(isconmod, pathToDisplay, gitDir, status)
 		imod := <-status
 		return imod
 	}

mods/display.go

@@ -1,24 +1,37 @@
 package mods
 
 import (
+	"fmt"
 	"strconv"
 
 	"github.com/talal/go-bits/color"
 )
 
-func findstatus(mods ismodified, path string, gdir string, status chan string) {
-	branchchannel := make(chan string)
-	go currentGitBranch(gdir, branchchannel)
-	branch := <-branchchannel
-	nm := color.Sprintf(color.BrightYellow, path) + " on " + color.Sprintf(color.BrightGreen, ` `+branch)
-	switch {
-	case mods.notStaged != 0 && mods.untracked != 0:
-		status <- nm + color.Sprintf(color.BrightRed, ` [`+strconv.Itoa(mods.notStaged)+`!]`+`[`+strconv.Itoa(mods.untracked)+`+]`)
-	case mods.notStaged != 0:
-		status <- nm + color.Sprintf(color.BrightRed, ` [`+strconv.Itoa(mods.notStaged)+`!]`)
-	case mods.untracked != 0:
-		status <- nm + color.Sprintf(color.BrightRed, ` [`+strconv.Itoa(mods.untracked)+`+]`)
-	default:
-		status <- nm
+func dispstats(m ismodified, path string, gdir string, status chan string) {
+	branch := currentGitBranch(gdir)
+	nm := color.Sprintf(color.BrightGreen, path) + " on " + color.Sprintf(color.BrightYellow, ` `+branch)
+	states := map[string]string{
+		"ahead":  "↑",
+		"behind": "↓",
+		"both":   "⇅",
 	}
+	ius := "!"
+	itr := "+"
+	nstg_count := strconv.Itoa(m.notStaged)
+	ntrc_count := strconv.Itoa(m.untracked)
+	stt := states[m.state]
+
+	if m.utrbool && m.ustbool {
+		status <- nm + color.Sprintf(color.BrightRed, fmt.Sprintf(" [%s%s][%s%s] %s", nstg_count, ius, ntrc_count, itr, stt))
+	}
+	if !m.utrbool && m.ustbool {
+		status <- nm + color.Sprintf(color.BrightRed, fmt.Sprintf(" [%s%s] %s", nstg_count, ius, stt))
+	}
+	if m.utrbool && !m.ustbool {
+		status <- nm + color.Sprintf(color.BrightRed, fmt.Sprintf(" [%s%s] %s", ntrc_count, itr, stt))
+	}
+	if !m.ustbool && !m.utrbool {
+		status <- nm + color.Sprintf(color.BrightBlue, " "+stt)
+	}
+
 }

mods/git.go

@@ -9,9 +9,15 @@ import (
 	"strings"
 )
 
+var dir string = cwdir()
+
 type ismodified struct {
+	utrbool   bool
+	ustbool   bool
 	untracked int
 	notStaged int
+	staged    int
+	state     string
 }
 
 func findGitRepo(path string) (string, error) {
@@ -34,21 +40,21 @@ func findGitRepo(path string) (string, error) {
 
 	return gitEntry, nil
 }
-func currentGitBranch(gitDir string, c1 chan string) {
+func currentGitBranch(gitDir string) string {
 	bytes, err := ioutil.ReadFile(filepath.Join(gitDir, "HEAD"))
 	if err != nil {
 		handleError(err)
-		c1 <- "unknown"
+		return "unknown"
 	}
 	refSpec := strings.TrimSpace(string(bytes))
 
 	// detached HEAD?
 	if !strings.HasPrefix(refSpec, "ref: refs/") {
-		c1 <- "detached"
+		return "detached"
 	}
 
 	branch := strings.TrimPrefix(refSpec, "ref: refs/heads/")
-	c1 <- branch
+	return branch
 }
 func gitProcessEnv() []string {
 	home, _ := os.LookupEnv("HOME")
@@ -79,9 +85,15 @@ func parseGitStats(status []string) ismodified {
 				switch code {
 				case "??":
 					stats.untracked++
+					stats.utrbool = true
 				default:
+					if code[0] != ' ' {
+						stats.staged++
+
+					}
 					if code[1] != ' ' {
 						stats.notStaged++
+						stats.ustbool = true
 					}
 				}
 			}
@@ -96,6 +108,20 @@ func iscontentmodified(path string) ismodified {
 
 	}
 	stats := parseGitStats(status)
+	outstat, err := rungitcommands("git", "status", "-u", "no")
+
+	if strings.Contains(outstat, "ahead") {
+		stats.state = "ahead"
+	} else if strings.Contains(outstat, "behind") == true {
+		stats.state = "behind"
+	} else if strings.Contains(outstat, "diverged") == true {
+		stats.state = "both"
+	} else {
+		stats.state = "clean"
+	}
+	if err != nil {
 
+	}
 	return stats
+
 }

mods/info.go

@@ -16,6 +16,5 @@ func Info() string {
 
 	info := make([]string, 1)
 	info = emptifier(info, getDir(cwd))
-	return strings.Join(info, " ")
-
+	return strings.Join(info, "")
 }