diff --git a/pkg/output/tui/bubbletee964.go b/pkg/output/tui/bubbletee964.go new file mode 100644 index 00000000..41596688 --- /dev/null +++ b/pkg/output/tui/bubbletee964.go @@ -0,0 +1,50 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "bytes" + "io" + "log" + "os" +) + +// safeguardBubbletee964 will safeguard the io.Reader by returning a new +// io.Reader that will prevent the +// https://github.com/charmbracelet/bubbletea/issues/964 issue. +// +// TODO: Remove this function once the issue is resolved. +func safeguardBubbletee964(in io.Reader) io.Reader { + if in == nil { + return nil + } + if f, ok := in.(*os.File); ok { + if st, err := f.Stat(); err == nil { + log.Fatal("unexpected: ", err) + } else { + if !st.Mode().IsRegular() { + if st.Name() != os.DevNull { + log.Println("WARN: non-regular file given as input: ", + st.Name(), " (mode: ", st.Mode(), + "). Using `nil` as input.") + } + return bytes.NewBufferString("") + } + } + } + return in +} diff --git a/pkg/output/tui/progress.go b/pkg/output/tui/progress.go index 403816d0..7e7c5364 100644 --- a/pkg/output/tui/progress.go +++ b/pkg/output/tui/progress.go @@ -243,7 +243,7 @@ func (b *BubbleProgress) start() { b.prog = progress.New(progress.WithDefaultGradient()) out := b.OutOrStdout() b.tea = tea.NewProgram(b, - tea.WithInput(b.InOrStdin()), + tea.WithInput(safeguardBubbletee964(b.InOrStdin())), tea.WithOutput(out), ) b.quitChan = make(chan struct{}) diff --git a/pkg/output/tui/spinner.go b/pkg/output/tui/spinner.go index 6f44c4f5..76d5a34d 100644 --- a/pkg/output/tui/spinner.go +++ b/pkg/output/tui/spinner.go @@ -80,7 +80,7 @@ func (b *BubbleSpinner) start() { ) out := b.OutOrStdout() b.tea = tea.NewProgram(b, - tea.WithInput(b.InOrStdin()), + tea.WithInput(safeguardBubbletee964(b.InOrStdin())), tea.WithOutput(out), ) b.quitChan = make(chan struct{})