mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 04:15:48 +02:00
The global counter approach is easy to understand but it's brittle and depends on implicit behaviour that is not very discoverable. With a global counter, if any goroutine accidentally decrements the counter twice, we'll think lazygit is idle when it's actually busy. Likewise if a goroutine accidentally increments the counter twice we'll think lazygit is busy when it's actually idle. With the new approach we have a map of tasks where each task can either be busy or not. We create a new task and add it to the map when we spawn a worker goroutine (among other things) and we remove it once the task is done. The task can also be paused and continued for situations where we switch back and forth between running a program and asking for user input. In order for this to work with `git push` (and other commands that require credentials) we need to obtain the task from gocui when we create the worker goroutine, and then pass it along to the commands package to pause/continue the task as required. This is MUCH more discoverable than the old approach which just decremented and incremented the global counter from within the commands package, but it's at the cost of expanding some function signatures (arguably a good thing). Likewise, whenever you want to call WithWaitingStatus or WithLoaderPanel the callback will now have access to the task for pausing/ continuing. We only need to actually make use of this functionality in a couple of places so it's a high price to pay, but I don't know if I want to introduce a WithWaitingStatusTask and WithLoaderPanelTask function (open to suggestions).
290 lines
9.1 KiB
Go
290 lines
9.1 KiB
Go
package custom_commands
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"text/template"
|
|
|
|
"github.com/jesseduffield/generics/slices"
|
|
"github.com/jesseduffield/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
// takes a custom command and returns a function that will be called when the corresponding user-defined keybinding is pressed
|
|
type HandlerCreator struct {
|
|
c *helpers.HelperCommon
|
|
sessionStateLoader *SessionStateLoader
|
|
resolver *Resolver
|
|
menuGenerator *MenuGenerator
|
|
suggestionsHelper *helpers.SuggestionsHelper
|
|
}
|
|
|
|
func NewHandlerCreator(
|
|
c *helpers.HelperCommon,
|
|
sessionStateLoader *SessionStateLoader,
|
|
suggestionsHelper *helpers.SuggestionsHelper,
|
|
) *HandlerCreator {
|
|
resolver := NewResolver(c.Common)
|
|
menuGenerator := NewMenuGenerator(c.Common)
|
|
|
|
return &HandlerCreator{
|
|
c: c,
|
|
sessionStateLoader: sessionStateLoader,
|
|
resolver: resolver,
|
|
menuGenerator: menuGenerator,
|
|
suggestionsHelper: suggestionsHelper,
|
|
}
|
|
}
|
|
|
|
func (self *HandlerCreator) call(customCommand config.CustomCommand) func() error {
|
|
return func() error {
|
|
sessionState := self.sessionStateLoader.call()
|
|
promptResponses := make([]string, len(customCommand.Prompts))
|
|
form := make(map[string]string)
|
|
|
|
f := func() error { return self.finalHandler(customCommand, sessionState, promptResponses, form) }
|
|
|
|
// if we have prompts we'll recursively wrap our confirm handlers with more prompts
|
|
// until we reach the actual command
|
|
for reverseIdx := range customCommand.Prompts {
|
|
// reassigning so that we don't end up with an infinite recursion
|
|
g := f
|
|
idx := len(customCommand.Prompts) - 1 - reverseIdx
|
|
|
|
// going backwards so the outermost prompt is the first one
|
|
prompt := customCommand.Prompts[idx]
|
|
|
|
wrappedF := func(response string) error {
|
|
promptResponses[idx] = response
|
|
form[prompt.Key] = response
|
|
return g()
|
|
}
|
|
|
|
resolveTemplate := self.getResolveTemplateFn(form, promptResponses, sessionState)
|
|
|
|
switch prompt.Type {
|
|
case "input":
|
|
f = func() error {
|
|
resolvedPrompt, err := self.resolver.resolvePrompt(&prompt, resolveTemplate)
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
return self.inputPrompt(resolvedPrompt, wrappedF)
|
|
}
|
|
case "menu":
|
|
f = func() error {
|
|
resolvedPrompt, err := self.resolver.resolvePrompt(&prompt, resolveTemplate)
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
return self.menuPrompt(resolvedPrompt, wrappedF)
|
|
}
|
|
case "menuFromCommand":
|
|
f = func() error {
|
|
resolvedPrompt, err := self.resolver.resolvePrompt(&prompt, resolveTemplate)
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
return self.menuPromptFromCommand(resolvedPrompt, wrappedF)
|
|
}
|
|
case "confirm":
|
|
f = func() error {
|
|
resolvedPrompt, err := self.resolver.resolvePrompt(&prompt, resolveTemplate)
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
return self.confirmPrompt(resolvedPrompt, g)
|
|
}
|
|
default:
|
|
return self.c.ErrorMsg("custom command prompt must have a type of 'input', 'menu', 'menuFromCommand', or 'confirm'")
|
|
}
|
|
}
|
|
|
|
return f()
|
|
}
|
|
}
|
|
|
|
func (self *HandlerCreator) inputPrompt(prompt *config.CustomCommandPrompt, wrappedF func(string) error) error {
|
|
findSuggestionsFn, err := self.generateFindSuggestionsFunc(prompt)
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
|
|
return self.c.Prompt(types.PromptOpts{
|
|
Title: prompt.Title,
|
|
InitialContent: prompt.InitialValue,
|
|
FindSuggestionsFunc: findSuggestionsFn,
|
|
HandleConfirm: func(str string) error {
|
|
return wrappedF(str)
|
|
},
|
|
})
|
|
}
|
|
|
|
func (self *HandlerCreator) generateFindSuggestionsFunc(prompt *config.CustomCommandPrompt) (func(string) []*types.Suggestion, error) {
|
|
if prompt.Suggestions.Preset != "" && prompt.Suggestions.Command != "" {
|
|
return nil, fmt.Errorf(
|
|
fmt.Sprintf(
|
|
"Custom command prompt cannot have both a preset and a command for suggestions. Preset: '%s', Command: '%s'",
|
|
prompt.Suggestions.Preset,
|
|
prompt.Suggestions.Command,
|
|
),
|
|
)
|
|
} else if prompt.Suggestions.Preset != "" {
|
|
return self.getPresetSuggestionsFn(prompt.Suggestions.Preset)
|
|
} else if prompt.Suggestions.Command != "" {
|
|
return self.getCommandSuggestionsFn(prompt.Suggestions.Command)
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
|
|
func (self *HandlerCreator) getCommandSuggestionsFn(command string) (func(string) []*types.Suggestion, error) {
|
|
lines := []*types.Suggestion{}
|
|
err := self.c.OS().Cmd.NewShell(command).RunAndProcessLines(func(line string) (bool, error) {
|
|
lines = append(lines, &types.Suggestion{Value: line, Label: line})
|
|
return false, nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return func(currentWord string) []*types.Suggestion {
|
|
return lo.Filter(lines, func(suggestion *types.Suggestion, _ int) bool {
|
|
return strings.Contains(strings.ToLower(suggestion.Value), strings.ToLower(currentWord))
|
|
})
|
|
}, nil
|
|
}
|
|
|
|
func (self *HandlerCreator) getPresetSuggestionsFn(preset string) (func(string) []*types.Suggestion, error) {
|
|
switch preset {
|
|
case "authors":
|
|
return self.suggestionsHelper.GetAuthorsSuggestionsFunc(), nil
|
|
case "branches":
|
|
return self.suggestionsHelper.GetBranchNameSuggestionsFunc(), nil
|
|
case "files":
|
|
return self.suggestionsHelper.GetFilePathSuggestionsFunc(), nil
|
|
case "refs":
|
|
return self.suggestionsHelper.GetRefsSuggestionsFunc(), nil
|
|
case "remotes":
|
|
return self.suggestionsHelper.GetRemoteSuggestionsFunc(), nil
|
|
case "remoteBranches":
|
|
return self.suggestionsHelper.GetRemoteBranchesSuggestionsFunc("/"), nil
|
|
case "tags":
|
|
return self.suggestionsHelper.GetTagsSuggestionsFunc(), nil
|
|
default:
|
|
return nil, fmt.Errorf("Unknown value for suggestionsPreset in custom command: %s. Valid values: files, branches, remotes, remoteBranches, refs", preset)
|
|
}
|
|
}
|
|
|
|
func (self *HandlerCreator) confirmPrompt(prompt *config.CustomCommandPrompt, handleConfirm func() error) error {
|
|
return self.c.Confirm(types.ConfirmOpts{
|
|
Title: prompt.Title,
|
|
Prompt: prompt.Body,
|
|
HandleConfirm: handleConfirm,
|
|
})
|
|
}
|
|
|
|
func (self *HandlerCreator) menuPrompt(prompt *config.CustomCommandPrompt, wrappedF func(string) error) error {
|
|
menuItems := slices.Map(prompt.Options, func(option config.CustomCommandMenuOption) *types.MenuItem {
|
|
return &types.MenuItem{
|
|
LabelColumns: []string{option.Name, style.FgYellow.Sprint(option.Description)},
|
|
OnPress: func() error {
|
|
return wrappedF(option.Value)
|
|
},
|
|
}
|
|
})
|
|
|
|
return self.c.Menu(types.CreateMenuOptions{Title: prompt.Title, Items: menuItems})
|
|
}
|
|
|
|
func (self *HandlerCreator) menuPromptFromCommand(prompt *config.CustomCommandPrompt, wrappedF func(string) error) error {
|
|
// Run and save output
|
|
message, err := self.c.Git().Custom.RunWithOutput(prompt.Command)
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
|
|
// Need to make a menu out of what the cmd has displayed
|
|
candidates, err := self.menuGenerator.call(message, prompt.Filter, prompt.ValueFormat, prompt.LabelFormat)
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
|
|
menuItems := slices.Map(candidates, func(candidate *commandMenuItem) *types.MenuItem {
|
|
return &types.MenuItem{
|
|
LabelColumns: []string{candidate.label},
|
|
OnPress: func() error {
|
|
return wrappedF(candidate.value)
|
|
},
|
|
}
|
|
})
|
|
|
|
return self.c.Menu(types.CreateMenuOptions{Title: prompt.Title, Items: menuItems})
|
|
}
|
|
|
|
type CustomCommandObjects struct {
|
|
*SessionState
|
|
PromptResponses []string
|
|
Form map[string]string
|
|
}
|
|
|
|
func (self *HandlerCreator) getResolveTemplateFn(form map[string]string, promptResponses []string, sessionState *SessionState) func(string) (string, error) {
|
|
objects := CustomCommandObjects{
|
|
SessionState: sessionState,
|
|
PromptResponses: promptResponses,
|
|
Form: form,
|
|
}
|
|
|
|
funcs := template.FuncMap{
|
|
"quote": self.c.OS().Quote,
|
|
}
|
|
|
|
return func(templateStr string) (string, error) { return utils.ResolveTemplate(templateStr, objects, funcs) }
|
|
}
|
|
|
|
func (self *HandlerCreator) finalHandler(customCommand config.CustomCommand, sessionState *SessionState, promptResponses []string, form map[string]string) error {
|
|
resolveTemplate := self.getResolveTemplateFn(form, promptResponses, sessionState)
|
|
cmdStr, err := resolveTemplate(customCommand.Command)
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
|
|
cmdObj := self.c.OS().Cmd.NewShell(cmdStr)
|
|
|
|
if customCommand.Subprocess {
|
|
return self.c.RunSubprocessAndRefresh(cmdObj)
|
|
}
|
|
|
|
loadingText := customCommand.LoadingText
|
|
if loadingText == "" {
|
|
loadingText = self.c.Tr.RunningCustomCommandStatus
|
|
}
|
|
|
|
return self.c.WithWaitingStatus(loadingText, func(*gocui.Task) error {
|
|
self.c.LogAction(self.c.Tr.Actions.CustomCommand)
|
|
|
|
if customCommand.Stream {
|
|
cmdObj.StreamOutput()
|
|
}
|
|
output, err := cmdObj.RunWithOutput()
|
|
if err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
|
|
if customCommand.ShowOutput {
|
|
if strings.TrimSpace(output) == "" {
|
|
output = self.c.Tr.EmptyOutput
|
|
}
|
|
if err = self.c.Alert(cmdStr, output); err != nil {
|
|
return self.c.Error(err)
|
|
}
|
|
return self.c.Refresh(types.RefreshOptions{})
|
|
}
|
|
return self.c.Refresh(types.RefreshOptions{})
|
|
})
|
|
}
|