mirror of
https://github.com/onyx-and-iris/gobs-cli.git
synced 2025-07-01 07:50:29 +01:00
Compare commits
16 Commits
Author | SHA1 | Date | |
---|---|---|---|
9eb6c8a282 | |||
eb30cae5b7 | |||
e6c03a2c92 | |||
f6b82383f9 | |||
55f3b0c981 | |||
7da80a1ad2 | |||
ea4ca2aeb9 | |||
d2f0a64180 | |||
f01fd0ca84 | |||
10d50df445 | |||
06cefe58ed | |||
7cd1c78f6a | |||
842d98edd3 | |||
930b387b85 | |||
2ab1c5bfc3 | |||
08f23fe47d |
21
CHANGELOG.md
21
CHANGELOG.md
@ -5,12 +5,31 @@ All notable changes to this project will be documented in this file.
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
# [0.12.0] - 2025-06-21
|
||||
# [0.13.3] - 2025-06-27
|
||||
|
||||
### Changed
|
||||
|
||||
- usage is now printed on errors.
|
||||
- help is printed in compact mode. This should make it easier to page through help on the root command.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Item ID alignment in sceneitem list table.
|
||||
|
||||
# [0.13.0] - 2025-06-23
|
||||
|
||||
### Added
|
||||
|
||||
- record split and record chapter commands, see [RecordCmd](https://github.com/onyx-and-iris/gobs-cli?tab=readme-ov-file#recordcmd)
|
||||
- As of OBS 30.2.0, the only file format supporting *record chapter* is Hybrid MP4.
|
||||
|
||||
# [0.12.1] - 2025-06-21
|
||||
|
||||
### Added
|
||||
|
||||
- Various colouring styles, see [Style](https://github.com/onyx-and-iris/gobs-cli/tree/main?tab=readme-ov-file#style)
|
||||
- colouring is applied to list tables as well as highlighted information in stdout/stderr output.
|
||||
- table border styling may be optionally disabled with the --no-border flag.
|
||||
|
||||
### Changed
|
||||
|
||||
|
76
README.md
76
README.md
@ -4,6 +4,16 @@ A command line interface for OBS Websocket v5
|
||||
|
||||
For an outline of past/future changes refer to: [CHANGELOG](CHANGELOG.md)
|
||||
|
||||
-----
|
||||
|
||||
## Table of Contents
|
||||
|
||||
- [Installation](#installation)
|
||||
- [Configuration](#configuration)
|
||||
- [Style](#style)
|
||||
- [Commands](#commands)
|
||||
- [License](#license)
|
||||
|
||||
## Installation
|
||||
|
||||
```console
|
||||
@ -40,6 +50,36 @@ OBS_PASSWORD=<websocket password>
|
||||
OBS_TIMEOUT=5
|
||||
```
|
||||
|
||||
## Style
|
||||
|
||||
Styling is opt-in, by default you will get a colourless output:
|
||||
|
||||

|
||||
|
||||
You may enable styling with the --style/-s flag:
|
||||
|
||||
```console
|
||||
gobs-cli --style="red" sceneitem list
|
||||
```
|
||||
|
||||
Available styles: _red, magenta, purple, blue, cyan, green, yellow, orange, white, grey, navy, black_
|
||||
|
||||

|
||||
|
||||
Optionally you may disable border colouring with the --no-border flag:
|
||||
|
||||

|
||||
|
||||
```console
|
||||
gobs-cli --style="red" --no-border sceneitem list
|
||||
```
|
||||
|
||||
Or with environment variables:
|
||||
|
||||
```env
|
||||
GOBS_STYLE=red
|
||||
GOBS_STYLE_NO_BORDER=true
|
||||
```
|
||||
|
||||
## Commands
|
||||
|
||||
@ -313,6 +353,21 @@ gobs-cli record directory "/home/me/obs-vids/"
|
||||
gobs-cli record directory "C:/Users/me/Videos"
|
||||
```
|
||||
|
||||
- split: Split recording.
|
||||
|
||||
```console
|
||||
gobs-cli record split
|
||||
```
|
||||
|
||||
- chapter: Create a chapter in the recording.
|
||||
|
||||
*optional*
|
||||
- arg: ChapterName
|
||||
|
||||
```console
|
||||
gobs-cli record chapter "Chapter Name"
|
||||
```
|
||||
|
||||
### StreamCmd
|
||||
|
||||
- start: Start streaming.
|
||||
@ -606,26 +661,9 @@ gobs-cli projector open --monitor-index=1 "test_group"
|
||||
gobs-cli screenshot save --width=2560 --height=1440 "Scene" "C:\Users\me\Videos\screenshot.png"
|
||||
```
|
||||
|
||||
## Style
|
||||
## License
|
||||
|
||||
By default styling is disabled but you may enable it with the --style/-s flag.
|
||||
|
||||
Available options are:
|
||||
|
||||
- red
|
||||
- magenta
|
||||
- purple
|
||||
- blue
|
||||
- cyan
|
||||
- green
|
||||
- yellow
|
||||
- orange
|
||||
- white
|
||||
- grey
|
||||
- navy
|
||||
- black
|
||||
|
||||
Alternatively you may set the style with an environment variable `GOBS_STYLE`.
|
||||
`gobs-cli` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.
|
||||
|
||||
|
||||
[userconfigdir]: https://pkg.go.dev/os#UserConfigDir
|
||||
|
@ -11,7 +11,7 @@ func TestFilterList(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &FilterListCmd{
|
||||
SourceName: "Mic/Aux",
|
||||
@ -30,7 +30,7 @@ func TestFilterListScene(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &FilterListCmd{
|
||||
SourceName: "gobs-test",
|
||||
@ -49,7 +49,7 @@ func TestFilterListEmpty(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &FilterListCmd{
|
||||
SourceName: "NonExistentSource",
|
||||
|
@ -11,7 +11,7 @@ func TestGroupList(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &GroupListCmd{
|
||||
SceneName: "Scene",
|
||||
@ -30,7 +30,7 @@ func TestGroupShow(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &GroupShowCmd{
|
||||
SceneName: "Scene",
|
||||
@ -50,7 +50,7 @@ func TestGroupToggle(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdStatus := &GroupStatusCmd{
|
||||
SceneName: "Scene",
|
||||
@ -91,7 +91,7 @@ func TestGroupStatus(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdShow := &GroupShowCmd{
|
||||
SceneName: "Scene",
|
||||
|
BIN
img/coloured-border.png
Executable file
BIN
img/coloured-border.png
Executable file
Binary file not shown.
After Width: | Height: | Size: 6.1 KiB |
BIN
img/coloured-no-border.png
Executable file
BIN
img/coloured-no-border.png
Executable file
Binary file not shown.
After Width: | Height: | Size: 6.1 KiB |
BIN
img/colourless.png
Executable file
BIN
img/colourless.png
Executable file
Binary file not shown.
After Width: | Height: | Size: 4.6 KiB |
@ -11,7 +11,7 @@ func TestInputList(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &InputListCmd{}
|
||||
err := cmd.Run(context)
|
||||
@ -39,7 +39,7 @@ func TestInputListFilterInput(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &InputListCmd{Input: true}
|
||||
err := cmd.Run(context)
|
||||
@ -73,7 +73,7 @@ func TestInputListFilterOutput(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &InputListCmd{Output: true}
|
||||
err := cmd.Run(context)
|
||||
@ -107,7 +107,7 @@ func TestInputListFilterColour(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &InputListCmd{Colour: true}
|
||||
err := cmd.Run(context)
|
||||
|
43
main.go
43
main.go
@ -8,6 +8,8 @@ import (
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime/debug"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/alecthomas/kong"
|
||||
@ -16,6 +18,19 @@ import (
|
||||
kongdotenv "github.com/titusjaka/kong-dotenv-go"
|
||||
)
|
||||
|
||||
var version string // Version of the CLI, set at build time.
|
||||
|
||||
// VersionFlag is a custom flag type that prints the version and exits.
|
||||
type VersionFlag string
|
||||
|
||||
func (v VersionFlag) Decode(_ *kong.DecodeContext) error { return nil } // nolint: revive
|
||||
func (v VersionFlag) IsBool() bool { return true } // nolint: revive
|
||||
func (v VersionFlag) BeforeApply(app *kong.Kong, vars kong.Vars) error { // nolint: revive, unparam
|
||||
fmt.Printf("gobs-cli version: %s\n", vars["version"])
|
||||
app.Exit(0)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ObsConfig holds the configuration for connecting to the OBS WebSocket server.
|
||||
type ObsConfig struct {
|
||||
Host string `flag:"host" help:"Host to connect to." default:"localhost" env:"OBS_HOST" short:"H"`
|
||||
@ -27,10 +42,11 @@ type ObsConfig struct {
|
||||
// StyleConfig holds the configuration for styling the CLI output.
|
||||
type StyleConfig struct {
|
||||
Style string `help:"Style used in output." flag:"style" default:"" env:"GOBS_STYLE" short:"s" enum:",red,magenta,purple,blue,cyan,green,yellow,orange,white,grey,navy,black"`
|
||||
NoBorder bool `help:"Disable table border styling in output." flag:"no-border" default:"false" env:"GOBS_STYLE_NO_BORDER" short:"b"`
|
||||
}
|
||||
|
||||
// CLI is the main command line interface structure.
|
||||
// It embeds the ObsConfig struct to inherit its fields and flags.
|
||||
// It embeds ObsConfig and StyleConfig to provide configuration options.
|
||||
type CLI struct {
|
||||
ObsConfig `embed:"" help:"OBS WebSocket configuration."`
|
||||
StyleConfig `embed:"" help:"Style configuration."`
|
||||
@ -62,11 +78,11 @@ type context struct {
|
||||
Style *Style
|
||||
}
|
||||
|
||||
func newContext(client *goobs.Client, out io.Writer, styleName string) *context {
|
||||
func newContext(client *goobs.Client, out io.Writer, styleCfg StyleConfig) *context {
|
||||
return &context{
|
||||
Client: client,
|
||||
Out: out,
|
||||
Style: styleFromFlag(styleName),
|
||||
Style: styleFromFlag(styleCfg),
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,15 +96,30 @@ func main() {
|
||||
var cli CLI
|
||||
ctx := kong.Parse(
|
||||
&cli,
|
||||
kong.Name("GOBS-CLI"),
|
||||
kong.Name("gobs-cli"),
|
||||
kong.Description("A command line tool to interact with OBS Websocket."),
|
||||
kong.Configuration(kongdotenv.ENVFileReader, ".env", filepath.Join(userConfigDir, "gobs-cli", "config.env")),
|
||||
)
|
||||
kong.UsageOnError(),
|
||||
kong.ConfigureHelp(kong.HelpOptions{
|
||||
Compact: true,
|
||||
}),
|
||||
kong.Vars{
|
||||
"version": func() string {
|
||||
if version == "" {
|
||||
info, ok := debug.ReadBuildInfo()
|
||||
if !ok {
|
||||
return "(unable to read build info)"
|
||||
}
|
||||
version = strings.Split(info.Main.Version, "-")[0]
|
||||
}
|
||||
return version
|
||||
}(),
|
||||
})
|
||||
|
||||
client, err := connectObs(cli.ObsConfig)
|
||||
ctx.FatalIfErrorf(err)
|
||||
|
||||
ctx.Bind(newContext(client, os.Stdout, cli.StyleConfig.Style))
|
||||
ctx.Bind(newContext(client, os.Stdout, cli.StyleConfig))
|
||||
|
||||
ctx.FatalIfErrorf(run(ctx, client))
|
||||
}
|
||||
|
68
record.go
68
record.go
@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
|
||||
"github.com/andreykaipov/goobs/api/requests/config"
|
||||
"github.com/andreykaipov/goobs/api/requests/record"
|
||||
)
|
||||
|
||||
// RecordCmd handles the recording commands.
|
||||
@ -15,6 +16,8 @@ type RecordCmd struct {
|
||||
Pause RecordPauseCmd `cmd:"" help:"Pause recording." aliases:"p"`
|
||||
Resume RecordResumeCmd `cmd:"" help:"Resume recording." aliases:"r"`
|
||||
Directory RecordDirectoryCmd `cmd:"" help:"Get/Set recording directory." aliases:"d"`
|
||||
Split RecordSplitCmd `cmd:"" help:"Split recording." aliases:"sp"`
|
||||
Chapter RecordChapterCmd `cmd:"" help:"Create a chapter in the recording." aliases:"c"`
|
||||
}
|
||||
|
||||
// RecordStartCmd starts the recording.
|
||||
@ -187,3 +190,68 @@ func (cmd *RecordDirectoryCmd) Run(ctx *context) error {
|
||||
fmt.Fprintf(ctx.Out, "Recording directory set to: %s\n", ctx.Style.Highlight(cmd.RecordDirectory))
|
||||
return nil
|
||||
}
|
||||
|
||||
// RecordSplitCmd splits the current recording.
|
||||
type RecordSplitCmd struct{} // size = 0x0
|
||||
|
||||
// Run executes the command to split the recording.
|
||||
func (cmd *RecordSplitCmd) Run(ctx *context) error {
|
||||
status, err := ctx.Client.Record.GetRecordStatus()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !status.OutputActive {
|
||||
return fmt.Errorf("recording is not in progress")
|
||||
}
|
||||
if status.OutputPaused {
|
||||
return fmt.Errorf("recording is paused, cannot split")
|
||||
}
|
||||
|
||||
_, err = ctx.Client.Record.SplitRecordFile()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Fprintln(ctx.Out, "Recording split successfully.")
|
||||
return nil
|
||||
}
|
||||
|
||||
// RecordChapterCmd creates a chapter in the recording.
|
||||
type RecordChapterCmd struct {
|
||||
ChapterName string `arg:"" help:"Name of the chapter to create." default:""`
|
||||
}
|
||||
|
||||
// Run executes the command to create a chapter in the recording.
|
||||
func (cmd *RecordChapterCmd) Run(ctx *context) error {
|
||||
status, err := ctx.Client.Record.GetRecordStatus()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !status.OutputActive {
|
||||
return fmt.Errorf("recording is not in progress")
|
||||
}
|
||||
if status.OutputPaused {
|
||||
return fmt.Errorf("recording is paused, cannot create chapter")
|
||||
}
|
||||
|
||||
var params *record.CreateRecordChapterParams
|
||||
if cmd.ChapterName == "" {
|
||||
params = record.NewCreateRecordChapterParams()
|
||||
} else {
|
||||
params = record.NewCreateRecordChapterParams().WithChapterName(cmd.ChapterName)
|
||||
}
|
||||
|
||||
_, err = ctx.Client.Record.CreateRecordChapter(params)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if cmd.ChapterName == "" {
|
||||
cmd.ChapterName = "unnamed"
|
||||
}
|
||||
|
||||
fmt.Fprintf(ctx.Out, "Chapter %s created successfully.\n", ctx.Style.Highlight(cmd.ChapterName))
|
||||
return nil
|
||||
}
|
||||
|
@ -12,7 +12,7 @@ func TestRecordStart(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdStatus := &RecordStatusCmd{}
|
||||
err := cmdStatus.Run(context)
|
||||
@ -52,7 +52,7 @@ func TestRecordStop(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdStatus := &RecordStatusCmd{}
|
||||
err := cmdStatus.Run(context)
|
||||
@ -92,7 +92,7 @@ func TestRecordToggle(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdStatus := &RecordStatusCmd{}
|
||||
err := cmdStatus.Run(context)
|
||||
|
@ -11,7 +11,7 @@ func TestReplayBufferStart(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &ReplayBufferStartCmd{}
|
||||
err := cmd.Run(context)
|
||||
@ -28,7 +28,7 @@ func TestReplayBufferStop(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &ReplayBufferStopCmd{}
|
||||
err := cmd.Run(context)
|
||||
@ -45,7 +45,7 @@ func TestReplayBufferToggle(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdStatus := &ReplayBufferStatusCmd{}
|
||||
err := cmdStatus.Run(context)
|
||||
|
@ -10,7 +10,7 @@ func TestSceneList(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &SceneListCmd{}
|
||||
err := cmd.Run(context)
|
||||
@ -27,7 +27,7 @@ func TestSceneCurrent(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
// Set the current scene to "gobs-test"
|
||||
cmdSwitch := &SceneSwitchCmd{
|
||||
|
@ -59,7 +59,7 @@ func (cmd *SceneItemListCmd) Run(ctx *context) error {
|
||||
style := lipgloss.NewStyle().Padding(0, 3)
|
||||
switch col {
|
||||
case 0:
|
||||
style = style.Align(lipgloss.Left)
|
||||
style = style.Align(lipgloss.Center)
|
||||
case 1:
|
||||
style = style.Align(lipgloss.Left)
|
||||
case 2:
|
||||
|
@ -11,7 +11,7 @@ func TestSceneItemList(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &SceneItemListCmd{
|
||||
SceneName: "gobs-test",
|
||||
|
@ -12,7 +12,7 @@ func TestStreamStart(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdStatus := &StreamStatusCmd{}
|
||||
err := cmdStatus.Run(context)
|
||||
@ -51,7 +51,7 @@ func TestStreamStop(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdStatus := &StreamStatusCmd{}
|
||||
err := cmdStatus.Run(context)
|
||||
@ -90,7 +90,7 @@ func TestStreamToggle(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdStatus := &StreamStatusCmd{}
|
||||
err := cmdStatus.Run(context)
|
||||
|
@ -10,7 +10,7 @@ func TestStudioModeEnable(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdEnable := &StudioModeEnableCmd{}
|
||||
err := cmdEnable.Run(context)
|
||||
@ -38,7 +38,7 @@ func TestStudioModeDisable(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmdDisable := &StudioModeDisableCmd{}
|
||||
err := cmdDisable.Run(context)
|
||||
|
102
style.go
102
style.go
@ -26,88 +26,88 @@ func (s *Style) Error(text string) string {
|
||||
return lipgloss.NewStyle().Foreground(lipgloss.Color("#FF0000")).Render(text) // Red for errors
|
||||
}
|
||||
|
||||
func newRedStyle() *Style {
|
||||
return &Style{
|
||||
func newRedStyle() Style {
|
||||
return Style{
|
||||
name: "red",
|
||||
border: lipgloss.Color("#D32F2F"), // Strong red for border
|
||||
oddRows: lipgloss.Color("#FFCDD2"), // Very light red for odd rows
|
||||
evenRows: lipgloss.Color("#EF9A9A"), // Light red for even rows
|
||||
highlight: lipgloss.Color("#EF9A9A"),
|
||||
highlight: lipgloss.Color("#EF9A9A"), // Highlight in light red
|
||||
}
|
||||
}
|
||||
|
||||
func newMagentaStyle() *Style {
|
||||
return &Style{
|
||||
func newMagentaStyle() Style {
|
||||
return Style{
|
||||
name: "magenta",
|
||||
border: lipgloss.Color("#C2185B"), // Strong magenta for border
|
||||
oddRows: lipgloss.Color("#F8BBD0"), // Very light magenta/pink for odd rows
|
||||
evenRows: lipgloss.Color("#F48FB1"), // Light magenta/pink for even rows
|
||||
highlight: lipgloss.Color("#F48FB1"),
|
||||
highlight: lipgloss.Color("#F48FB1"), // Highlight in light magenta/pink
|
||||
}
|
||||
}
|
||||
|
||||
func newPurpleStyle() *Style {
|
||||
return &Style{
|
||||
func newPurpleStyle() Style {
|
||||
return Style{
|
||||
name: "purple",
|
||||
border: lipgloss.Color("#7B1FA2"), // Strong purple for border
|
||||
oddRows: lipgloss.Color("#E1BEE7"), // Very light purple for odd rows
|
||||
evenRows: lipgloss.Color("#CE93D8"), // Light purple for even rows
|
||||
highlight: lipgloss.Color("#CE93D8"),
|
||||
highlight: lipgloss.Color("#CE93D8"), // Highlight in light purple
|
||||
}
|
||||
}
|
||||
|
||||
func newBlueStyle() *Style {
|
||||
return &Style{
|
||||
func newBlueStyle() Style {
|
||||
return Style{
|
||||
name: "blue",
|
||||
border: lipgloss.Color("#1976D2"), // Medium blue for border
|
||||
oddRows: lipgloss.Color("#E3F2FD"), // Very light blue for odd rows
|
||||
evenRows: lipgloss.Color("#BBDEFB"), // Light blue for even rows
|
||||
highlight: lipgloss.Color("#1976D2"),
|
||||
highlight: lipgloss.Color("#1976D2"), // Highlight in medium blue
|
||||
}
|
||||
}
|
||||
|
||||
func newCyanStyle() *Style {
|
||||
return &Style{
|
||||
func newCyanStyle() Style {
|
||||
return Style{
|
||||
name: "cyan",
|
||||
border: lipgloss.Color("#00BFCF"), // A strong cyan for border
|
||||
oddRows: lipgloss.Color("#E0F7FA"), // Very light cyan for odd rows
|
||||
evenRows: lipgloss.Color("#B2EBF2"), // Slightly darker light cyan for even rows
|
||||
highlight: lipgloss.Color("#00BFCF"),
|
||||
highlight: lipgloss.Color("#00BFCF"), // Highlight in strong cyan
|
||||
}
|
||||
}
|
||||
|
||||
func newGreenStyle() *Style {
|
||||
return &Style{
|
||||
func newGreenStyle() Style {
|
||||
return Style{
|
||||
name: "green",
|
||||
border: lipgloss.Color("#43A047"), // Medium green for border
|
||||
oddRows: lipgloss.Color("#E8F5E9"), // Very light green for odd rows
|
||||
evenRows: lipgloss.Color("#C8E6C9"), // Light green for even rows
|
||||
highlight: lipgloss.Color("#43A047"),
|
||||
highlight: lipgloss.Color("#43A047"), // Highlight in medium green
|
||||
}
|
||||
}
|
||||
|
||||
func newYellowStyle() *Style {
|
||||
return &Style{
|
||||
func newYellowStyle() Style {
|
||||
return Style{
|
||||
name: "yellow",
|
||||
border: lipgloss.Color("#FBC02D"), // Strong yellow for border
|
||||
oddRows: lipgloss.Color("#FFF9C4"), // Very light yellow for odd rows
|
||||
evenRows: lipgloss.Color("#FFF59D"), // Light yellow for even rows
|
||||
highlight: lipgloss.Color("#FBC02D"),
|
||||
highlight: lipgloss.Color("#FBC02D"), // Highlight in strong yellow
|
||||
}
|
||||
}
|
||||
|
||||
func newOrangeStyle() *Style {
|
||||
return &Style{
|
||||
func newOrangeStyle() Style {
|
||||
return Style{
|
||||
name: "orange",
|
||||
border: lipgloss.Color("#F57C00"), // Strong orange for border
|
||||
oddRows: lipgloss.Color("#FFF3E0"), // Very light orange for odd rows
|
||||
evenRows: lipgloss.Color("#FFE0B2"), // Light orange for even rows
|
||||
highlight: lipgloss.Color("#F57C00"),
|
||||
highlight: lipgloss.Color("#F57C00"), // Highlight in strong orange
|
||||
}
|
||||
}
|
||||
|
||||
func newWhiteStyle() *Style {
|
||||
return &Style{
|
||||
func newWhiteStyle() Style {
|
||||
return Style{
|
||||
name: "white",
|
||||
border: lipgloss.Color("#FFFFFF"), // White for border
|
||||
oddRows: lipgloss.Color("#F0F0F0"), // Very light grey for odd rows
|
||||
@ -116,8 +116,8 @@ func newWhiteStyle() *Style {
|
||||
}
|
||||
}
|
||||
|
||||
func newGreyStyle() *Style {
|
||||
return &Style{
|
||||
func newGreyStyle() Style {
|
||||
return Style{
|
||||
name: "grey",
|
||||
border: lipgloss.Color("#9E9E9E"), // Medium grey for border
|
||||
oddRows: lipgloss.Color("#F5F5F5"), // Very light grey for odd rows
|
||||
@ -126,8 +126,8 @@ func newGreyStyle() *Style {
|
||||
}
|
||||
}
|
||||
|
||||
func newNavyBlueStyle() *Style {
|
||||
return &Style{
|
||||
func newNavyBlueStyle() Style {
|
||||
return Style{
|
||||
name: "navy",
|
||||
border: lipgloss.Color("#001F3F"), // Navy blue for border
|
||||
oddRows: lipgloss.Color("#CFE2F3"), // Very light blue for odd rows
|
||||
@ -136,8 +136,8 @@ func newNavyBlueStyle() *Style {
|
||||
}
|
||||
}
|
||||
|
||||
func newBlackStyle() *Style {
|
||||
return &Style{
|
||||
func newBlackStyle() Style {
|
||||
return Style{
|
||||
name: "black",
|
||||
border: lipgloss.Color("#000000"), // Black for border
|
||||
oddRows: lipgloss.Color("#333333"), // Dark grey for odd rows
|
||||
@ -146,32 +146,34 @@ func newBlackStyle() *Style {
|
||||
}
|
||||
}
|
||||
|
||||
func styleFromFlag(colour string) *Style {
|
||||
switch colour {
|
||||
func styleFromFlag(cfg StyleConfig) *Style {
|
||||
var style Style
|
||||
|
||||
switch cfg.Style {
|
||||
case "red":
|
||||
return newRedStyle()
|
||||
style = newRedStyle()
|
||||
case "magenta":
|
||||
return newMagentaStyle()
|
||||
style = newMagentaStyle()
|
||||
case "purple":
|
||||
return newPurpleStyle()
|
||||
style = newPurpleStyle()
|
||||
case "blue":
|
||||
return newBlueStyle()
|
||||
style = newBlueStyle()
|
||||
case "cyan":
|
||||
return newCyanStyle()
|
||||
style = newCyanStyle()
|
||||
case "green":
|
||||
return newGreenStyle()
|
||||
style = newGreenStyle()
|
||||
case "yellow":
|
||||
return newYellowStyle()
|
||||
style = newYellowStyle()
|
||||
case "orange":
|
||||
return newOrangeStyle()
|
||||
style = newOrangeStyle()
|
||||
case "white":
|
||||
return newWhiteStyle()
|
||||
style = newWhiteStyle()
|
||||
case "grey":
|
||||
return newGreyStyle()
|
||||
style = newGreyStyle()
|
||||
case "navy":
|
||||
return newNavyBlueStyle()
|
||||
style = newNavyBlueStyle()
|
||||
case "black":
|
||||
return newBlackStyle()
|
||||
style = newBlackStyle()
|
||||
default:
|
||||
err := os.Setenv("NO_COLOR", "1") // nolint: misspell
|
||||
if err != nil {
|
||||
@ -179,6 +181,12 @@ func styleFromFlag(colour string) *Style {
|
||||
// This is a fallback to ensure that the application can still run
|
||||
fmt.Fprintf(os.Stderr, "Error setting NO_COLOR: %v\n", err)
|
||||
}
|
||||
return &Style{}
|
||||
}
|
||||
|
||||
// If noBorder is true, we disable the border styling
|
||||
if cfg.NoBorder {
|
||||
style.border = ""
|
||||
}
|
||||
|
||||
return &style
|
||||
}
|
||||
|
30
version.go
30
version.go
@ -2,38 +2,8 @@ package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"runtime/debug"
|
||||
"strings"
|
||||
|
||||
"github.com/alecthomas/kong"
|
||||
)
|
||||
|
||||
var version string
|
||||
|
||||
// VersionFlag is a custom flag type for displaying version information.
|
||||
type VersionFlag string
|
||||
|
||||
// Decode implements the kong.Flag interface.
|
||||
func (v VersionFlag) Decode(_ *kong.DecodeContext) error { return nil }
|
||||
|
||||
// IsBool implements the kong.Flag interface.
|
||||
func (v VersionFlag) IsBool() bool { return true }
|
||||
|
||||
// BeforeApply implements the kong.Flag interface.
|
||||
func (v VersionFlag) BeforeApply(app *kong.Kong, _ kong.Vars) error { // nolint: unparam
|
||||
if version == "" {
|
||||
info, ok := debug.ReadBuildInfo()
|
||||
if !ok {
|
||||
return fmt.Errorf("failed to read build info")
|
||||
}
|
||||
version = strings.Split(info.Main.Version, "-")[0]
|
||||
}
|
||||
|
||||
fmt.Printf("gobs-cli version: %s\n", version)
|
||||
app.Exit(0) // Exit the application after printing the version
|
||||
return nil
|
||||
}
|
||||
|
||||
// ObsVersionCmd handles the version command.
|
||||
type ObsVersionCmd struct{} // size = 0x0
|
||||
|
||||
|
@ -11,7 +11,7 @@ func TestVersion(t *testing.T) {
|
||||
defer disconnect()
|
||||
|
||||
var out bytes.Buffer
|
||||
context := newContext(client, &out, "")
|
||||
context := newContext(client, &out, StyleConfig{})
|
||||
|
||||
cmd := &ObsVersionCmd{}
|
||||
err := cmd.Run(context)
|
||||
|
Loading…
x
Reference in New Issue
Block a user