lew/pda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(KeySpec): moves over to a unified KeySpec struct for parsing

Browse source
This commit is contained in:
Lewis Wynne 2025-12-18 12:29:08 +00:00
parent 3d4cd40a17
commit 0c0de52a6e
4 changed files with 85 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/del.go
View file

@ -139,17 +139,11 @@ func keyExists(store *Store, arg string) (bool, error) {
}
func formatKeyForPrompt(store *Store, arg string) (string, error) {
_, db, err := store.parse(arg, true)
spec, err := store.parseKey(arg, true)
if err != nil {
return "", err
}
if strings.Contains(arg, "@") {
return arg, nil
}
if db == "" {
return arg, nil
}
return fmt.Sprintf("%s@%s", arg, db), nil
return spec.Display(), nil
}
func resolveDeleteTargets(store *Store, exactArgs []string, globPatterns []string, separators []rune) ([]string, []string, error) {
@ -188,18 +182,18 @@ func resolveDeleteTargets(store *Store, exactArgs []string, globPatterns []strin
var compiled []compiledPattern
for _, raw := range globPatterns {
kb, db, err := store.parse(raw, true)
spec, err := store.parseKey(raw, true)
if err != nil {
return nil, nil, err
}
pattern := string(kb)
pattern := spec.Key
m, err := glob.Compile(pattern, separators...)
if err != nil {
return nil, nil, fmt.Errorf("cannot remove '%s': %v", raw, err)
}
compiled = append(compiled, compiledPattern{
rawArg: raw,
db: db,
db: spec.DB,
matcher: m,
})
}