Merge pull request #5 from sudonym-btc/chore/git-clone-hook

chore: add git and gh hooks to command listener
sudonym-btc · Sep 17, 2023 · cbc8fa3 · cbc8fa3
2 parents 6eb579c + befd1bd
commit cbc8fa3
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 13 deletions.
diff --git a/cmd/view/helper/task/task.go b/cmd/view/helper/task/task.go
@@ -1,8 +1,6 @@
 package task
 
 import (
-	"fmt"
-
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/gookit/slog"
@@ -155,7 +153,7 @@ func Failed(id int, err *error) func() tea.Msg {
 }
 
 func (m Model) Job() tea.Cmd {
-	fmt.Print("Job task")
+	slog.Error("Job task")
 	return nil
 }
 

diff --git a/cmd/view/tip/command-resolver.go b/cmd/view/tip/command-resolver.go
@@ -1,6 +1,10 @@
 package tipView
 
 import (
+	"fmt"
+	"regexp"
+
+	"github.com/gookit/slog"
 	"github.com/sudonym-btc/zap/cmd/view/helper/task"
 	packageAnalyzer "github.com/sudonym-btc/zap/service/package-analyzer"
 	"github.com/thoas/go-funk"
@@ -30,7 +34,7 @@ var SpecialCommandResolvers = []CommandResolver{
 		},
 		Command: "address",
 	}}
-var PackageCommandResolvers = funk.Map(packageAnalyzer.PackageManagers, func(pm packageAnalyzer.PackageManager) CommandResolver {
+var PackageCommandResolvers = append(funk.Map(packageAnalyzer.PackageManagers, func(pm packageAnalyzer.PackageManager) CommandResolver {
 	return CommandResolver{
 		Model: func(m TipModel) task.ModelI {
 			return InitialPackageManagerModel(pm, &m.name, &m.version, m)
@@ -39,7 +43,53 @@ var PackageCommandResolvers = funk.Map(packageAnalyzer.PackageManagers, func(pm
 		Detect:    pm.Detect,
 		ParseArgs: pm.ParseArgs,
 	}
-}).([]CommandResolver)
+}).([]CommandResolver), CommandResolver{
+	Model: func(m TipModel) task.ModelI {
+		return initialGithubRepoModel(&m.name, m)
+	},
+	Command: "git",
+	Detect: func(dir string) bool {
+		return false
+	},
+	ParseArgs: func(args []string) (bool, *[]packageAnalyzer.PackageInfo, error) {
+		slog.Debug("Parsing args", args)
+		if len(args) > 0 && args[0] == "clone" {
+			slog.Debug("Found git clone command")
+			args = args[1:]
+			if len(args) > 0 {
+				packages := funk.Map(args, func(arg string) packageAnalyzer.PackageInfo {
+					return packageAnalyzer.PackageInfo{Name: extractOrgRepo(arg)}
+				}).([]packageAnalyzer.PackageInfo)
+				return true, &packages, nil
+			}
+			return true, nil, nil
+		}
+		return false, nil, nil
+	},
+}, CommandResolver{
+	Model: func(m TipModel) task.ModelI {
+		return initialGithubRepoModel(&m.name, m)
+	},
+	Command: "gh",
+	Detect: func(dir string) bool {
+		return false
+	},
+	ParseArgs: func(args []string) (bool, *[]packageAnalyzer.PackageInfo, error) {
+		slog.Debug("Parsing args", args)
+		if len(args) > 0 && args[0] == "repo" && args[1] == "clone" {
+			slog.Debug("Found git clone command")
+			args = args[2:]
+			if len(args) > 0 {
+				packages := funk.Map(args, func(arg string) packageAnalyzer.PackageInfo {
+					return packageAnalyzer.PackageInfo{Name: arg}
+				}).([]packageAnalyzer.PackageInfo)
+				return true, &packages, nil
+			}
+			return true, nil, nil
+		}
+		return false, nil, nil
+	},
+})
 
 var CommandResolvers = append(SpecialCommandResolvers, PackageCommandResolvers...)
 
@@ -50,7 +100,22 @@ type CommandResolver struct {
 	ParseArgs func([]string) (bool, *[]packageAnalyzer.PackageInfo, error)
 }
 
-// type PackageCommandResolver struct {
-// 	CommandResolver
-// 	ParseArgs func([]string) (bool, *[]packageAnalyzer.PackageInfo, error)
-// }
+func extractOrgRepo(url string) string {
+	// Define the regular expression pattern to match GitHub URLs
+	pattern := `(?:https:\/\/github\.com\/|git@github\.com:)([\w-]+)\/([\w-]+)\.git`
+
+	// Compile the regular expression
+	regex := regexp.MustCompile(pattern)
+
+	// Find the matches in the URL
+	matches := regex.FindStringSubmatch(url)
+
+	// If there's a match, return the org/repo part, otherwise return an empty string
+	if len(matches) == 3 {
+		org := matches[1]
+		repo := matches[2]
+		return fmt.Sprintf("%s/%s", org, repo)
+	}
+
+	return ""
+}
diff --git a/cmd/view/tip/github-repo.go b/cmd/view/tip/github-repo.go
@@ -1,6 +1,8 @@
 package tipView
 
 import (
+	"fmt"
+
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/google/go-github/github"
@@ -62,6 +64,8 @@ func (m GithubRepoModel) View() string {
 				return view.PadVertical.Render(lipgloss.JoinHorizontal(lipgloss.Left, view.PadRight.Render(m.Progress.Spinner.View()), "Loading repository..."))
 			} else if len(m.Children) > 0 {
 				return taskView.DisplayOnlyDoneOrInProgress(m.Children)
+			} else if m.Progress.Failed {
+				return lipgloss.JoinHorizontal(lipgloss.Left, view.Cross.Render(), view.ErrorMessageStyle("Failed fetching repo: "+fmt.Sprint(*m.Progress.Error)))
 			}
 
 			return "No users found"

diff --git a/cmd/view/tip/github-user.go b/cmd/view/tip/github-user.go
@@ -1,6 +1,8 @@
 package tipView
 
 import (
+	"fmt"
+
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/google/go-github/github"
@@ -66,10 +68,11 @@ func (m GithubUserModel) View() string {
 
 	content := func() string {
 		return lipgloss.JoinVertical(lipgloss.Left, view.ItemStyle(m.name, ""), func() string {
-			if m.user == nil {
+			if m.Progress.InProgress {
 				return view.PadVertical.Render(lipgloss.JoinHorizontal(lipgloss.Left, view.PadRight.Render(m.Progress.Spinner.View()), "Loading user..."))
-			}
-			if len(m.Children) == 0 {
+			} else if m.Progress.Failed {
+				return lipgloss.JoinHorizontal(lipgloss.Left, view.Cross.Render(), view.ErrorMessageStyle("Failed fetching user: "+fmt.Sprint(*m.Progress.Error)))
+			} else if len(m.Children) == 0 {
 				return "No tippable addresses found"
 			}
 			return taskView.DisplayOnlyDoneOrInProgress(m.Children)

diff --git a/service/github-manager/github.go b/service/github-manager/github.go
@@ -29,7 +29,14 @@ func (*GithubManager) FetchUser(name string) (*github.User, *github.Response, er
 
 func (*GithubManager) FetchRepo(name string) (*github.Repository, *github.Response, error) {
 	slog.Debug("Fetching repo", name)
-	return client.Repositories.Get(context.Background(), strings.Split(name, "/")[0], strings.Split(name, "/")[1])
+	repo, response, err := client.Repositories.Get(context.Background(), strings.Split(name, "/")[0], strings.Split(name, "/")[1])
+	if err != nil {
+		slog.Warn("Failed fetching repo", err)
+	} else {
+		slog.Debug("Fetched repo", repo)
+	}
+
+	return repo, response, err
 }
 
 func (*GithubManager) FetchOrg(name string) (*github.Organization, *github.Response, error) {