@@ -7,9 +7,11 @@ import (
77 "strings"
88 "sync"
99 "time"
10+ "unicode/utf8"
1011
1112 "github.com/charmbracelet/lipgloss"
1213 "github.com/charmbracelet/lipgloss/table"
14+ "golang.org/x/term"
1315)
1416
1517var (
@@ -68,6 +70,33 @@ func PrintStream(text string) {
6870func PrintHeader (text string ) {
6971 fmt .Println (headerStyle .Render (text ))
7072}
73+ func FSuccess (text string ) string {
74+ return successStyle .Render (text )
75+ }
76+ func FSuccess2 (text string ) string {
77+ return success2Style .Render (text )
78+ }
79+ func FError (text string ) string {
80+ return errorStyle .Render (text )
81+ }
82+ func FWarning (text string ) string {
83+ return warningStyle .Render (text )
84+ }
85+ func FInfo (text string ) string {
86+ return infoStyle .Render (text )
87+ }
88+ func FDebug (text string ) string {
89+ return debugStyle .Render (text )
90+ }
91+ func FDetail (text string ) string {
92+ return detailStyle .Render (text )
93+ }
94+ func FStream (text string ) string {
95+ return streamStyle .Render (text )
96+ }
97+ func FHeader (text string ) string {
98+ return headerStyle .Render (text )
99+ }
71100
72101// ======================================== =================
73102// ======================================== Table Definitions
@@ -85,6 +114,12 @@ func NewTable(headers []string) *Table {
85114 Rows : [][]string {},
86115 }
87116 t .table = table .New ().Headers (headers ... )
117+ t .table = t .table .StyleFunc (func (row , col int ) lipgloss.Style {
118+ if row == table .HeaderRow {
119+ return lipgloss .NewStyle ().Bold (true ).Align (lipgloss .Center ).Padding (0 , 1 )
120+ }
121+ return lipgloss .NewStyle ().Padding (0 , 1 )
122+ })
88123 return t
89124}
90125
@@ -106,7 +141,7 @@ func (t *Table) FormatTable(useMarkdown bool) string {
106141}
107142
108143func (t * Table ) PrintTable (useMarkdown bool ) {
109- os . Stdout . WriteString (t .FormatTable (useMarkdown ))
144+ fmt . Println (t .FormatTable (useMarkdown ))
110145}
111146
112147func (t * Table ) WriteMarkdownTableToFile (outputPath string ) error {
@@ -303,26 +338,81 @@ func (m *Manager) AddStreamLine(name string, line string) {
303338 m .mutex .Lock ()
304339 defer m .mutex .Unlock ()
305340 if info , exists := m .outputs [name ]; exists {
306- if m .unlimitedOutput { // just append
307- info .StreamLines = append (info .StreamLines , line )
341+ // Wrap the line with indentation
342+ wrappedLines := wrapText (line , basePadding + 4 )
343+ if m .unlimitedOutput { // just append all wrapped lines
344+ info .StreamLines = append (info .StreamLines , wrappedLines ... )
308345 } else { // enforce size limit
309346 currentLen := len (info .StreamLines )
310- if currentLen + 1 > m .maxStreams {
311- info .StreamLines = append (info .StreamLines [1 :], line )
347+ totalNewLines := len (wrappedLines )
348+ if currentLen + totalNewLines > m .maxStreams {
349+ startIndex := currentLen + totalNewLines - m .maxStreams
350+ if startIndex > currentLen {
351+ startIndex = 0
352+ existingToKeep := m .maxStreams - totalNewLines
353+ if existingToKeep > 0 {
354+ info .StreamLines = info .StreamLines [currentLen - existingToKeep :]
355+ } else {
356+ info .StreamLines = []string {} // All existing lines will be dropped
357+ }
358+ } else {
359+ info .StreamLines = info .StreamLines [startIndex :]
360+ }
361+ info .StreamLines = append (info .StreamLines , wrappedLines ... )
312362 } else {
313- info .StreamLines = append (info .StreamLines , line )
363+ info .StreamLines = append (info .StreamLines , wrappedLines ... )
364+ }
365+ if len (info .StreamLines ) > m .maxStreams {
366+ info .StreamLines = info .StreamLines [len (info .StreamLines )- m .maxStreams :]
314367 }
315368 }
316369 info .LastUpdated = time .Now ()
317370 }
318371}
319372
373+ func GetTerminalWidth () int {
374+ width , _ , err := term .GetSize (int (os .Stdout .Fd ()))
375+ if err != nil || width <= 0 {
376+ return 80 // Default fallback width if terminal width can't be determined
377+ }
378+ return width
379+ }
380+
381+ func wrapText (text string , indent int ) []string {
382+ termWidth := GetTerminalWidth ()
383+ maxWidth := termWidth - indent - 2 // Account for indentation
384+ if maxWidth <= 10 {
385+ maxWidth = 80
386+ }
387+ if utf8 .RuneCountInString (text ) <= maxWidth {
388+ return []string {text }
389+ }
390+ var lines []string
391+ currentLine := ""
392+ currentWidth := 0
393+ for _ , r := range text {
394+ runeWidth := 1
395+ // If adding this rune would exceed max width, flush the line
396+ if currentWidth + runeWidth > maxWidth {
397+ lines = append (lines , currentLine )
398+ currentLine = string (r )
399+ currentWidth = runeWidth
400+ } else {
401+ currentLine += string (r )
402+ currentWidth += runeWidth
403+ }
404+ }
405+ if currentLine != "" {
406+ lines = append (lines , currentLine )
407+ }
408+ return lines
409+ }
410+
320411func (m * Manager ) AddProgressBarToStream (name string , outof , final int64 , text string ) {
321412 m .mutex .Lock ()
322413 defer m .mutex .Unlock ()
323414 if info , exists := m .outputs [name ]; exists {
324- // percentage = max(0, min(percentage, 100))
325- progressBar := PrintProgressBar (outof , final , 30 )
415+ progressBar := PrintProgressBar (max (0 , outof ), final , 30 )
326416 display := progressBar + debugStyle .Render (text )
327417 info .StreamLines = []string {display } // Set as only stream so nothing else is displayed
328418 info .LastUpdated = time .Now ()
@@ -348,7 +438,7 @@ func (m *Manager) ClearLines(n int) {
348438 if n <= 0 {
349439 return
350440 }
351- fmt .Printf ("\033 [%dA\033 [J" , n )
441+ fmt .Printf ("\033 [%dA\033 [J" , min ( m . numLines , n ) )
352442 m .numLines = max (m .numLines - n , 0 )
353443}
354444
0 commit comments