format: add -W for max comment length

useful when there are too nested comments
less useful when there aren't many
not applied to the OP for now

cmd/discourseview/main.go

@@ -15,15 +15,16 @@ import (
 )
 
 type options struct {
-	leftPadding uint
-	timeout     time.Duration
-	useColors   bool
-	showAuthor  bool
-	showDate    bool
-	showId      bool
-	userAgent   string
-	useTUI      bool
-	width       uint
+	leftPadding  uint
+	timeout      time.Duration
+	useColors    bool
+	showAuthor   bool
+	showDate     bool
+	showId       bool
+	userAgent    string
+	useTUI       bool
+	lineWidth    uint
+	commentWidth uint
 }
 
 var opts options
@@ -35,7 +36,8 @@ func init() {
 	flag.BoolVar(&opts.useTUI, "x", false, "use TUI")
 	flag.DurationVar(&opts.timeout, "t", time.Second*5, "timeout in seconds")
 	flag.StringVar(&opts.userAgent, "A", "DiscourseView/1.0", "user agent to send")
-	flag.UintVar(&opts.width, "w", 100, "terminal width")
+	flag.UintVar(&opts.lineWidth, "w", 100, "line width")
+	flag.UintVar(&opts.commentWidth, "W", 80, "comment width")
 	flag.UintVar(&opts.leftPadding, "l", 3, "left padding on comments")
 }
 
@@ -58,7 +60,8 @@ func run(args []string, stdout io.Writer) error {
 	if err != nil {
 		return errors.New("could not fetch url")
 	}
-	thread.Width = int(opts.width)
+	thread.CommentWidth = int(opts.commentWidth)
+	thread.LineWidth = int(opts.lineWidth)
 	thread.LeftPadding = int(opts.leftPadding)
 	thread.ShowAuthor = opts.showAuthor
 	thread.ShowDate = opts.showDate

cmd/fourchanview/main.go

@@ -47,9 +47,9 @@ func run(args []string, stdout io.Writer) error {
 	url := flag.Args()[0]
 
 	thread, err := fourchan.Fetch(url)
-	thread.LineWidth = opts.lineWidth
-	thread.LeftPadding = opts.leftPadding
-	thread.CommentWidth = opts.commentWidth
+	thread.LineWidth = int(opts.lineWidth)
+	thread.LeftPadding = int(opts.leftPadding)
+	thread.CommentWidth = int(opts.commentWidth)
 
 	if err != nil {
 		return err

cmd/hackerview/main.go

@@ -15,14 +15,15 @@ import (
 )
 
 type options struct {
-	leftPadding uint
-	maxComments uint
-	nWorkers    uint
-	timeout     time.Duration
-	showColors  bool
-	showDate    bool
-	useTUI      bool
-	width       uint
+	leftPadding  uint
+	maxComments  uint
+	nWorkers     uint
+	timeout      time.Duration
+	showColors   bool
+	showDate     bool
+	useTUI       bool
+	lineWidth    uint
+	commentWidth uint
 }
 
 var opts options
@@ -33,8 +34,9 @@ func init() {
 	flag.BoolVar(&opts.useTUI, "x", false, "use TUI")
 	flag.DurationVar(&opts.timeout, "t", time.Second*5, "timeout in seconds")
 	flag.UintVar(&opts.maxComments, "c", 10, "limits the ammount of comments to fetch")
-	flag.UintVar(&opts.nWorkers, "W", 3, "number of workers to fetch comments")
-	flag.UintVar(&opts.width, "w", 100, "fixed with")
+	flag.UintVar(&opts.nWorkers, "n", 3, "number of workers to fetch comments")
+	flag.UintVar(&opts.lineWidth, "w", 100, "line width")
+	flag.UintVar(&opts.commentWidth, "W", 80, "comment width")
 	flag.UintVar(&opts.leftPadding, "l", 3, "left padding")
 }
 
@@ -57,8 +59,10 @@ func run(args []string, stdout io.Writer) error {
 	if err != nil {
 		return errors.New("could not fetch url")
 	}
-	thread.Width = opts.width
-	thread.LeftPadding = opts.leftPadding
+
+	thread.CommentWidth = int(opts.commentWidth)
+	thread.LeftPadding = int(opts.leftPadding)
+	thread.LineWidth = int(opts.lineWidth)
 	thread.ShowDate = opts.showDate
 
 	if opts.useTUI {

cmd/redditview/main.go

@@ -15,12 +15,13 @@ import (
 )
 
 type options struct {
-	leftPadding uint
-	maxWidth    uint
-	timeout     time.Duration
-	useColors   bool
-	userAgent   string
-	useTUI      bool
+	leftPadding  uint
+	lineWidth    uint
+	commentWidth uint
+	timeout      time.Duration
+	useColors    bool
+	userAgent    string
+	useTUI       bool
 }
 
 var opts options
@@ -30,7 +31,8 @@ func init() {
 	flag.BoolVar(&opts.useColors, "C", true, "use colors")
 	flag.DurationVar(&opts.timeout, "t", time.Second*5, "timeout in seconds")
 	flag.StringVar(&opts.userAgent, "A", "Reddit_Cli/0.1", "user agent to send to reddit")
-	flag.UintVar(&opts.maxWidth, "w", 110, "max console width")
+	flag.UintVar(&opts.lineWidth, "w", 100, "line width")
+	flag.UintVar(&opts.commentWidth, "W", 80, "comment width")
 	flag.UintVar(&opts.leftPadding, "l", 3, "left padding on comments")
 }
 
@@ -53,8 +55,9 @@ func run(args []string, stdout io.Writer) error {
 	if err != nil {
 		return err
 	}
-	thread.Width = opts.maxWidth
-	thread.LeftPadding = opts.leftPadding
+	thread.CommentWidth = int(opts.commentWidth)
+	thread.LineWidth = int(opts.lineWidth)
+	thread.LeftPadding = int(opts.leftPadding)
 
 	if opts.useTUI {
 		tui.RenderLoop(reddit.NewProgram(thread))

cmd/vichanview/main.go

@@ -15,15 +15,16 @@ import (
 )
 
 type options struct {
-	leftPadding uint
-	timeout     time.Duration
-	useColors   bool
-	showAuthor  bool
-	showDate    bool
-	showId      bool
-	userAgent   string
-	useTUI      bool
-	width       uint
+	leftPadding  uint
+	timeout      time.Duration
+	useColors    bool
+	showAuthor   bool
+	showDate     bool
+	showId       bool
+	userAgent    string
+	useTUI       bool
+	lineWidth    uint
+	commentWidth uint
 }
 
 var opts options
@@ -36,7 +37,8 @@ func init() {
 	flag.BoolVar(&opts.useTUI, "x", false, "use TUI")
 	flag.DurationVar(&opts.timeout, "t", time.Second*5, "timeout in seconds")
 	flag.StringVar(&opts.userAgent, "A", "VichanView/1.0", "user agent to send")
-	flag.UintVar(&opts.width, "w", 100, "terminal width")
+	flag.UintVar(&opts.commentWidth, "W", 100, "comment width")
+	flag.UintVar(&opts.lineWidth, "w", 100, "line width")
 	flag.UintVar(&opts.leftPadding, "l", 3, "left padding on comments")
 }
 
@@ -60,11 +62,12 @@ func run(args []string, stdout io.Writer) error {
 		return errors.New("could not fetch url")
 	}
 
-	thread.LeftPadding = opts.leftPadding
+	thread.CommentWidth = int(opts.commentWidth)
+	thread.LeftPadding = int(opts.leftPadding)
+	thread.LineWidth = int(opts.lineWidth)
 	thread.ShowAuthor = opts.showAuthor
 	thread.ShowDate = opts.showDate
 	thread.ShowId = opts.showId
-	thread.Width = opts.width
 
 	if opts.useTUI {
 		tui.RenderLoop(vichan.NewProgram(thread))

internal/discourse/format.go

@@ -22,7 +22,7 @@ func (o Op) String() (ret string) {
 	ret += fmt.Sprintf(" self: %s\n", o.thread.url)
 	ret += fmt.Sprintf(
 		"\n%s\n\n",
-		format.FormatHtml2Text(o.message, o.thread.Width, o.thread.LeftPadding),
+		format.FormatHtml2Text(o.message, o.thread.LineWidth, o.thread.LeftPadding),
 	)
 	ret += fmt.Sprintf(
 		"%s  - %s \n\n\n",
@@ -33,11 +33,18 @@ func (o Op) String() (ret string) {
 }
 
 func (c Comment) String() (ret string) {
+	leftPadding := c.thread.LeftPadding * c.depth
+	rightPadding := 2
+	extraLeft := 1
+	lineWidth := format.Min(
+		c.thread.LineWidth,
+		leftPadding+c.thread.CommentWidth+extraLeft,
+	) - rightPadding
 	ret += fmt.Sprintf(
 		"%s\n",
-		format.FormatHtml2Text(c.message, c.thread.Width, c.thread.LeftPadding*c.depth+1),
+		format.FormatHtml2Text(c.message, lineWidth, leftPadding+extraLeft),
 	)
-	ret += strings.Repeat(" ", c.depth*c.thread.LeftPadding)
+	ret += strings.Repeat(" ", leftPadding)
 	ret += ">>"
 	if c.thread.ShowAuthor {
 		ret += " "

internal/discourse/tui.go

@@ -1,8 +1,6 @@
 package discourse
 
 import (
-	"fmt"
-
 	"github.com/azimut/cli-view/internal/tui"
 	tea "github.com/charmbracelet/bubbletea"
 )
@@ -31,14 +29,14 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
 	// Initialize data to be used for links scrapping
 	if m.render.RawContent == "" {
-		m.Width = 300
-		m.render.RawContent = fmt.Sprint(m)
+		m.LineWidth = 300
+		m.render.RawContent = m.String()
 	}
 	m.render, cmd = m.render.Update(msg)
 	switch msg := msg.(type) {
 	case tea.WindowSizeMsg:
-		m.Width = msg.Width - rightPadding
-		m.render.Viewport.SetContent(fmt.Sprint(m))
+		m.LineWidth = msg.Width - rightPadding
+		m.render.Viewport.SetContent(m.String())
 	}
 	return m, cmd
 }

internal/discourse/types.go

@@ -5,14 +5,15 @@ import (
 )
 
 type Thread struct {
-	comments    []Comment
-	op          Op
-	id          int
-	url         string
-	Width       int
-	LeftPadding int
-	ShowDate    bool
-	ShowAuthor  bool
+	comments     []Comment
+	op           Op
+	id           int
+	url          string
+	LineWidth    int
+	CommentWidth int
+	LeftPadding  int
+	ShowDate     bool
+	ShowAuthor   bool
 }
 
 type Op struct {

internal/fourchan/format.go

@@ -43,11 +43,11 @@ func (op Op) String() (ret string) {
 }
 
 func (post Post) String() (ret string) {
-	leftPadding := int(post.thread.LeftPadding)*post.depth + 1
+	leftPadding := post.thread.LeftPadding*post.depth + 1
 	rightPadding := 2
 	lineWidth := format.Min(
-		int(post.thread.LineWidth),
-		leftPadding+int(post.thread.CommentWidth),
+		post.thread.LineWidth,
+		leftPadding+post.thread.CommentWidth,
 	) - rightPadding
 	if post.comment != "" {
 		comment, _ := text.WrapLeftPadded(

internal/fourchan/tui.go

@@ -2,7 +2,6 @@ package fourchan
 
 import (
 	"github.com/azimut/cli-view/internal/tui"
-	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
 )
 
@@ -34,9 +33,8 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	m.render, cmd = m.render.Update(msg)
 	switch msg := msg.(type) {
 	case tea.WindowSizeMsg:
-		m.LineWidth = uint(msg.Width)
+		m.LineWidth = msg.Width
 		m.render.Viewport.SetContent(m.String())
-		viewport.Sync(m.render.Viewport)
 	}
 	return m, cmd
 }

internal/fourchan/type.go

@@ -8,9 +8,9 @@ type Thread struct {
 	closed       bool
 	op           Op
 	posts        []Post
-	LineWidth    uint
-	LeftPadding  uint
-	CommentWidth uint
+	LineWidth    int
+	LeftPadding  int
+	CommentWidth int
 }
 
 type Op struct {

internal/hackernews/printer.go

@@ -27,7 +27,7 @@ func (o Op) String() (ret string) {
 	}
 	ret += fmt.Sprintf(" self: %s\n", o.selfUrl)
 	if o.text != "" {
-		ret += fmt.Sprintf("\n%s\n", fixupComment(o.text, 3, o.thread.Width))
+		ret += fmt.Sprintf("\n%s\n", fixupComment(o.text, 3, o.thread.LineWidth))
 	}
 	ret += fmt.Sprintf(
 		"\n%s(%d) - %s - %d Comments\n",
@@ -40,10 +40,13 @@ func (o Op) String() (ret string) {
 }
 
 func (c Comment) String() (ret string) {
-	indent := c.indent * int(c.thread.LeftPadding)
-	ret += "\n" + fixupComment(c.msg, indent+1, c.thread.Width) + "\n"
+	leftPadding := c.thread.LeftPadding * c.depth
+	rightPadding := 2
+	lineWidth := format.Min(c.thread.LineWidth, leftPadding+c.thread.CommentWidth+1) - rightPadding
+	ret += "\n" + fixupComment(c.msg, leftPadding+1, lineWidth) + "\n"
+
 	arrow := ">> "
-	if c.indent > 0 {
+	if c.depth > 0 {
 		arrow = ">> "
 	}
 
@@ -53,23 +56,24 @@ func (c Comment) String() (ret string) {
 	}
 
 	if c.thread.ShowDate {
-		ret += strings.Repeat(" ", indent) + arrow + author + " - " + humanize.Time(c.date)
+		ret += strings.Repeat(" ", leftPadding) + arrow + author + " - " + humanize.Time(c.date)
 	} else {
-		ret += strings.Repeat(" ", indent) + arrow + author
+		ret += strings.Repeat(" ", leftPadding) + arrow + author
 	}
+
 	ret += "\n"
 	return
 }
 
-func fixupComment(html string, leftPad int, width uint) string {
+func fixupComment(html string, leftPad int, width int) string {
 	plainText, err := html2text.FromString(
 		html,
 		html2text.Options{OmitLinks: false, PrettyTables: true, CitationStyleLinks: true},
 	)
 	if err != nil {
 		panic(err)
 	}
-	wrapped, _ := text.WrapLeftPadded(format.GreenTextIt(plainText), int(width), leftPad)
+	wrapped, _ := text.WrapLeftPadded(format.GreenTextIt(plainText), width, leftPad)
 	return wrapped
 }