simono41/clipman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(selector): replace tabs when tool is dmenu

Browse source 
Dmenu breaks with entries containing tabs
This commit is contained in:
yory8 2019-09-27 09:24:55 +02:00
parent 7bffac6caf
commit 913fb79ce8
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
selector.go
View file

@ -16,7 +16,7 @@ func selector(data []string, max int, tool string) (string, error) {
// output to stdout and return // output to stdout and return
if tool == "STDOUT" { if tool == "STDOUT" {
escaped, _ := preprocessData(data, false) escaped, _ := preprocessData(data, false, true)
os.Stdout.WriteString(strings.Join(escaped, "\n")) os.Stdout.WriteString(strings.Join(escaped, "\n"))
return "", nil return "", nil
} }
@ -42,7 +42,7 @@ func selector(data []string, max int, tool string) (string, error) {
return "", fmt.Errorf("Unsupported tool: %s", tool) return "", fmt.Errorf("Unsupported tool: %s", tool)
} }
processed, guide := preprocessData(data, true) processed, guide := preprocessData(data, true, false)
cmd := exec.Cmd{Path: bin, Args: args, Stdin: strings.NewReader(strings.Join(processed, "\n"))} cmd := exec.Cmd{Path: bin, Args: args, Stdin: strings.NewReader(strings.Join(processed, "\n"))}
b, err := cmd.CombinedOutput() b, err := cmd.CombinedOutput()
@ -68,7 +68,7 @@ func selector(data []string, max int, tool string) (string, error) {
// - escapes \n (it would break external selectors) // - escapes \n (it would break external selectors)
// - optionally it cuts items longer than 400 bytes (dmenu doesn't allow more than ~1200) // - optionally it cuts items longer than 400 bytes (dmenu doesn't allow more than ~1200)
// A guide is created to allow restoring the selected item. // A guide is created to allow restoring the selected item.
func preprocessData(data []string, cutting bool) ([]string, map[string]string) { func preprocessData(data []string, cutting bool, allowTabs bool) ([]string, map[string]string) {
var escaped []string var escaped []string
guide := make(map[string]string) guide := make(map[string]string)
@ -79,6 +79,11 @@ func preprocessData(data []string, cutting bool) ([]string, map[string]string) {
repr := strings.ReplaceAll(original, "\\n", "\\\\n") // preserve literal \n repr := strings.ReplaceAll(original, "\\n", "\\\\n") // preserve literal \n
repr = strings.ReplaceAll(repr, "\n", "\\n") repr = strings.ReplaceAll(repr, "\n", "\\n")
if !allowTabs {
repr = strings.ReplaceAll(repr, "\\t", "\\\\t")
repr = strings.ReplaceAll(repr, "\t", "\\t")
}
// optionally cut to maxChars // optionally cut to maxChars
const maxChars = 400 const maxChars = 400
if cutting && len(repr) > maxChars { if cutting && len(repr) > maxChars {