tui: make color.NoColor=true on RawContent

fixes #13
azimut · May 2, 2023 · 3101d0d · 3101d0d
1 parent f0d122a
commit 3101d0d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/internal/discourse/tui.go b/internal/discourse/tui.go
@@ -3,6 +3,7 @@ package discourse
 import (
 	"github.com/azimut/cli-view/internal/tui"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/fatih/color"
 )
 
 const rightPadding = 10
@@ -29,11 +30,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 == "" {
+		oldColor := color.NoColor
 		oldCommentWidth := m.CommentWidth
-		m.LineWidth = 400
+		color.NoColor = true
 		m.CommentWidth = 300
+		m.LineWidth = 400
 		m.render.RawContent = m.String()
 		m.CommentWidth = oldCommentWidth
+		color.NoColor = oldColor
 	}
 	m.render, cmd = m.render.Update(msg)
 	switch msg := msg.(type) {

diff --git a/internal/fourchan/tui.go b/internal/fourchan/tui.go
@@ -3,6 +3,7 @@ package fourchan
 import (
 	"github.com/azimut/cli-view/internal/tui"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/fatih/color"
 )
 
 type Model struct {
@@ -27,11 +28,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 == "" {
+		oldColor := color.NoColor
 		oldCommentWidth := m.CommentWidth
-		m.LineWidth = 400
+		color.NoColor = true
 		m.CommentWidth = 300
+		m.LineWidth = 400
 		m.render.RawContent = m.String()
 		m.CommentWidth = oldCommentWidth
+		color.NoColor = oldColor
 	}
 	m.render, cmd = m.render.Update(msg)
 	switch msg := msg.(type) {

diff --git a/internal/hackernews/tui.go b/internal/hackernews/tui.go
@@ -3,6 +3,7 @@ package hackernews
 import (
 	"github.com/azimut/cli-view/internal/tui"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/fatih/color"
 )
 
 const rightPadding = 10
@@ -29,11 +30,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 == "" {
+		oldColor := color.NoColor
 		oldCommentWidth := m.CommentWidth
-		m.LineWidth = 400
+		color.NoColor = true
 		m.CommentWidth = 300
+		m.LineWidth = 400
 		m.render.RawContent = m.String()
 		m.CommentWidth = oldCommentWidth
+		color.NoColor = oldColor
 	}
 	m.render, cmd = m.render.Update(msg)
 	switch msg := msg.(type) {

diff --git a/internal/reddit/tui.go b/internal/reddit/tui.go
@@ -3,6 +3,7 @@ package reddit
 import (
 	"github.com/azimut/cli-view/internal/tui"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/fatih/color"
 )
 
 const rightPadding = 10
@@ -29,11 +30,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 == "" {
+		oldColor := color.NoColor
 		oldCommentWidth := m.CommentWidth
-		m.LineWidth = 400
+		color.NoColor = true
 		m.CommentWidth = 300
+		m.LineWidth = 400
 		m.render.RawContent = m.String()
 		m.CommentWidth = oldCommentWidth
+		color.NoColor = oldColor
 	}
 	m.render, cmd = m.render.Update(msg) // initializes the structs it needed
 	switch msg := msg.(type) {

diff --git a/internal/vichan/tui.go b/internal/vichan/tui.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/azimut/cli-view/internal/tui"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/fatih/color"
 )
 
 const rightPadding = 10
@@ -31,11 +32,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 == "" {
+		oldColor := color.NoColor
 		oldCommentWidth := m.CommentWidth
-		m.LineWidth = 400
+		color.NoColor = true
 		m.CommentWidth = 300
-		m.render.RawContent = fmt.Sprint(m)
+		m.LineWidth = 400
+		m.render.RawContent = m.String()
 		m.CommentWidth = oldCommentWidth
+		color.NoColor = oldColor
 	}
 	m.render, cmd = m.render.Update(msg)
 	switch msg := msg.(type) {