blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

completions: add folder flexible search as an option

Browse source 
Provide an option to change the completion style when selecting a folder
from completing with folders starting with the input string to
completing with folders in which the input string is a substring present
at any point in the folder name.

References: https://lists.sr.ht/~sircmpwn/aerc/%3C20201129181020.186984-1-inwit%40sindominio.net%3E
References: https://lists.sr.ht/~sircmpwn/aerc/%3C20210223202536.199355-1-clayton%40craftyguy.net%3E
Signed-off-by: inwit <inwit@sindominio.net>
This commit is contained in:
inwit 2022-01-31 17:32:19 +01:00 • committed by Robin Jarry
commit e0b5f2e08c
4 changed files with 26 additions and 1 deletions
commands
commands.go

15
commands/commands.go
View file

@ -121,7 +121,7 @@ func GetFolders(aerc *widgets.Aerc, args []string) []string {
return aerc.SelectedAccount().Directories().List()
}
for _, dir := range aerc.SelectedAccount().Directories().List() {
if hasCaseSmartPrefix(dir, args[0]) {
if foundInString(dir, args[0], aerc.SelectedAccount().UiConfig().FuzzyFolderComplete) {
out = append(out, dir)
}
}
@ -177,6 +177,14 @@ func GetLabels(aerc *widgets.Aerc, args []string) []string {
return out
}
func foundInString(s, substring string, fuzzy bool) bool {
if fuzzy {
return caseInsensitiveContains(s, substring)
} else {
return hasCaseSmartPrefix(s, substring)
}
}
// hasCaseSmartPrefix checks whether s starts with prefix, using a case
// sensitive match if and only if prefix contains upper case letters.
func hasCaseSmartPrefix(s, prefix string) bool {
@ -186,6 +194,11 @@ func hasCaseSmartPrefix(s, prefix string) bool {
return strings.HasPrefix(strings.ToLower(s), strings.ToLower(prefix))
}
func caseInsensitiveContains(s, substr string) bool {
s, substr = strings.ToUpper(s), strings.ToUpper(substr)
return strings.Contains(s, substr)
}
func hasUpper(s string) bool {
for _, r := range s {
if unicode.IsUpper(r) {