Merge pull request #40 from koki-develop/refactor

Author: koki-develop

cmd/flags.go

@@ -0,0 +1,52 @@
+package cmd
+
+import "os"
+
+func envOrDefault(key, def string) string {
+	if v := os.Getenv(key); v != "" {
+		return v
+	}
+	return def
+}
+
+var (
+	// --lang
+	flagLang string
+
+	// --format
+	flagFormat        string
+	flagFormatDefault = envOrDefault("GAT_FORMAT", "terminal256")
+
+	// --theme
+	flagTheme        string
+	flagThemeDefault = envOrDefault("GAT_THEME", "monokai")
+
+	// --force-color
+	flagForceColor bool
+
+	// --pretty
+	flagPretty bool
+
+	// --list-langs
+	flagListLangs bool
+
+	// --list-formats
+	flagListFormats bool
+
+	// --list-themes
+	flagListThemes bool
+)
+
+func init() {
+	rootCmd.Flags().StringVarP(&flagLang, "lang", "l", "", "language for syntax highlighting")
+	rootCmd.Flags().StringVarP(&flagFormat, "format", "f", flagFormatDefault, "output format")
+	rootCmd.Flags().StringVarP(&flagTheme, "theme", "t", flagThemeDefault, "highlight theme")
+	rootCmd.Flags().BoolVarP(&flagForceColor, "force-color", "c", false, "force colored output")
+
+	rootCmd.Flags().BoolVarP(&flagPretty, "pretty", "p", false, "whether to format a content pretty")
+
+	rootCmd.Flags().BoolVar(&flagListLangs, "list-langs", false, "print a list of supported languages for syntax highlighting")
+	rootCmd.Flags().BoolVar(&flagListFormats, "list-formats", false, "print a list of supported output formats")
+	rootCmd.Flags().BoolVar(&flagListThemes, "list-themes", false, "print a list of supported themes with preview")
+	rootCmd.MarkFlagsMutuallyExclusive("list-langs", "list-formats", "list-themes")
+}

cmd/root.go

@@ -2,45 +2,25 @@ package cmd
 
 import (
 	"os"
-	"runtime/debug"
 	"strings"
 
-	"github.com/koki-develop/gat/internal/printer"
+	"github.com/koki-develop/gat/internal/gat"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 )
 
-var (
-	version string
-
-	flagLang   string
-	flagFormat string
-	flagTheme  string
-
-	flagPretty bool
-
-	flagListLangs   bool
-	flagListFormats bool
-	flagListThemes  bool
-
-	flagForceColor bool
-)
-
 var rootCmd = &cobra.Command{
 	Use:   "gat [file]...",
 	Short: "cat alternative written in Go",
 	Long:  "cat alternative written in Go.",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		switch {
 		case flagListLangs:
-			printer.PrintLangs()
-			return nil
+			return gat.PrintLanguages(os.Stdout)
 		case flagListFormats:
-			printer.PrintFormats()
-			return nil
+			return gat.PrintFormats(os.Stdout)
 		case flagListThemes:
-			printer.PrintThemes()
-			return nil
+			return gat.PrintThemes(os.Stdout)
 		}
 
 		if strings.HasPrefix(flagFormat, "terminal") {
@@ -50,27 +30,27 @@ var rootCmd = &cobra.Command{
 			}
 		}
 
-		p := printer.New(&printer.PrinterConfig{
-			Lang:   flagLang,
-			Format: flagFormat,
-			Theme:  flagTheme,
-			Pretty: flagPretty,
+		g, err := gat.New(&gat.Config{
+			Language: flagLang,
+			Format:   flagFormat,
+			Theme:    flagTheme,
 		})
+		if err != nil {
+			return err
+		}
 
 		if len(args) == 0 {
-			if err := p.Print(os.Stdin, os.Stdout); err != nil {
+			return g.Print(os.Stdout, os.Stdin, gat.WithPretty(flagPretty))
+		}
+
+		for _, filename := range args {
+			f, err := os.Open(filename)
+			if err != nil {
 				return err
 			}
-		} else {
-			for _, filename := range args {
-				f, err := os.Open(filename)
-				if err != nil {
-					return err
-				}
-				defer f.Close()
-				if err := p.Print(f, os.Stdout, printer.WithFilename(filename)); err != nil {
-					return err
-				}
+			defer f.Close()
+			if err := g.Print(os.Stdout, f, gat.WithPretty(flagPretty), gat.WithFilename(filename)); err != nil {
+				return err
 			}
 		}
 
@@ -84,27 +64,3 @@ func Execute() {
 		os.Exit(1)
 	}
 }
-
-func init() {
-	// version
-	if version == "" {
-		if info, ok := debug.ReadBuildInfo(); ok {
-			version = info.Main.Version
-		}
-	}
-
-	rootCmd.Version = version
-
-	// flags
-	rootCmd.Flags().StringVarP(&flagLang, "lang", "l", "", "language for syntax highlighting")
-	rootCmd.Flags().StringVarP(&flagFormat, "format", "f", printer.DefaultFormat, "output format")
-	rootCmd.Flags().StringVarP(&flagTheme, "theme", "t", printer.DefaultTheme, "highlight theme")
-	rootCmd.Flags().BoolVarP(&flagForceColor, "force-color", "c", false, "force colored output")
-
-	rootCmd.Flags().BoolVarP(&flagPretty, "pretty", "p", false, "whether to format a content pretty")
-
-	rootCmd.Flags().BoolVar(&flagListLangs, "list-langs", false, "print a list of supported languages for syntax highlighting")
-	rootCmd.Flags().BoolVar(&flagListFormats, "list-formats", false, "print a list of supported output formats")
-	rootCmd.Flags().BoolVar(&flagListThemes, "list-themes", false, "print a list of supported themes with preview")
-	rootCmd.MarkFlagsMutuallyExclusive("list-langs", "list-formats", "list-themes")
-}

cmd/version.go

@@ -0,0 +1,14 @@
+package cmd
+
+import "runtime/debug"
+
+var version string
+
+func init() {
+	if version == "" {
+		if info, ok := debug.ReadBuildInfo(); ok {
+			version = info.Main.Version
+		}
+	}
+	rootCmd.Version = version
+}

docs/update.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/alecthomas/chroma/v2/formatters"
-	"github.com/alecthomas/chroma/v2/lexers"
-	"github.com/alecthomas/chroma/v2/styles"
-	"github.com/koki-develop/gat/internal/printer"
+	"github.com/koki-develop/gat/internal/formatters"
+	"github.com/koki-develop/gat/internal/gat"
+	"github.com/koki-develop/gat/internal/lexers"
+	"github.com/koki-develop/gat/internal/styles"
 )
 
 var (
@@ -62,7 +62,7 @@ func updateLanguages() {
 	Must(f.WriteString("| Language | Aliases |\n"))
 	Must(f.WriteString("| --- | --- |\n"))
 
-	for _, l := range lexers.GlobalLexerRegistry.Lexers {
+	for _, l := range lexers.List() {
 		cfg := l.Config()
 		Must(f.WriteString(fmt.Sprintf("| `%s` ", cfg.Name)))
 
@@ -92,21 +92,22 @@ func updateFormats() {
 
 	Must(f.WriteString("# Output Formats\n\n"))
 
-	for _, format := range formatters.Names() {
+	for _, format := range formatters.List() {
 		Must(f.WriteString(fmt.Sprintf("- [`%s`](#%s)\n", format, format)))
 	}
 	Must(f.WriteString("\n"))
 
-	for _, format := range formatters.Names() {
+	for _, format := range formatters.List() {
 		Must(f.WriteString(fmt.Sprintf("## `%s`\n\n", format)))
 
-		p := printer.New(&printer.PrinterConfig{
-			Format: format,
-			Theme:  printer.DefaultTheme,
-		})
+		g := Must(gat.New(&gat.Config{
+			Format:   format,
+			Theme:    "monokai",
+			Language: "go",
+		}))
 
 		b := new(bytes.Buffer)
-		OrPanic(p.Print(strings.NewReader(src), b, printer.WithFilename("main.go")))
+		OrPanic(g.Print(b, strings.NewReader(src)))
 
 		Must(f.WriteString(fmt.Sprintf("```%s\n", strings.TrimSuffix(format, "-min"))))
 		if strings.HasPrefix(format, "terminal") {
@@ -127,21 +128,22 @@ func updateThemes() {
 
 	Must(f.WriteString("# Highlight Themes\n\n"))
 
-	for _, s := range styles.Names() {
+	for _, s := range styles.List() {
 		Must(f.WriteString(fmt.Sprintf("- [`%s`](#%s)\n", s, s)))
 	}
 	Must(f.WriteString("\n"))
 
-	for _, s := range styles.Names() {
+	for _, s := range styles.List() {
 		Must(f.WriteString(fmt.Sprintf("## `%s`\n\n", s)))
 
-		p := printer.New(&printer.PrinterConfig{
-			Format: "svg",
-			Theme:  s,
-		})
+		g := Must(gat.New(&gat.Config{
+			Format:   "svg",
+			Theme:    s,
+			Language: "go",
+		}))
 
 		b := new(bytes.Buffer)
-		OrPanic(p.Print(strings.NewReader(src), b, printer.WithFilename("main.go")))
+		OrPanic(g.Print(b, strings.NewReader(src)))
 
 		img := Must(os.Create(fmt.Sprintf("./docs/themes/%s.svg", s)))
 		defer img.Close()

internal/formatters/formatters.go

@@ -0,0 +1,15 @@
+package formatters
+
+import (
+	"github.com/alecthomas/chroma/v2"
+	"github.com/alecthomas/chroma/v2/formatters"
+)
+
+func Get(name string) (chroma.Formatter, bool) {
+	f, ok := formatters.Registry[name]
+	return f, ok
+}
+
+func List() []string {
+	return formatters.Names()
+}

internal/formatter/html_minified.go internal/formatters/html_minified.gointernal/formatter/html_minified.go renamed to internal/formatters/html_minified.go

@@ -1,4 +1,4 @@
-package formatter
+package formatters
 
 import (
 	"bytes"

internal/formatter/json_minified.go internal/formatters/json_minified.gointernal/formatter/json_minified.go renamed to internal/formatters/json_minified.go

@@ -1,4 +1,4 @@
-package formatter
+package formatters
 
 import (
 	"bytes"

internal/formatter/mime.go internal/formatters/mime.gointernal/formatter/mime.go renamed to internal/formatters/mime.go

@@ -1,4 +1,4 @@
-package formatter
+package formatters
 
 var (
 	mimeTypeHTML = "text/html"

internal/formatter/svg_minified.go internal/formatters/svg_minified.gointernal/formatter/svg_minified.go renamed to internal/formatters/svg_minified.go

@@ -1,4 +1,4 @@
-package formatter
+package formatters
 
 import (
 	"bytes"