KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2023-01-24 18:26:01 +05:30
parent 5066623089
commit 41fb3c79c5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/cmd/clipboard/read.go
View File

@ -171,7 +171,7 @@ func (self *Output) assign_mime_type(available_mimes []string, aliases map[strin
}
}
}
if strings.HasPrefix(self.mime_type, "text/") {
if is_textual_mime(self.mime_type) {
for _, mt := range available_mimes {
if mt == "text/plain" {
self.remote_mime_type = mt

23
tools/cmd/clipboard/write.go
View File

@ -8,7 +8,6 @@ import (
"io"
"os"
"path/filepath"
"regexp"
"strings"
"kitty/tools/tui/loop"
@ -26,12 +25,20 @@ type Input struct {
extra_mime_types []string
}
func (self *Input) has_mime_matching(pat *regexp.Regexp) bool {
if pat.MatchString(self.mime_type) {
func is_textual_mime(x string) bool {
return strings.HasPrefix(x, "text/")
}
func is_text_plain_mime(x string) bool {
return x == "text/plain"
}
func (self *Input) has_mime_matching(predicate func(string) bool) bool {
if predicate(self.mime_type) {
return true
}
for _, i := range self.extra_mime_types {
if pat.MatchString(i) {
if predicate(i) {
return true
}
}
@ -51,20 +58,18 @@ func write_loop(inputs []*Input, opts *Options) (err error) {
}
num_text_mimes := 0
has_text_plain := false
text_pat := regexp.MustCompile("text/.+")
text_plain_pat := regexp.MustCompile("text/plain")
for _, i := range inputs {
i.extra_mime_types = aliases[i.mime_type]
if i.has_mime_matching(text_pat) {
if i.has_mime_matching(is_textual_mime) {
num_text_mimes++
if !has_text_plain && i.has_mime_matching(text_plain_pat) {
if !has_text_plain && i.has_mime_matching(is_text_plain_mime) {
has_text_plain = true
}
}
}
if num_text_mimes > 0 && !has_text_plain {
for _, i := range inputs {
if i.has_mime_matching(text_pat) {
if i.has_mime_matching(is_textual_mime) {
i.extra_mime_types = append(i.extra_mime_types, "text/plain")
break
}