From 7537fa00e4119c531178b884390290477051904f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 15 Sep 2024 08:03:16 +0530 Subject: [PATCH] Cleanup some code --- kittens/clipboard/read.go | 8 ++++++-- kittens/clipboard/write.go | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kittens/clipboard/read.go b/kittens/clipboard/read.go index 5d5cc6c446..fd4422b5aa 100644 --- a/kittens/clipboard/read.go +++ b/kittens/clipboard/read.go @@ -203,7 +203,11 @@ func unescape_metadata_value(k, x string) (ans string) { func encode_bytes(metadata map[string]string, payload []byte) string { ans := strings.Builder{} - ans.Grow(2048) + enc_payload := "" + if len(payload) > 0 { + enc_payload = base64.StdEncoding.EncodeToString(payload) + } + ans.Grow(2048 + len(enc_payload)) ans.WriteString("\x1b]") ans.WriteString(OSC_NUMBER) ans.WriteString(";") @@ -217,7 +221,7 @@ func encode_bytes(metadata map[string]string, payload []byte) string { } if len(payload) > 0 { ans.WriteString(";") - ans.WriteString(base64.StdEncoding.EncodeToString(payload)) + ans.WriteString(enc_payload) } ans.WriteString("\x1b\\") return ans.String() diff --git a/kittens/clipboard/write.go b/kittens/clipboard/write.go index e3785e6580..fc11b5ed17 100644 --- a/kittens/clipboard/write.go +++ b/kittens/clipboard/write.go @@ -222,8 +222,6 @@ func run_set_loop(opts *Options, args []string) (err error) { return fmt.Errorf("Could not guess MIME type for %s use the --mime option to specify a MIME type", arg) } to_process[i] = inputs[i] - if to_process[i].is_stream { - } } return write_loop(to_process, opts) }