refactoring and branches api

Author: typomedia

Makefile

@@ -4,7 +4,8 @@ build:
 
 run:
 	go mod tidy
-	go run main.go serve
+	go install github.com/cosmtrek/air@latest
+	air serve
 
 icon:
 	go install github.com/akavel/rsrc@latest

app/git/rembran.go

@@ -18,12 +18,5 @@ func RemoteBranches(path string) []*plumbing.Reference {
 		InsecureSkipTLS: true,
 	})
 
-	// Print the remote branches
-	// for _, ref := range refs {
-	//	if ref.Name().IsRemote() {
-	//		fmt.Println(ref.Name().Short())
-	//	}
-	// }
-
 	return refs
 }

app/hdlr/branches.go

@@ -0,0 +1,42 @@
+package hdlr
+
+import (
+	"encoding/json"
+	"github.com/gorilla/mux"
+	"github.com/typomedia/gitti/app/git"
+	"github.com/typomedia/gitti/app/helper"
+	"github.com/typomedia/gitti/app/msg"
+	"net/http"
+)
+
+func Branches(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	project := vars["project"]
+
+	// Get the repo from config
+	repo := helper.GetRepo(project)
+
+	// Fetch the latest changes from remote
+	git.Fetch(repo.Path)
+
+	// Get a list of all the remote branches
+	refs := git.RemoteBranches(repo.Path)
+
+	branches := Refs{}
+	for _, ref := range refs {
+		if ref.Name().IsBranch() {
+			branches.Branches = append(branches.Branches, Branch{
+				Name:     ref.Name().Short(),
+				Revision: ref.Hash().String(),
+			})
+		}
+	}
+
+	//json.NewEncoder(w).Encode(branches)
+	jsonData, err := json.Marshal(branches)
+	msg.Check(err)
+
+	// set application/json header
+	w.Header().Set("Content-Type", "application/json")
+	w.Write(jsonData)
+}

app/hdlr/checkout.go

@@ -4,30 +4,21 @@ import (
 	"fmt"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/gorilla/mux"
-	"github.com/spf13/viper"
 	"github.com/typomedia/gitti/app"
 	"github.com/typomedia/gitti/app/git"
 	"github.com/typomedia/gitti/app/git/ext"
+	"github.com/typomedia/gitti/app/helper"
 	"github.com/typomedia/gitti/app/msg"
 	"github.com/typomedia/gitti/app/str"
 	"net/http"
 )
 
 func Checkout(w http.ResponseWriter, r *http.Request) {
-	repo := Repo{}
 	vars := mux.Vars(r)
 	project := vars["project"]
-	config := viper.AllSettings()
-	repos := config["repos"].(map[string]interface{})
-
-	for name, path := range repos {
-		if name == project {
-			repo = Repo{
-				Name: name,
-				Path: path.(string),
-			}
-		}
-	}
+
+	// Get the repo from config
+	repo := helper.GetRepo(project)
 
 	branch := "master"
 	if r.URL.Query().Get("branch") != "" {

app/hdlr/index.go

@@ -2,27 +2,22 @@ package hdlr
 
 import (
 	"fmt"
-	"github.com/spf13/viper"
 	"github.com/typomedia/gitti/app"
 	"github.com/typomedia/gitti/app/git"
+	"github.com/typomedia/gitti/app/helper"
 	"net/http"
 )
 
 func Index(w http.ResponseWriter, r *http.Request) {
-	repo := Repo{}
-	config := viper.AllSettings()
-	repos := config["repos"].(map[string]interface{})
-
 	fmt.Fprintln(w, app.App.Banner)
 	fmt.Fprintln(w, app.App.Name, app.App.Version)
 	fmt.Fprintln(w, app.App.Author)
 	fmt.Fprintf(w, "%v \n\n", app.App.Description)
 
-	for name, path := range repos {
-		repo = Repo{
-			Name: name,
-			Path: path.(string),
-		}
+	// Get the repo from config
+	repos := helper.GetRepos()
+
+	for _, repo := range repos.Repos {
 
 		fmt.Fprintf(w, "%v: %v \n", repo.Name, repo.Path)
 

app/hdlr/log.go

@@ -3,26 +3,17 @@ package hdlr
 import (
 	"fmt"
 	"github.com/gorilla/mux"
-	"github.com/spf13/viper"
 	"github.com/typomedia/gitti/app/git"
+	"github.com/typomedia/gitti/app/helper"
 	"net/http"
 )
 
 func Log(w http.ResponseWriter, r *http.Request) {
-	repo := Repo{}
 	vars := mux.Vars(r)
 	project := vars["project"]
-	config := viper.AllSettings()
-	repos := config["repos"].(map[string]interface{})
 
-	for name, path := range repos {
-		if name == project {
-			repo = Repo{
-				Name: name,
-				Path: path.(string),
-			}
-		}
-	}
+	// Get the repo from config
+	repo := helper.GetRepo(project)
 
 	_, commit := git.Log(repo.Path)
 

app/hdlr/prune.go

@@ -3,27 +3,18 @@ package hdlr
 import (
 	"fmt"
 	"github.com/gorilla/mux"
-	"github.com/spf13/viper"
 	"github.com/typomedia/gitti/app/git"
+	"github.com/typomedia/gitti/app/helper"
 	"github.com/typomedia/gitti/app/msg"
 	"net/http"
 )
 
 func Prune(w http.ResponseWriter, r *http.Request) {
-	repo := Repo{}
 	vars := mux.Vars(r)
 	project := vars["project"]
-	config := viper.AllSettings()
-	repos := config["repos"].(map[string]interface{})
 
-	for name, path := range repos {
-		if name == project {
-			repo = Repo{
-				Name: name,
-				Path: path.(string),
-			}
-		}
-	}
+	// Get the repo from config
+	repo := helper.GetRepo(project)
 
 	res := git.Prune(repo.Path)
 

app/hdlr/pull.go

@@ -3,26 +3,17 @@ package hdlr
 import (
 	"fmt"
 	"github.com/gorilla/mux"
-	"github.com/spf13/viper"
 	"github.com/typomedia/gitti/app/git/ext"
+	"github.com/typomedia/gitti/app/helper"
 	"net/http"
 )
 
 func Pull(w http.ResponseWriter, r *http.Request) {
-	repo := Repo{}
 	vars := mux.Vars(r)
 	project := vars["project"]
-	config := viper.AllSettings()
-	repos := config["repos"].(map[string]interface{})
 
-	for name, path := range repos {
-		if name == project {
-			repo = Repo{
-				Name: name,
-				Path: path.(string),
-			}
-		}
-	}
+	// Get the repo from config
+	repo := helper.GetRepo(project)
 
 	pull := ext.Pull(repo.Path)
 

app/hdlr/status.go

@@ -3,26 +3,17 @@ package hdlr
 import (
 	"fmt"
 	"github.com/gorilla/mux"
-	"github.com/spf13/viper"
 	"github.com/typomedia/gitti/app/git/ext"
+	"github.com/typomedia/gitti/app/helper"
 	"net/http"
 )
 
 func Status(w http.ResponseWriter, r *http.Request) {
-	repo := Repo{}
 	vars := mux.Vars(r)
 	project := vars["project"]
-	config := viper.AllSettings()
-	repos := config["repos"].(map[string]interface{})
 
-	for name, path := range repos {
-		if name == project {
-			repo = Repo{
-				Name: name,
-				Path: path.(string),
-			}
-		}
-	}
+	// Get the repo from config
+	repo := helper.GetRepo(project)
 
 	res := ext.Status(repo.Path)
 

app/hdlr/structs.go

@@ -1,6 +1,10 @@
 package hdlr
 
-type Repo struct {
-	Name string
-	Path string
+type Refs struct {
+	Branches []Branch
+}
+
+type Branch struct {
+	Name     string
+	Revision string
 }