cmd/dynamo-browse
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

issue-9: added clearing of existing bindings for keys

Browse source
This commit is contained in:
Leon Mika 2022-08-25 22:31:33 +10:00
parent 7c5bfd27a3
commit d9c9e5d845
7 changed files with 84 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

36
internal/dynamo-browse/services/keybindings/service.go
View file

@ -3,6 +3,7 @@ package keybindings
import (
"github.com/charmbracelet/bubbles/key"
"github.com/pkg/errors"
"log"
"reflect"
"strings"
)
@ -22,23 +23,28 @@ func NewService(keyBinding any) *Service {
}
}
func (s *Service) Rebind(newKey string, name string, force bool) error {
// Check if there already exists a binding
if !force {
var foundBinding = ""
s.walkBindingFields(func(bindingName string, binding key.Binding) bool {
for _, key := range binding.Keys() {
if key == newKey {
func (s *Service) Rebind(name string, newKey string, force bool) error {
// Check if there already exists a binding (or clear it)
var foundBinding = ""
s.walkBindingFields(func(bindingName string, binding *key.Binding) bool {
for _, boundKey := range binding.Keys() {
if boundKey == newKey {
if force {
// TODO: only filter out "boundKey" rather clear
log.Printf("clearing binding of %v", bindingName)
*binding = key.NewBinding()
return true
} else {
foundBinding = bindingName
return false
}
}
return true
})
if foundBinding != "" {
return KeyAlreadyBoundError{Key: newKey, ExistingBindingName: foundBinding}
}
return true
})
if foundBinding != "" {
return KeyAlreadyBoundError{Key: newKey, ExistingBindingName: foundBinding}
}
// Rebind
@ -80,11 +86,11 @@ func (s *Service) findFieldForBindingInGroup(group reflect.Value, name string) *
return nil
}
func (s *Service) walkBindingFields(fn func(name string, binding key.Binding) bool) {
func (s *Service) walkBindingFields(fn func(name string, binding *key.Binding) bool) {
s.walkBindingFieldsInGroup(s.keyBindingValue, "", fn)
}
func (s *Service) walkBindingFieldsInGroup(group reflect.Value, prefix string, fn func(name string, binding key.Binding) bool) bool {
func (s *Service) walkBindingFieldsInGroup(group reflect.Value, prefix string, fn func(name string, binding *key.Binding) bool) bool {
groupType := group.Type()
for i := 0; i < group.NumField(); i++ {
fieldType := groupType.Field(i)
@ -108,7 +114,7 @@ func (s *Service) walkBindingFieldsInGroup(group reflect.Value, prefix string, f
if !isBinding {
continue
}
if !fn(fullName, *binding) {
if !fn(fullName, binding) {
return false
}
}