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
parent 27122ef8e8
commit e0b5f2e08c
4 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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) {

4
config/aerc.conf.in
View file

@ -112,6 +112,10 @@ stylesets-dirs=@SHAREDIR@/stylesets/
# Default: default
styleset-name=default
# Activates fuzzy search for IMAP folders: the typed string is search in the
# folder tree in any position, not necessarily at the beginning.
#fuzzy-folder-complete=false
#[ui:account=foo]
#
# Enable threading in the ui. Only works with notmuch:// and imap:// accounts

2
config/config.go
View file

@ -43,6 +43,7 @@ type UIConfig struct {
EmptyDirlist string `ini:"empty-dirlist"`
MouseEnabled bool `ini:"mouse-enabled"`
ThreadingEnabled bool `ini:"threading-enabled"`
FuzzyFolderComplete bool `ini:"fuzzy-folder-complete"`
NewMessageBell bool `ini:"new-message-bell"`
Spinner string `ini:"spinner"`
SpinnerDelimiter string `ini:"spinner-delimiter"`
@ -563,6 +564,7 @@ func LoadConfigFromFile(root *string, sharedir string, logger *log.Logger) (*Aer
EmptyDirlist: "(no folders)",
MouseEnabled: false,
NewMessageBell: true,
FuzzyFolderComplete: false,
Spinner: "[..] , [..] , [..] , [..] , [..], [..] , [..] , [..] ",
SpinnerDelimiter: ",",
DirListFormat: "%n %>r",

6
doc/aerc-config.5.scd
View file

@ -222,6 +222,12 @@ These options are configured in the *[ui]* section of aerc.conf.
Have a look at *aerc-stylesets*(7) as to how a styleset looks like.
*fuzzy-folder-complete*
When finding a folder with cf or move, for example, the popover will
how not only the folders /starting/ with the string input by the user,
but it will show coincidences of folders /containing/ the string in any
position of their name. This is case-independent.
*threading-enabled*
Enable a threaded viewing of messages, works with IMAP (when there's
server support) and NotMuch backends.