git.iko.soy/crush
on main help sign in
fix: build linux/386 (#2153)
dc890f3Carlos Alexandro Becker
internal/ui/model/clipboard.gonew file+15
compare with main
unifiedsplit
@@ -0,0 +1,15 @@
1+package model
2+
3+import "errors"
4+
5+type clipboardFormat int
6+
7+const (
8+ clipboardFormatText clipboardFormat = iota
9+ clipboardFormatImage
10+)
11+
12+var (
13+ errClipboardPlatformUnsupported = errors.New("clipboard operations are not supported on this platform")
14+ errClipboardUnknownFormat = errors.New("unknown clipboard format")
15+)
internal/ui/model/clipboard_linux_386.gonew file+7
@@ -0,0 +1,7 @@
1+//go:build linux && 386
2+
3+package model
4+
5+func readClipboard(clipboardFormat) ([]byte, error) {
6+ return nil, errClipboardPlatformUnsupported
7+}
internal/ui/model/clipboard_other.gonew file+15
@@ -0,0 +1,15 @@
1+//go:build !linux || !386
2+
3+package model
4+
5+import "github.com/aymanbagabas/go-nativeclipboard"
6+
7+func readClipboard(f clipboardFormat) ([]byte, error) {
8+ switch f {
9+ case clipboardFormatText:
10+ return nativeclipboard.Text.Read()
11+ case clipboardFormatImage:
12+ return nativeclipboard.Image.Read()
13+ }
14+ return nil, errClipboardUnknownFormat
15+}
internal/ui/model/ui.go+2−3
@@ -24,7 +24,6 @@ import (
24 tea "charm.land/bubbletea/v2"
24 tea "charm.land/bubbletea/v2"
25 "charm.land/catwalk/pkg/catwalk"
25 "charm.land/catwalk/pkg/catwalk"
26 "charm.land/lipgloss/v2"
26 "charm.land/lipgloss/v2"
27− nativeclipboard "github.com/aymanbagabas/go-nativeclipboard"
28 "github.com/charmbracelet/crush/internal/agent/tools/mcp"
27 "github.com/charmbracelet/crush/internal/agent/tools/mcp"
29 "github.com/charmbracelet/crush/internal/app"
28 "github.com/charmbracelet/crush/internal/app"
30 "github.com/charmbracelet/crush/internal/commands"
29 "github.com/charmbracelet/crush/internal/commands"
@@ -3086,7 +3085,7 @@ func (m *UI) handleFilePathPaste(path string) tea.Cmd {
3086// creates an attachment. If no image data is found, it falls back to
3085// creates an attachment. If no image data is found, it falls back to
3087// interpreting clipboard text as a file path.
3086// interpreting clipboard text as a file path.
3088func (m *UI) pasteImageFromClipboard() tea.Msg {
3087func (m *UI) pasteImageFromClipboard() tea.Msg {
3089− imageData, err := nativeclipboard.Image.Read()
3088+ imageData, err := readClipboard(clipboardFormatImage)
3090 if int64(len(imageData)) > common.MaxAttachmentSize {
3089 if int64(len(imageData)) > common.MaxAttachmentSize {
3091 return util.InfoMsg{
3090 return util.InfoMsg{
3092 Type: util.InfoTypeError,
3091 Type: util.InfoTypeError,
@@ -3103,7 +3102,7 @@ func (m *UI) pasteImageFromClipboard() tea.Msg {
3103 }
3102 }
3104 }
3103 }
3105
3104
3106− textData, textErr := nativeclipboard.Text.Read()
3105+ textData, textErr := readClipboard(clipboardFormatText)
3107 if textErr != nil || len(textData) == 0 {
3106 if textErr != nil || len(textData) == 0 {
3108 return util.NewInfoMsg("Clipboard is empty or does not contain an image")
3107 return util.NewInfoMsg("Clipboard is empty or does not contain an image")
3109 }
3108 }