Create lesskey package

bensadeh · Aug 15, 2022 · 2dd0cb9 · 2dd0cb9
1 parent 7fdfb88
commit 2dd0cb9
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 62 deletions.
diff --git a/bubble/list/list.go b/bubble/list/list.go
@@ -4,8 +4,6 @@ import (
 	_ "embed"
 	"fmt"
 	"io"
-	"log"
-	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -43,9 +41,6 @@ const (
 	numberOfCategories = 5
 )
 
-//go:embed lesskey
-var lesskey string
-
 // Item is an item that appears in the list.
 // type Item interface{}
 
@@ -504,19 +499,9 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 
 		commentTree := tree.Print(story, m.config, m.width, lastVisited)
 
-		tempLesskeyFile, err := os.CreateTemp("", "lesskey*")
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		_, _ = tempLesskeyFile.WriteString(lesskey)
-
-		// lesskeyPath, _ := filepath.Abs(filepath.Dir(tempLesskeyFile.Name()))
-
-		command := cli.LessWithLesskey(commentTree, tempLesskeyFile.Name())
+		command := cli.Less(commentTree, m.config.LesskeyPath)
 
 		return m, tea.ExecProcess(command, func(err error) tea.Msg {
-			defer os.Remove(tempLesskeyFile.Name())
 			return message.EditorFinishedMsg{Err: err}
 		})
 
@@ -536,11 +521,11 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 		}
 
 		blocks := parser.Parse(article)
-		header := renderer.CreateHeader(msg.Title, msg.Url, 70)
-		renderedArticle := renderer.ToString(blocks, 70, m.config.IndentationSymbol)
+		header := renderer.CreateHeader(msg.Title, msg.Url, m.config.CommentWidth)
+		renderedArticle := renderer.ToString(blocks, m.config.CommentWidth, m.config.IndentationSymbol)
 		renderedArticle = postprocessor.Process(header+renderedArticle, msg.Url)
 
-		command := cli.WrapLess(renderedArticle)
+		command := cli.Less(renderedArticle, m.config.LesskeyPath)
 
 		return m, tea.ExecProcess(command, func(err error) tea.Msg {
 			return message.EditorFinishedMsg{Err: err}
@@ -855,7 +840,7 @@ func (m *Model) handleBrowsing(msg tea.Msg) tea.Cmd {
 func (m *Model) showHelpScreen() tea.Cmd {
 	helpScreen := help.GetHelpScreen(m.config.EnableNerdFonts)
 
-	command := cli.WrapLess(helpScreen)
+	command := cli.Less(helpScreen, m.config.LesskeyPath)
 
 	return tea.ExecProcess(command, func(err error) tea.Msg {
 		return message.EditorFinishedMsg{Err: err}

diff --git a/cli/cli.go b/cli/cli.go
@@ -8,43 +8,7 @@ import (
 	"clx/constants/unicode"
 )
 
-func Less(input string) {
-	command := exec.Command("less",
-		"--RAW-CONTROL-CHARS",
-		"--pattern="+unicode.ZeroWidthSpace,
-		"--ignore-case",
-		"--tilde",
-		"--use-color",
-		"-P?e"+"\u001B[48;5;232m "+"\u001B[38;5;200m"+"e"+"\u001B[38;5;214m"+"n"+"\u001B[38;5;69m"+"d "+"\033[0m",
-		"-DSy",
-		"-DP-")
-
-	command.Stdin = strings.NewReader(input)
-	command.Stdout = os.Stdout
-
-	if err := command.Run(); err != nil {
-		panic(err)
-	}
-}
-
-func WrapLess(input string) *exec.Cmd {
-	command := exec.Command("less",
-		"--RAW-CONTROL-CHARS",
-		"--pattern="+unicode.ZeroWidthSpace,
-		"--ignore-case",
-		"--tilde",
-		"--use-color",
-		"-P?e"+"\u001B[48;5;232m "+"\u001B[38;5;200m"+"E"+"\u001B[38;5;214m"+"n"+"\u001B[38;5;69m"+"d "+"\033[0m",
-		"-DSy",
-		"-DP-")
-
-	command.Stdin = strings.NewReader(input)
-	command.Stdout = os.Stdout
-
-	return command
-}
-
-func LessWithLesskey(input string, pathToLesskey string) *exec.Cmd {
+func Less(input string, pathToLesskey string) *exec.Cmd {
 	command := exec.Command("less",
 		"--RAW-CONTROL-CHARS",
 		"--pattern="+unicode.ZeroWidthSpace,

diff --git a/cmd/root.go b/cmd/root.go
@@ -4,6 +4,7 @@ import (
 	"clx/app"
 	"clx/bubble"
 	"clx/indent"
+	"clx/less"
 	"clx/settings"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/spf13/cobra"
@@ -32,7 +33,12 @@ func Root() *cobra.Command {
 			config := getConfig()
 			config.IndentationSymbol = indent.GetIndentSymbol(hideIndentSymbol)
 
+			lesskey := less.NewLesskey()
+			config.LesskeyPath = lesskey.GetPath()
+
 			bubble.Run(config)
+
+			defer lesskey.Remove()
 		},
 	}
 

diff --git a/cmd/view.go b/cmd/view.go
@@ -1,13 +1,16 @@
 package cmd
 
 import (
+	_ "embed"
 	"strconv"
 	"time"
 
+	"clx/less"
+
+	"clx/hn/services/hybrid"
+
 	"clx/cli"
-	hybrid_bubble "clx/hn/services/hybrid"
 	"clx/screen"
-	"clx/settings"
 	"clx/tree"
 
 	"github.com/spf13/cobra"
@@ -24,16 +27,23 @@ func viewCmd() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			id, _ := strconv.Atoi(args[0])
 
-			service := new(hybrid_bubble.Service)
+			service := new(hybrid.Service)
 
 			comments := service.FetchComments(id)
 
-			config := settings.New()
+			config := getConfig()
 
 			screenWidth := screen.GetTerminalWidth()
 			commentTree := tree.Print(comments, config, screenWidth, time.Now().Unix())
 
-			cli.Less(commentTree)
+			lesskey := less.NewLesskey()
+
+			command := cli.Less(commentTree, lesskey.GetPath())
+
+			if err := command.Run(); err != nil {
+				defer lesskey.Remove()
+				panic(err)
+			}
 		},
 	}
 }
diff --git a/less/less.go b/less/less.go
@@ -0,0 +1,31 @@
+package less
+
+import (
+	_ "embed"
+	"os"
+)
+
+//go:embed lesskey
+var lesskey string
+
+type Lesskey struct {
+	tempLesskeyFile *os.File
+}
+
+func NewLesskey() *Lesskey {
+	tempLesskeyFile, _ := os.CreateTemp("", "lesskey*")
+	_, _ = tempLesskeyFile.WriteString(lesskey)
+
+	key := new(Lesskey)
+	key.tempLesskeyFile = tempLesskeyFile
+
+	return key
+}
+
+func (key *Lesskey) GetPath() string {
+	return key.tempLesskeyFile.Name()
+}
+
+func (key *Lesskey) Remove() {
+	_ = os.Remove(key.tempLesskeyFile.Name())
+}
diff --git a/bubble/list/lesskey → less/lesskey b/bubble/list/lesskey → less/lesskey
diff --git a/settings/core.go b/settings/core.go
@@ -12,6 +12,7 @@ type Config struct {
 	IndentationSymbol  string
 	DebugMode          bool
 	EnableNerdFonts    bool
+	LesskeyPath        string
 }
 
 func New() *Config {