Skip to content

feat: allow style set via environment variable #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reugn merged 1 commit into from
Feb 27, 2025
Merged

feat: allow style set via environment variable #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions internal/handler/gemini_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ var _ MessageHandler = (*GeminiQuery)(nil)

// NewGeminiQuery returns a new GeminiQuery message handler.
func NewGeminiQuery(io *IO, session *gemini.ChatSession, opts RendererOptions) (*GeminiQuery, error) {
renderer, err := glamour.NewTermRenderer(
glamour.WithStylePath(opts.StylePath),
glamour.WithWordWrap(opts.WordWrap),
)
renderer, err := opts.newTermRenderer()
if err != nil {
return nil, fmt.Errorf("failed to instantiate terminal renderer: %w", err)
}
Expand Down
5 changes: 1 addition & 4 deletions internal/handler/help_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ var _ MessageHandler = (*HelpCommand)(nil)

// NewHelpCommand returns a new HelpCommand.
func NewHelpCommand(io *IO, opts RendererOptions) (*HelpCommand, error) {
renderer, err := glamour.NewTermRenderer(
glamour.WithStylePath(opts.StylePath),
glamour.WithWordWrap(opts.WordWrap),
)
renderer, err := opts.newTermRenderer()
if err != nil {
return nil, fmt.Errorf("failed to instantiate terminal renderer: %w", err)
}
Expand Down
21 changes: 21 additions & 0 deletions internal/handler/renderer_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
package handler

import (
"os"

"github.com/charmbracelet/glamour"
)

// RendererOptions represents configuration options for the terminal renderer.
type RendererOptions struct {
StylePath string
WordWrap int
}

func (o RendererOptions) newTermRenderer() (*glamour.TermRenderer, error) {
var styleOption glamour.TermRendererOption
switch {
case o.StylePath == "auto" && os.Getenv("GLAMOUR_STYLE") != "":
styleOption = glamour.WithEnvironmentConfig()
default:
styleOption = glamour.WithStylePath(o.StylePath)
}

return glamour.NewTermRenderer(
styleOption,
glamour.WithWordWrap(o.WordWrap),
)
}