tweak to return string message (resolves #109)

Author: neel1996

git/git_branch_checkout.go

@@ -39,7 +39,7 @@ func CheckoutBranch(repo *git.Repository, branchName string) string {
 		})
 		if checkoutErr != nil {
 			logger.Log(checkoutErr.Error(), global.StatusError)
-			return "CHECKOUT_FAILED"
+			return global.BranchCheckoutError
 		}
 	}
 
@@ -49,7 +49,7 @@ func CheckoutBranch(repo *git.Repository, branchName string) string {
 	})
 	if checkoutErr != nil {
 		logger.Log(checkoutErr.Error(), global.StatusError)
-		return "CHECKOUT_FAILED"
+		return global.BranchCheckoutError
 	}
 
 	logger.Log(fmt.Sprintf("Current branch checked out to -> %s", branchName), global.StatusInfo)

git/git_branch_list.go

@@ -15,6 +15,28 @@ type Branch struct {
 	AllBranchList []*string
 }
 
+// isBranchNameValid function checks if the branch name is valid to be return as an eligible branch
+//
+// The function filters out Tags and stashes returned as references
+func isBranchNameValid(branchName string) bool {
+	var branchNameValid bool
+	branchNameValid = true
+
+	if branchName == "HEAD" {
+		branchNameValid = false
+	}
+
+	if !strings.Contains(branchName, "refs/") {
+		branchNameValid = false
+	}
+
+	if strings.Contains(branchName, "tags/") {
+		branchNameValid = false
+	}
+
+	return branchNameValid
+}
+
 // GetBranchList fetches all the branches from the target repository
 // The result will be returned as a struct with the current branch and all the available branches
 func GetBranchList(repo *git.Repository, branchChan chan Branch) {
@@ -50,7 +72,8 @@ func GetBranchList(repo *git.Repository, branchChan chan Branch) {
 						refNamePtr *string
 					)
 					if ref != nil {
-						if reference.Name().String() != "HEAD" && strings.Contains(reference.Name().String(), "refs/") {
+						referenceName := reference.Name().String()
+						if isBranchNameValid(referenceName) {
 							refNameSplit := strings.Split(reference.Name().String(), "refs/")
 							if len(refNameSplit) == 2 && strings.Contains(refNameSplit[1], "/") && !strings.Contains(refNameSplit[1], "remotes/"+git.DefaultRemoteName+"/HEAD") {
 								logger.Log(fmt.Sprintf("Available Branch : %v", refNameSplit[1]), global.StatusInfo)
@@ -74,12 +97,15 @@ func GetBranchList(repo *git.Repository, branchChan chan Branch) {
 
 			if bIter != nil {
 				_ = bIter.ForEach(func(reference *plumbing.Reference) error {
-					if reference != nil {
-						localBranch := reference.String()
-						splitBranch := strings.Split(localBranch, "/")
-						localBranch = splitBranch[len(splitBranch)-1]
+					if reference != nil && !strings.Contains(reference.Name().String(), "tags/") {
+						localBranch := reference.Name().String()
+						if isBranchNameValid(localBranch) {
+							splitBranch := strings.Split(localBranch, "/")
+							localBranch = splitBranch[len(splitBranch)-1]
 
-						branches = append(branches, &localBranch)
+							logger.Log("Available Branch : "+localBranch, global.StatusInfo)
+							branches = append(branches, &localBranch)
+						}
 						return nil
 					} else {
 						return types.Error{Msg: "Empty reference"}

git/git_fetch.go

@@ -36,7 +36,7 @@ func windowsFetch(repoPath string, remoteName string, branch string) *model.Fetc
 	} else {
 		logger.Log(fmt.Sprintf("Changes fetched from remote - %s -> %s", remoteName, cmdStr), global.StatusInfo)
 
-		msg := fmt.Sprintf("Changes fetched from %v", remoteName)
+		msg := fmt.Sprintf("Changes fetched from remote %v", remoteName)
 		return &model.FetchResult{
 			Status:       "CHANGES FETCHED FROM REMOTE",
 			FetchedItems: []*string{&msg},

server.go

@@ -71,6 +71,8 @@ func main() {
 		currentDir := filepath.Dir(execName)
 		buildPath = fmt.Sprintf("%s/gitconvex-ui", currentDir)
 		staticPath = fmt.Sprintf("%s/static", buildPath)
+	} else {
+		logger.Log("Unable to serve UI bundle", global.StatusError)
 	}
 
 	// Static file supplier for hosting the react static assets and scripts

utils/env_file_handler.go

@@ -6,6 +6,7 @@ import (
 	"go/types"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 )
 
 type EnvConfig struct {
@@ -20,13 +21,13 @@ func localLogger(message string, status string) {
 
 // EnvConfigValidator checks if the env_config json file is present and accessible
 // If the file is missing or unable to access, then an error will be thrown
-
 func EnvConfigValidator() error {
-	cwd, wdErr := os.Getwd()
+	execName, execErr := os.Executable()
+	cwd := filepath.Dir(execName)
 
-	if wdErr != nil {
-		localLogger(wdErr.Error(), global.StatusError)
-		return wdErr
+	if execErr != nil {
+		localLogger(execErr.Error(), global.StatusError)
+		return execErr
 	}
 
 	fileString := cwd + "/env_config.json"
@@ -45,9 +46,15 @@ func EnvConfigValidator() error {
 }
 
 // EnvConfigFileReader reads the env_config json file and returns the config data as a struct
-
 func EnvConfigFileReader() *EnvConfig {
-	cwd, _ := os.Getwd()
+	execName, execErr := os.Executable()
+	cwd := filepath.Dir(execName)
+
+	if execErr != nil {
+		localLogger(execErr.Error(), global.StatusError)
+		return nil
+	}
+
 	fileString := cwd + "/env_config.json"
 	envFile, err := os.Open(fileString)
 
@@ -72,9 +79,15 @@ func EnvConfigFileReader() *EnvConfig {
 
 // EnvConfigFileGenerator will be invoked when the EnvConfigValidator returns an error or if EnvConfigFileReader returns no data
 // The function generates a new env_config.json file and populates it with the default config data
-
 func EnvConfigFileGenerator() error {
-	cwd, _ := os.Getwd()
+	execName, execErr := os.Executable()
+	cwd := filepath.Dir(execName)
+
+	if execErr != nil {
+		localLogger(execErr.Error(), global.StatusError)
+		return types.Error{Msg: execErr.Error()}
+	}
+
 	fileString := cwd + "/env_config.json"
 
 	envContent, _ := json.MarshalIndent(&EnvConfig{