Merge pull request #228 from mschneider82/refactor

use happy path for better code readability
justjanne · Jan 7, 2021 · d7acc0b · d7acc0b
2 parents e24fc64 + b24328d
commit d7acc0b
Show file tree

Hide file tree

Showing 23 changed files with 300 additions and 278 deletions.
diff --git a/segment-aws.go b/segment-aws.go
@@ -1,24 +1,25 @@
 package main
 
 import (
-	pwl "github.com/justjanne/powerline-go/powerline"
 	"os"
+
+	pwl "github.com/justjanne/powerline-go/powerline"
 )
 
 func segmentAWS(p *powerline) []pwl.Segment {
 	profile := os.Getenv("AWS_PROFILE")
 	region := os.Getenv("AWS_DEFAULT_REGION")
-	if profile != "" {
-		var r string
-		if region != "" {
-			r = " (" + region + ")"
-		}
-		return []pwl.Segment{{
-			Name:       "aws",
-			Content:    profile + r,
-			Foreground: p.theme.AWSFg,
-			Background: p.theme.AWSBg,
-		}}
+	if profile == "" {
+		return []pwl.Segment{}
+	}
+	var r string
+	if region != "" {
+		r = " (" + region + ")"
 	}
-	return []pwl.Segment{}
+	return []pwl.Segment{{
+		Name:       "aws",
+		Content:    profile + r,
+		Foreground: p.theme.AWSFg,
+		Background: p.theme.AWSBg,
+	}}
 }
diff --git a/segment-cwd.go b/segment-cwd.go
@@ -161,7 +161,8 @@ func getColor(p *powerline, pathSegment pathSegment, isLastDir bool) (uint8, uin
 func segmentCwd(p *powerline) (segments []pwl.Segment) {
 	cwd := p.cwd
 
-	if p.cfg.CwdMode == "plain" {
+	switch p.cfg.CwdMode {
+	case "plain":
 		if strings.HasPrefix(cwd, p.userInfo.HomeDir) {
 			cwd = "~" + cwd[len(p.userInfo.HomeDir):]
 		}
@@ -172,7 +173,7 @@ func segmentCwd(p *powerline) (segments []pwl.Segment) {
 			Foreground: p.theme.CwdFg,
 			Background: p.theme.PathBg,
 		})
-	} else {
+	default:
 		pathSegments := cwdToPathSegments(p, cwd)
 
 		if p.cfg.CwdMode == "dironly" {
@@ -213,11 +214,11 @@ func segmentCwd(p *powerline) (segments []pwl.Segment) {
 				}
 				first := pathSegments[0]
 				pathSegments = make([]pathSegment, 0)
-				if (first.home || first.alias) {
+				if first.home || first.alias {
 					pathSegments = append(pathSegments, first)
 				}
 				pathSegments = append(pathSegments, pathSegment{
-					path:	  path,
+					path: path,
 				})
 			}
 		}

diff --git a/segment-docker.go b/segment-docker.go
@@ -21,13 +21,13 @@ func segmentDocker(p *powerline) []pwl.Segment {
 		}
 	}
 
-	if docker != "" {
-		return []pwl.Segment{{
-			Name:       "docker",
-			Content:    docker,
-			Foreground: p.theme.DockerMachineFg,
-			Background: p.theme.DockerMachineBg,
-		}}
+	if docker == "" {
+		return []pwl.Segment{}
 	}
-	return []pwl.Segment{}
+	return []pwl.Segment{{
+		Name:       "docker",
+		Content:    docker,
+		Foreground: p.theme.DockerMachineFg,
+		Background: p.theme.DockerMachineBg,
+	}}
 }
diff --git a/segment-dotenv.go b/segment-dotenv.go
@@ -1,8 +1,9 @@
 package main
 
 import (
-	pwl "github.com/justjanne/powerline-go/powerline"
 	"os"
+
+	pwl "github.com/justjanne/powerline-go/powerline"
 )
 
 func segmentDotEnv(p *powerline) []pwl.Segment {
@@ -15,13 +16,13 @@ func segmentDotEnv(p *powerline) []pwl.Segment {
 			break
 		}
 	}
-	if dotEnv {
-		return []pwl.Segment{{
-			Name:       "dotenv",
-			Content:    "\u2235",
-			Foreground: p.theme.DotEnvFg,
-			Background: p.theme.DotEnvBg,
-		}}
+	if !dotEnv {
+		return []pwl.Segment{}
 	}
-	return []pwl.Segment{}
+	return []pwl.Segment{{
+		Name:       "dotenv",
+		Content:    "\u2235",
+		Foreground: p.theme.DotEnvFg,
+		Background: p.theme.DotEnvBg,
+	}}
 }
diff --git a/segment-duration.go b/segment-duration.go
@@ -39,7 +39,7 @@ func segmentDuration(p *powerline) []pwl.Segment {
 	durationValue := strings.Trim(p.cfg.Duration, "'\"")
 	durationMinValue := strings.Trim(p.cfg.DurationMin, "'\"")
 
-	hasPrecision := strings.Index(durationValue, ".") != -1
+	hasPrecision := strings.Contains(durationValue, ".")
 
 	durationFloat, err := strconv.ParseFloat(durationValue, 64)
 	durationMinFloat, _ := strconv.ParseFloat(durationMinValue, 64)
@@ -58,42 +58,43 @@ func segmentDuration(p *powerline) []pwl.Segment {
 
 	duration := time.Duration(durationFloat * float64(time.Second.Nanoseconds()))
 
-	if duration > 0 {
-		var content string
-		ns := duration.Nanoseconds()
-		if ns > hours {
-			hrs := ns / hours
-			ns -= hrs * hours
-			mins := ns / minutes
-			content = fmt.Sprintf("%dh %dm", hrs, mins)
-		} else if ns > minutes {
-			mins := ns / minutes
-			ns -= mins * minutes
-			secs := ns / seconds
-			content = fmt.Sprintf("%dm %ds", mins, secs)
-		} else if !hasPrecision {
-			secs := ns / seconds
-			content = fmt.Sprintf("%ds", secs)
-		} else if ns > seconds {
-			secs := ns / seconds
-			ns -= secs * seconds
-			millis := ns / milliseconds
-			content = fmt.Sprintf("%ds %dms", secs, millis)
-		} else if ns > milliseconds {
-			millis := ns / milliseconds
-			ns -= millis * milliseconds
-			micros := ns / microseconds
-			content = fmt.Sprintf("%dms %d\u00B5s", millis, micros)
-		} else {
-			content = fmt.Sprintf("%d\u00B5s", ns/microseconds)
-		}
+	if duration <= 0 {
+		return []pwl.Segment{}
+	}
 
-		return []pwl.Segment{{
-			Name:       "duration",
-			Content:    content,
-			Foreground: p.theme.DurationFg,
-			Background: p.theme.DurationBg,
-		}}
+	var content string
+	ns := duration.Nanoseconds()
+	if ns > hours {
+		hrs := ns / hours
+		ns -= hrs * hours
+		mins := ns / minutes
+		content = fmt.Sprintf("%dh %dm", hrs, mins)
+	} else if ns > minutes {
+		mins := ns / minutes
+		ns -= mins * minutes
+		secs := ns / seconds
+		content = fmt.Sprintf("%dm %ds", mins, secs)
+	} else if !hasPrecision {
+		secs := ns / seconds
+		content = fmt.Sprintf("%ds", secs)
+	} else if ns > seconds {
+		secs := ns / seconds
+		ns -= secs * seconds
+		millis := ns / milliseconds
+		content = fmt.Sprintf("%ds %dms", secs, millis)
+	} else if ns > milliseconds {
+		millis := ns / milliseconds
+		ns -= millis * milliseconds
+		micros := ns / microseconds
+		content = fmt.Sprintf("%dms %d\u00B5s", millis, micros)
+	} else {
+		content = fmt.Sprintf("%d\u00B5s", ns/microseconds)
 	}
-	return []pwl.Segment{}
+
+	return []pwl.Segment{{
+		Name:       "duration",
+		Content:    content,
+		Foreground: p.theme.DurationFg,
+		Background: p.theme.DurationBg,
+	}}
 }
diff --git a/segment-exitcode.go b/segment-exitcode.go
@@ -2,9 +2,10 @@ package main
 
 import (
 	"fmt"
+	"strconv"
+
 	"github.com/justjanne/powerline-go/exitcode"
 	pwl "github.com/justjanne/powerline-go/powerline"
-	"strconv"
 )
 
 var exitCodes = map[int]string{
@@ -31,18 +32,19 @@ func getMeaningFromExitCode(exitCode int) string {
 
 func segmentExitCode(p *powerline) []pwl.Segment {
 	var meaning string
-	if p.cfg.PrevError != 0 {
-		if p.cfg.NumericExitCodes {
-			meaning = strconv.Itoa(p.cfg.PrevError)
-		} else {
-			meaning = getMeaningFromExitCode(p.cfg.PrevError)
-		}
-		return []pwl.Segment{{
-			Name:       "exit",
-			Content:    meaning,
-			Foreground: p.theme.CmdFailedFg,
-			Background: p.theme.CmdFailedBg,
-		}}
+	if p.cfg.PrevError == 0 {
+		return []pwl.Segment{}
 	}
-	return []pwl.Segment{}
+	if p.cfg.NumericExitCodes {
+		meaning = strconv.Itoa(p.cfg.PrevError)
+	} else {
+		meaning = getMeaningFromExitCode(p.cfg.PrevError)
+	}
+
+	return []pwl.Segment{{
+		Name:       "exit",
+		Content:    meaning,
+		Foreground: p.theme.CmdFailedFg,
+		Background: p.theme.CmdFailedBg,
+	}}
 }
diff --git a/segment-gcp.go b/segment-gcp.go
@@ -1,10 +1,11 @@
 package main
 
 import (
-	pwl "github.com/justjanne/powerline-go/powerline"
 	"log"
 	"os/exec"
 	"strings"
+
+	pwl "github.com/justjanne/powerline-go/powerline"
 )
 
 func segmentGCP(p *powerline) []pwl.Segment {
@@ -14,14 +15,13 @@ func segmentGCP(p *powerline) []pwl.Segment {
 	}
 
 	project := strings.TrimSuffix(string(out), "\n")
-	if project != "" {
-		return []pwl.Segment{{
-			Name:       "gcp",
-			Content:    project,
-			Foreground: p.theme.GCPFg,
-			Background: p.theme.GCPBg,
-		}}
+	if project == "" {
+		return []pwl.Segment{}
 	}
-
-	return []pwl.Segment{}
+	return []pwl.Segment{{
+		Name:       "gcp",
+		Content:    project,
+		Foreground: p.theme.GCPFg,
+		Background: p.theme.GCPBg,
+	}}
 }
diff --git a/segment-git.go b/segment-git.go
@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
-	pwl "github.com/justjanne/powerline-go/powerline"
 	"os"
 	"os/exec"
 	"path"
 	"regexp"
 	"strconv"
 	"strings"
+
+	pwl "github.com/justjanne/powerline-go/powerline"
 )
 
 type repoStats struct {

diff --git a/segment-gitlite.go b/segment-gitlite.go
@@ -1,8 +1,9 @@
 package main
 
 import (
-	pwl "github.com/justjanne/powerline-go/powerline"
 	"strings"
+
+	pwl "github.com/justjanne/powerline-go/powerline"
 )
 
 func segmentGitLite(p *powerline) []pwl.Segment {
@@ -25,10 +26,10 @@ func segmentGitLite(p *powerline) []pwl.Segment {
 	status := strings.TrimSpace(out)
 	var branch string
 
-	if status != "HEAD" {
-		branch = status
-	} else {
+	if status == "HEAD" {
 		branch = getGitDetachedBranch(p)
+	} else {
+		branch = status
 	}
 
 	return []pwl.Segment{{