Compare commits

..

No commits in common. "31c98745d33a45adc184f7fc0a659ea57a136de2" and "7d41439ad6263ddd0e519d96728de7bd3b15b6ac" have entirely different histories.

16 changed files with 117 additions and 360 deletions

View File

@ -2,11 +2,11 @@ name: CI
on: on:
push: push:
branches: ['main'] branches: [ "main" ]
paths: paths:
- '**.go' - '**.go'
pull_request: pull_request:
branches: ['main'] branches: [ "main" ]
paths: paths:
- '**.go' - '**.go'
jobs: jobs:
@ -23,8 +23,7 @@ jobs:
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: '1.24' go-version: '1.24'
- name: golangci-lint - name: Install golangci-lint
uses: golangci/golangci-lint-action@v9 run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
with: - name: Run golangci-lint
version: v2.6.0 run: golangci-lint run ./...
args: --config .golangci.yml

View File

@ -1,144 +1,55 @@
version: '2'
run: run:
# timeout for analysis, e.g. 30s, 3m, default is 1m
timeout: 3m timeout: 3m
# exclude test files
tests: true tests: true
go: '1.24'
linters: linters:
disable: [dupl] # Set to true runs only fast linters.
enable: # Good option for 'lint on save', pre-commit hook or CI.
# Default enabled linters fast: true
- errcheck # Check for unchecked errors
- govet # Go's built-in vetting tool disable-all: true
- ineffassign # Detect ineffectual assignments
- staticcheck # Advanced static analysis enable:
- unused # Check for unused code - gosimple
# Additional useful linters - govet
- misspell # Detect common misspellings - ineffassign
- unparam # Check for unused function parameters - staticcheck
- gosec # Security checks - unused
- asciicheck # Check for non-ASCII characters - gofmt
- errname # Check error variable names - gofumpt
- godot # Check for missing periods in comments - misspell
- revive # Highly configurable linter for style and correctness - unparam
- gocritic # Detect code issues and suggest improvements - gosec
- gocyclo # Check for cyclomatic complexity - asciicheck
- dupl # Check for code duplication - errname
- predeclared # Check for shadowing of predeclared identifiers - gci
- copyloopvar # Check for loop variable capture in goroutines - godot
- errorlint # Check for common mistakes in error handling - goimports
- goconst # Check for repeated strings that could be constants - revive
- gosmopolitan # Check for non-portable code
linters-settings:
gofmt:
rewrite-rules:
- pattern: 'interface{}'
replacement: 'any'
- pattern: 'a[b:len(a)]'
replacement: 'a[b:]'
settings:
misspell: misspell:
locale: UK locale: UK
errcheck: errcheck:
check-type-assertions: true check-type-assertions: true
check-blank: true
exclude-functions:
- fmt.Fprintf
- fmt.Fprintln
- fmt.Printf
- fmt.Println
- fmt.Errorf
revive:
severity: warning
rules:
# Code quality and style
- name: exported
arguments:
- 'checkPrivateReceivers'
- 'sayRepetitiveInsteadOfStutters'
- name: var-naming
- name: package-comments
- name: range-val-in-closure
- name: time-naming
- name: context-as-argument
- name: context-keys-type
- name: dot-imports
- name: empty-block
- name: error-return
- name: error-strings
- name: error-naming
- name: if-return
- name: increment-decrement
- name: indent-error-flow
- name: receiver-naming
- name: redefines-builtin-id
- name: superfluous-else
- name: unexported-return
- name: unreachable-code
- name: unused-parameter
- name: var-declaration
- name: blank-imports
- name: range
# Disabled rules (can be enabled if needed)
# - name: line-length-limit
# arguments: [120]
# - name: function-length
# arguments: [50, 0]
# - name: cyclomatic
# arguments: [10]
gosec:
excludes:
- G104 # Duplicated errcheck checks
- G115 # integer overflow conversion int -> uint32
exclusions:
warn-unused: false
rules:
# Exclude specific linters for test files
- path: _test\.go
linters:
- gocyclo
- errcheck
- dupl
- gosec
- misspell
- golines
paths:
- vendor
# Formatters configuration
formatters:
# Enable specific formatters
enable:
- gofumpt # Stricter gofmt alternative
- goimports # Organizes imports
- gci # Controls import order/grouping
- golines # Enforces line length
# Formatter-specific settings
settings:
goimports:
local-prefixes: [github.com/onyx-and-iris/gobs-cli]
gci:
# Define import sections order
sections:
- standard # Standard library
- default # Everything else
- prefix(github.com/onyx-and-iris/gobs-cli) # Current module
gofumpt:
extra-rules: true # Enable additional formatting rules
exclusions:
warn-unused: true
paths:
- vendor
issues: issues:
# Limit the number of same issues reported to avoid spam max-same-issues: 0
max-same-issues: 50 max-issues-per-linter: 0
exclude-use-default: false
# Limit the number of issues per linter to keep output manageable exclude:
max-issues-per-linter: 100 # gosec: Duplicated errcheck checks
- G104
exclude-files:
# Exclude vendor directory
- main_test.go

View File

@ -44,11 +44,7 @@ func (cmd *FilterListCmd) Run(ctx *context) error {
} }
if len(sourceFilters.Filters) == 0 { if len(sourceFilters.Filters) == 0 {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "No filters found for source %s.\n", ctx.Style.Highlight(cmd.SourceName))
ctx.Out,
"No filters found for source %s.\n",
ctx.Style.Highlight(cmd.SourceName),
)
return nil return nil
} }

View File

@ -66,11 +66,7 @@ func (cmd *GroupListCmd) Run(ctx *context) error {
var found bool var found bool
for _, item := range resp.SceneItems { for _, item := range resp.SceneItems {
if item.IsGroup { if item.IsGroup {
t.Row( t.Row(fmt.Sprintf("%d", item.SceneItemID), item.SourceName, getEnabledMark(item.SceneItemEnabled))
fmt.Sprintf("%d", item.SceneItemID),
item.SourceName,
getEnabledMark(item.SceneItemEnabled),
)
found = true found = true
} }
} }
@ -101,12 +97,10 @@ func (cmd *GroupShowCmd) Run(ctx *context) error {
var found bool var found bool
for _, item := range resp.SceneItems { for _, item := range resp.SceneItems {
if item.IsGroup && item.SourceName == cmd.GroupName { if item.IsGroup && item.SourceName == cmd.GroupName {
_, err := ctx.Client.SceneItems.SetSceneItemEnabled( _, err := ctx.Client.SceneItems.SetSceneItemEnabled(sceneitems.NewSetSceneItemEnabledParams().
sceneitems.NewSetSceneItemEnabledParams().
WithSceneName(cmd.SceneName). WithSceneName(cmd.SceneName).
WithSceneItemId(item.SceneItemID). WithSceneItemId(item.SceneItemID).
WithSceneItemEnabled(true), WithSceneItemEnabled(true))
)
if err != nil { if err != nil {
return fmt.Errorf("failed to set scene item enabled: %w", err) return fmt.Errorf("failed to set scene item enabled: %w", err)
} }
@ -142,12 +136,10 @@ func (cmd *GroupHideCmd) Run(ctx *context) error {
var found bool var found bool
for _, item := range resp.SceneItems { for _, item := range resp.SceneItems {
if item.IsGroup && item.SourceName == cmd.GroupName { if item.IsGroup && item.SourceName == cmd.GroupName {
_, err := ctx.Client.SceneItems.SetSceneItemEnabled( _, err := ctx.Client.SceneItems.SetSceneItemEnabled(sceneitems.NewSetSceneItemEnabledParams().
sceneitems.NewSetSceneItemEnabledParams().
WithSceneName(cmd.SceneName). WithSceneName(cmd.SceneName).
WithSceneItemId(item.SceneItemID). WithSceneItemId(item.SceneItemID).
WithSceneItemEnabled(false), WithSceneItemEnabled(false))
)
if err != nil { if err != nil {
return fmt.Errorf("failed to set scene item enabled: %w", err) return fmt.Errorf("failed to set scene item enabled: %w", err)
} }
@ -184,23 +176,17 @@ func (cmd *GroupToggleCmd) Run(ctx *context) error {
for _, item := range resp.SceneItems { for _, item := range resp.SceneItems {
if item.IsGroup && item.SourceName == cmd.GroupName { if item.IsGroup && item.SourceName == cmd.GroupName {
newState := !item.SceneItemEnabled newState := !item.SceneItemEnabled
_, err := ctx.Client.SceneItems.SetSceneItemEnabled( _, err := ctx.Client.SceneItems.SetSceneItemEnabled(sceneitems.NewSetSceneItemEnabledParams().
sceneitems.NewSetSceneItemEnabledParams().
WithSceneName(cmd.SceneName). WithSceneName(cmd.SceneName).
WithSceneItemId(item.SceneItemID). WithSceneItemId(item.SceneItemID).
WithSceneItemEnabled(newState), WithSceneItemEnabled(newState))
)
if err != nil { if err != nil {
return fmt.Errorf("failed to set scene item enabled: %w", err) return fmt.Errorf("failed to set scene item enabled: %w", err)
} }
if newState { if newState {
fmt.Fprintf(ctx.Out, "Group %s is now shown.\n", ctx.Style.Highlight(cmd.GroupName)) fmt.Fprintf(ctx.Out, "Group %s is now shown.\n", ctx.Style.Highlight(cmd.GroupName))
} else { } else {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Group %s is now hidden.\n", ctx.Style.Highlight(cmd.GroupName))
ctx.Out,
"Group %s is now hidden.\n",
ctx.Style.Highlight(cmd.GroupName),
)
} }
found = true found = true
break break
@ -240,9 +226,5 @@ func (cmd *GroupStatusCmd) Run(ctx *context) error {
return nil return nil
} }
} }
return fmt.Errorf( return fmt.Errorf("group %s not found in scene %s", ctx.Style.Error(cmd.GroupName), ctx.Style.Error(cmd.SceneName))
"group %s not found in scene %s",
ctx.Style.Error(cmd.GroupName),
ctx.Style.Error(cmd.SceneName),
)
} }

View File

@ -50,15 +50,8 @@ func (cmd *InputCreateCmd) Run(ctx *context) error {
return err return err
} }
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Created input: %s (%s) in scene %s\n",
ctx.Out, ctx.Style.Highlight(cmd.Name), cmd.Kind, ctx.Style.Highlight(currentScene.CurrentProgramSceneName))
"Created input: %s (%s) in scene %s\n",
ctx.Style.Highlight(
cmd.Name,
),
cmd.Kind,
ctx.Style.Highlight(currentScene.CurrentProgramSceneName),
)
return nil return nil
} }
@ -173,12 +166,7 @@ func (cmd *InputListCmd) Run(ctx *context) error {
if !added && (!cmd.Input && !cmd.Output && !cmd.Colour && !cmd.Ffmpeg && !cmd.Vlc) { if !added && (!cmd.Input && !cmd.Output && !cmd.Colour && !cmd.Ffmpeg && !cmd.Vlc) {
if cmd.UUID { if cmd.UUID {
t.Row( t.Row(input.InputName, snakeCaseToTitleCase(input.InputKind), muteMark, input.InputUuid)
input.InputName,
snakeCaseToTitleCase(input.InputKind),
muteMark,
input.InputUuid,
)
} else { } else {
t.Row(input.InputName, snakeCaseToTitleCase(input.InputKind), muteMark) t.Row(input.InputName, snakeCaseToTitleCase(input.InputKind), muteMark)
} }
@ -205,7 +193,8 @@ func (cmd *InputListKindsCmd) Run(ctx *context) error {
t.Headers("Kind") t.Headers("Kind")
t.StyleFunc(func(row, col int) lipgloss.Style { t.StyleFunc(func(row, col int) lipgloss.Style {
style := lipgloss.NewStyle().Padding(0, 3) style := lipgloss.NewStyle().Padding(0, 3)
if col == 0 { switch col {
case 0:
style = style.Align(lipgloss.Left) style = style.Align(lipgloss.Left)
} }
switch { switch {
@ -395,7 +384,8 @@ func (cmd *InputShowCmd) Run(ctx *context) error {
BorderStyle(lipgloss.NewStyle().Foreground(ctx.Style.border)) BorderStyle(lipgloss.NewStyle().Foreground(ctx.Style.border))
t.StyleFunc(func(row, col int) lipgloss.Style { t.StyleFunc(func(row, col int) lipgloss.Style {
style := lipgloss.NewStyle().Padding(0, 3) style := lipgloss.NewStyle().Padding(0, 3)
if col == 0 { switch col {
case 0:
style = style.Align(lipgloss.Left) style = style.Align(lipgloss.Left)
} }
switch { switch {

11
main.go
View File

@ -105,11 +105,7 @@ func main() {
&cli, &cli,
kong.Name("gobs-cli"), kong.Name("gobs-cli"),
kong.Description("A command line tool to interact with OBS Websocket."), kong.Description("A command line tool to interact with OBS Websocket."),
kong.Configuration( kong.Configuration(kongdotenv.ENVFileReader, ".env", filepath.Join(userConfigDir, "gobs-cli", "config.env")),
kongdotenv.ENVFileReader,
".env",
filepath.Join(userConfigDir, "gobs-cli", "config.env"),
),
kong.UsageOnError(), kong.UsageOnError(),
kong.ConfigureHelp(kong.HelpOptions{ kong.ConfigureHelp(kong.HelpOptions{
Compact: true, Compact: true,
@ -125,8 +121,7 @@ func main() {
} }
return version return version
}(), }(),
}, })
)
ctx.FatalIfErrorf(run(ctx, cli.ObsConfig, cli.StyleConfig)) ctx.FatalIfErrorf(run(ctx, cli.ObsConfig, cli.StyleConfig))
} }
@ -149,7 +144,7 @@ func run(ctx *kong.Context, obsCfg ObsConfig, styleCfg StyleConfig) error {
return fmt.Errorf("failed to disconnect from OBS: %w", err) return fmt.Errorf("failed to disconnect from OBS: %w", err)
} }
return nil return nil
}() // nolint: errcheck }()
ctx.Bind(newContext(client, os.Stdout, styleCfg)) ctx.Bind(newContext(client, os.Stdout, styleCfg))

View File

@ -43,6 +43,7 @@ func TestMain(m *testing.M) {
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)
} }
defer client.Disconnect()
setup(client) setup(client)
@ -50,13 +51,11 @@ func TestMain(m *testing.M) {
exitCode := m.Run() exitCode := m.Run()
teardown(client) teardown(client)
client.Disconnect()
// Exit with the appropriate code // Exit with the appropriate code
os.Exit(exitCode) os.Exit(exitCode)
} }
// nolint: misspell
func setup(client *goobs.Client) { func setup(client *goobs.Client) {
client.Config.SetStreamServiceSettings(config.NewSetStreamServiceSettingsParams(). client.Config.SetStreamServiceSettings(config.NewSetStreamServiceSettingsParams().
WithStreamServiceType("rtmp_common"). WithStreamServiceType("rtmp_common").

View File

@ -94,9 +94,7 @@ func (cmd *ProfileSwitchCmd) Run(ctx *context) error {
return fmt.Errorf("already using profile %s", ctx.Style.Error(cmd.Name)) return fmt.Errorf("already using profile %s", ctx.Style.Error(cmd.Name))
} }
_, err = ctx.Client.Config.SetCurrentProfile( _, err = ctx.Client.Config.SetCurrentProfile(config.NewSetCurrentProfileParams().WithProfileName(cmd.Name))
config.NewSetCurrentProfileParams().WithProfileName(cmd.Name),
)
if err != nil { if err != nil {
return fmt.Errorf("failed to switch to profile %s: %w", ctx.Style.Error(cmd.Name), err) return fmt.Errorf("failed to switch to profile %s: %w", ctx.Style.Error(cmd.Name), err)
} }
@ -127,9 +125,7 @@ func (cmd *ProfileCreateCmd) Run(ctx *context) error {
return fmt.Errorf("profile %s already exists", ctx.Style.Error(cmd.Name)) return fmt.Errorf("profile %s already exists", ctx.Style.Error(cmd.Name))
} }
_, err = ctx.Client.Config.CreateProfile( _, err = ctx.Client.Config.CreateProfile(config.NewCreateProfileParams().WithProfileName(cmd.Name))
config.NewCreateProfileParams().WithProfileName(cmd.Name),
)
if err != nil { if err != nil {
return fmt.Errorf("failed to create profile %s: %w", ctx.Style.Error(cmd.Name), err) return fmt.Errorf("failed to create profile %s: %w", ctx.Style.Error(cmd.Name), err)
} }
@ -161,9 +157,7 @@ func (cmd *ProfileRemoveCmd) Run(ctx *context) error {
return fmt.Errorf("cannot delete current profile %s", ctx.Style.Error(cmd.Name)) return fmt.Errorf("cannot delete current profile %s", ctx.Style.Error(cmd.Name))
} }
_, err = ctx.Client.Config.RemoveProfile( _, err = ctx.Client.Config.RemoveProfile(config.NewRemoveProfileParams().WithProfileName(cmd.Name))
config.NewRemoveProfileParams().WithProfileName(cmd.Name),
)
if err != nil { if err != nil {
return fmt.Errorf("failed to delete profile %s: %w", ctx.Style.Error(cmd.Name), err) return fmt.Errorf("failed to delete profile %s: %w", ctx.Style.Error(cmd.Name), err)
} }

View File

@ -97,12 +97,9 @@ func (cmd *ProjectorOpenCmd) Run(ctx *context) error {
) )
} }
_, err = ctx.Client.Ui.OpenSourceProjector(ui.NewOpenSourceProjectorParams(). ctx.Client.Ui.OpenSourceProjector(ui.NewOpenSourceProjectorParams().
WithSourceName(cmd.SourceName). WithSourceName(cmd.SourceName).
WithMonitorIndex(cmd.MonitorIndex)) WithMonitorIndex(cmd.MonitorIndex))
if err != nil {
return fmt.Errorf("failed to open projector: %w", err)
}
fmt.Fprintf( fmt.Fprintf(
ctx.Out, ctx.Out,

View File

@ -66,10 +66,7 @@ func (cmd *RecordStopCmd) Run(ctx *context) error {
fmt.Fprintf( fmt.Fprintf(
ctx.Out, ctx.Out,
"%s", "%s",
fmt.Sprintf( fmt.Sprintf("Recording stopped successfully. Output file: %s\n", ctx.Style.Highlight(resp.OutputPath)),
"Recording stopped successfully. Output file: %s\n",
ctx.Style.Highlight(resp.OutputPath),
),
) )
return nil return nil
} }
@ -179,11 +176,7 @@ func (cmd *RecordDirectoryCmd) Run(ctx *context) error {
if err != nil { if err != nil {
return err return err
} }
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Current recording directory: %s\n", ctx.Style.Highlight(resp.RecordDirectory))
ctx.Out,
"Current recording directory: %s\n",
ctx.Style.Highlight(resp.RecordDirectory),
)
return nil return nil
} }
@ -194,11 +187,7 @@ func (cmd *RecordDirectoryCmd) Run(ctx *context) error {
return err return err
} }
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Recording directory set to: %s\n", ctx.Style.Highlight(cmd.RecordDirectory))
ctx.Out,
"Recording directory set to: %s\n",
ctx.Style.Highlight(cmd.RecordDirectory),
)
return nil return nil
} }

View File

@ -1,4 +1,3 @@
// nolint: goconst
package main package main
import ( import (

View File

@ -32,7 +32,8 @@ func (cmd *SceneCollectionListCmd) Run(ctx *context) error {
Headers("Scene Collection Name"). Headers("Scene Collection Name").
StyleFunc(func(row, col int) lipgloss.Style { StyleFunc(func(row, col int) lipgloss.Style {
style := lipgloss.NewStyle().Padding(0, 3) style := lipgloss.NewStyle().Padding(0, 3)
if col == 0 { switch col {
case 0:
style = style.Align(lipgloss.Left) style = style.Align(lipgloss.Left)
} }
switch { switch {
@ -88,11 +89,7 @@ func (cmd *SceneCollectionSwitchCmd) Run(ctx *context) error {
config.NewSetCurrentSceneCollectionParams().WithSceneCollectionName(cmd.Name), config.NewSetCurrentSceneCollectionParams().WithSceneCollectionName(cmd.Name),
) )
if err != nil { if err != nil {
return fmt.Errorf( return fmt.Errorf("failed to switch scene collection %s: %w", ctx.Style.Error(cmd.Name), err)
"failed to switch scene collection %s: %w",
ctx.Style.Error(cmd.Name),
err,
)
} }
fmt.Fprintf(ctx.Out, "Switched to scene collection: %s\n", ctx.Style.Highlight(cmd.Name)) fmt.Fprintf(ctx.Out, "Switched to scene collection: %s\n", ctx.Style.Highlight(cmd.Name))
@ -111,11 +108,7 @@ func (cmd *SceneCollectionCreateCmd) Run(ctx *context) error {
config.NewCreateSceneCollectionParams().WithSceneCollectionName(cmd.Name), config.NewCreateSceneCollectionParams().WithSceneCollectionName(cmd.Name),
) )
if err != nil { if err != nil {
return fmt.Errorf( return fmt.Errorf("failed to create scene collection %s: %w", ctx.Style.Error(cmd.Name), err)
"failed to create scene collection %s: %w",
ctx.Style.Error(cmd.Name),
err,
)
} }
fmt.Fprintf(ctx.Out, "Created scene collection: %s\n", ctx.Style.Highlight(cmd.Name)) fmt.Fprintf(ctx.Out, "Created scene collection: %s\n", ctx.Style.Highlight(cmd.Name))

View File

@ -44,11 +44,7 @@ func (cmd *SceneItemListCmd) Run(ctx *context) error {
} }
if len(resp.SceneItems) == 0 { if len(resp.SceneItems) == 0 {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "No scene items found in scene %s.\n", ctx.Style.Highlight(cmd.SceneName))
ctx.Out,
"No scene items found in scene %s.\n",
ctx.Style.Highlight(cmd.SceneName),
)
return nil return nil
} }
@ -90,10 +86,8 @@ func (cmd *SceneItemListCmd) Run(ctx *context) error {
for _, item := range resp.SceneItems { for _, item := range resp.SceneItems {
if item.IsGroup { if item.IsGroup {
resp, err := ctx.Client.SceneItems.GetGroupSceneItemList( resp, err := ctx.Client.SceneItems.GetGroupSceneItemList(sceneitems.NewGetGroupSceneItemListParams().
sceneitems.NewGetGroupSceneItemListParams(). WithSceneName(item.SourceName))
WithSceneName(item.SourceName),
)
if err != nil { if err != nil {
return fmt.Errorf( return fmt.Errorf(
"failed to get group scene item list for group %s: %w", "failed to get group scene item list for group %s: %w",
@ -129,12 +123,7 @@ func (cmd *SceneItemListCmd) Run(ctx *context) error {
t.Row(fmt.Sprintf("%d", item.SceneItemID), item.SourceName, "", t.Row(fmt.Sprintf("%d", item.SceneItemID), item.SourceName, "",
getEnabledMark(item.SceneItemEnabled), item.SourceUuid) getEnabledMark(item.SceneItemEnabled), item.SourceUuid)
} else { } else {
t.Row( t.Row(fmt.Sprintf("%d", item.SceneItemID), item.SourceName, "", getEnabledMark(item.SceneItemEnabled))
fmt.Sprintf("%d", item.SceneItemID),
item.SourceName,
"",
getEnabledMark(item.SceneItemEnabled),
)
} }
} }
} }
@ -150,10 +139,8 @@ func getSceneNameAndItemID(
group string, group string,
) (string, int, error) { ) (string, int, error) {
if group != "" { if group != "" {
resp, err := ctx.Client.SceneItems.GetGroupSceneItemList( resp, err := ctx.Client.SceneItems.GetGroupSceneItemList(sceneitems.NewGetGroupSceneItemListParams().
sceneitems.NewGetGroupSceneItemListParams(). WithSceneName(group))
WithSceneName(group),
)
if err != nil { if err != nil {
return "", 0, err return "", 0, err
} }
@ -162,11 +149,7 @@ func getSceneNameAndItemID(
return group, int(item.SceneItemID), nil return group, int(item.SceneItemID), nil
} }
} }
return "", 0, fmt.Errorf( return "", 0, fmt.Errorf("item %s not found in scene %s", ctx.Style.Error(itemName), ctx.Style.Error(sceneName))
"item %s not found in scene %s",
ctx.Style.Error(itemName),
ctx.Style.Error(sceneName),
)
} }
itemID, err := ctx.Client.SceneItems.GetSceneItemId(sceneitems.NewGetSceneItemIdParams(). itemID, err := ctx.Client.SceneItems.GetSceneItemId(sceneitems.NewGetSceneItemIdParams().
@ -197,12 +180,7 @@ type SceneItemShowCmd struct {
// Run executes the command to show a scene item. // Run executes the command to show a scene item.
func (cmd *SceneItemShowCmd) Run(ctx *context) error { func (cmd *SceneItemShowCmd) Run(ctx *context) error {
sceneName, sceneItemID, err := getSceneNameAndItemID( sceneName, sceneItemID, err := getSceneNameAndItemID(ctx, cmd.SceneName, cmd.ItemName, cmd.Group)
ctx,
cmd.SceneName,
cmd.ItemName,
cmd.Group,
)
if err != nil { if err != nil {
return err return err
} }
@ -223,12 +201,7 @@ func (cmd *SceneItemShowCmd) Run(ctx *context) error {
ctx.Style.Highlight(cmd.Group), ctx.Style.Highlight(cmd.Group),
) )
} else { } else {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Scene item %s in scene %s is now visible.\n", ctx.Style.Highlight(cmd.ItemName), ctx.Style.Highlight(cmd.SceneName))
ctx.Out,
"Scene item %s in scene %s is now visible.\n",
ctx.Style.Highlight(cmd.ItemName),
ctx.Style.Highlight(cmd.SceneName),
)
} }
return nil return nil
@ -244,12 +217,7 @@ type SceneItemHideCmd struct {
// Run executes the command to hide a scene item. // Run executes the command to hide a scene item.
func (cmd *SceneItemHideCmd) Run(ctx *context) error { func (cmd *SceneItemHideCmd) Run(ctx *context) error {
sceneName, sceneItemID, err := getSceneNameAndItemID( sceneName, sceneItemID, err := getSceneNameAndItemID(ctx, cmd.SceneName, cmd.ItemName, cmd.Group)
ctx,
cmd.SceneName,
cmd.ItemName,
cmd.Group,
)
if err != nil { if err != nil {
return err return err
} }
@ -270,12 +238,7 @@ func (cmd *SceneItemHideCmd) Run(ctx *context) error {
ctx.Style.Highlight(cmd.Group), ctx.Style.Highlight(cmd.Group),
) )
} else { } else {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Scene item %s in scene %s is now hidden.\n", ctx.Style.Highlight(cmd.ItemName), ctx.Style.Highlight(cmd.SceneName))
ctx.Out,
"Scene item %s in scene %s is now hidden.\n",
ctx.Style.Highlight(cmd.ItemName),
ctx.Style.Highlight(cmd.SceneName),
)
} }
return nil return nil
@ -302,12 +265,7 @@ type SceneItemToggleCmd struct {
// Run executes the command to toggle the visibility of a scene item. // Run executes the command to toggle the visibility of a scene item.
func (cmd *SceneItemToggleCmd) Run(ctx *context) error { func (cmd *SceneItemToggleCmd) Run(ctx *context) error {
sceneName, sceneItemID, err := getSceneNameAndItemID( sceneName, sceneItemID, err := getSceneNameAndItemID(ctx, cmd.SceneName, cmd.ItemName, cmd.Group)
ctx,
cmd.SceneName,
cmd.ItemName,
cmd.Group,
)
if err != nil { if err != nil {
return err return err
} }
@ -333,12 +291,7 @@ func (cmd *SceneItemToggleCmd) Run(ctx *context) error {
ctx.Style.Highlight(cmd.SceneName), ctx.Style.Highlight(cmd.SceneName),
) )
} else { } else {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Scene item %s in scene %s is now visible.\n", ctx.Style.Highlight(cmd.ItemName), ctx.Style.Highlight(cmd.SceneName))
ctx.Out,
"Scene item %s in scene %s is now visible.\n",
ctx.Style.Highlight(cmd.ItemName),
ctx.Style.Highlight(cmd.SceneName),
)
} }
return nil return nil
@ -354,12 +307,7 @@ type SceneItemVisibleCmd struct {
// Run executes the command to check the visibility of a scene item. // Run executes the command to check the visibility of a scene item.
func (cmd *SceneItemVisibleCmd) Run(ctx *context) error { func (cmd *SceneItemVisibleCmd) Run(ctx *context) error {
sceneName, sceneItemID, err := getSceneNameAndItemID( sceneName, sceneItemID, err := getSceneNameAndItemID(ctx, cmd.SceneName, cmd.ItemName, cmd.Group)
ctx,
cmd.SceneName,
cmd.ItemName,
cmd.Group,
)
if err != nil { if err != nil {
return err return err
} }
@ -377,12 +325,7 @@ func (cmd *SceneItemVisibleCmd) Run(ctx *context) error {
ctx.Style.Highlight(cmd.SceneName), ctx.Style.Highlight(cmd.SceneName),
) )
} else { } else {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Scene item %s in scene %s is hidden.\n", ctx.Style.Highlight(cmd.ItemName), ctx.Style.Highlight(cmd.SceneName))
ctx.Out,
"Scene item %s in scene %s is hidden.\n",
ctx.Style.Highlight(cmd.ItemName),
ctx.Style.Highlight(cmd.SceneName),
)
} }
return nil return nil
} }
@ -413,22 +356,15 @@ type SceneItemTransformCmd struct {
// Run executes the command to transform a scene item. // Run executes the command to transform a scene item.
func (cmd *SceneItemTransformCmd) Run(ctx *context) error { func (cmd *SceneItemTransformCmd) Run(ctx *context) error {
sceneName, sceneItemID, err := getSceneNameAndItemID( sceneName, sceneItemID, err := getSceneNameAndItemID(ctx, cmd.SceneName, cmd.ItemName, cmd.Group)
ctx,
cmd.SceneName,
cmd.ItemName,
cmd.Group,
)
if err != nil { if err != nil {
return err return err
} }
// Get the current transform of the scene item // Get the current transform of the scene item
resp, err := ctx.Client.SceneItems.GetSceneItemTransform( resp, err := ctx.Client.SceneItems.GetSceneItemTransform(sceneitems.NewGetSceneItemTransformParams().
sceneitems.NewGetSceneItemTransformParams().
WithSceneName(sceneName). WithSceneName(sceneName).
WithSceneItemId(sceneItemID), WithSceneItemId(sceneItemID))
)
if err != nil { if err != nil {
return err return err
} }
@ -484,12 +420,10 @@ func (cmd *SceneItemTransformCmd) Run(ctx *context) error {
transform.ScaleY = cmd.ScaleY transform.ScaleY = cmd.ScaleY
} }
_, err = ctx.Client.SceneItems.SetSceneItemTransform( _, err = ctx.Client.SceneItems.SetSceneItemTransform(sceneitems.NewSetSceneItemTransformParams().
sceneitems.NewSetSceneItemTransformParams().
WithSceneName(sceneName). WithSceneName(sceneName).
WithSceneItemId(sceneItemID). WithSceneItemId(sceneItemID).
WithSceneItemTransform(transform), WithSceneItemTransform(transform))
)
if err != nil { if err != nil {
return err return err
} }
@ -502,12 +436,7 @@ func (cmd *SceneItemTransformCmd) Run(ctx *context) error {
ctx.Style.Highlight(cmd.Group), ctx.Style.Highlight(cmd.Group),
) )
} else { } else {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Scene item %s in scene %s transformed.\n", ctx.Style.Highlight(cmd.ItemName), ctx.Style.Highlight(cmd.SceneName))
ctx.Out,
"Scene item %s in scene %s transformed.\n",
ctx.Style.Highlight(cmd.ItemName),
ctx.Style.Highlight(cmd.SceneName),
)
} }
return nil return nil

View File

@ -91,12 +91,7 @@ func (cmd *StreamStatusCmd) Run(ctx *context) error {
minutes := int(seconds / 60) minutes := int(seconds / 60)
secondsInt := int(seconds) % 60 secondsInt := int(seconds) % 60
if minutes > 0 { if minutes > 0 {
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Output duration: %d minutes and %d seconds\n", minutes, secondsInt)
ctx.Out,
"Output duration: %d minutes and %d seconds\n",
minutes,
secondsInt,
)
} else { } else {
fmt.Fprintf(ctx.Out, "Output duration: %d seconds\n", secondsInt) fmt.Fprintf(ctx.Out, "Output duration: %d seconds\n", secondsInt)
} }

View File

@ -19,9 +19,7 @@ type StudioModeEnableCmd struct{} // size = 0x0
// Run executes the command to enable studio mode. // Run executes the command to enable studio mode.
func (cmd *StudioModeEnableCmd) Run(ctx *context) error { func (cmd *StudioModeEnableCmd) Run(ctx *context) error {
_, err := ctx.Client.Ui.SetStudioModeEnabled( _, err := ctx.Client.Ui.SetStudioModeEnabled(ui.NewSetStudioModeEnabledParams().WithStudioModeEnabled(true))
ui.NewSetStudioModeEnabledParams().WithStudioModeEnabled(true),
)
if err != nil { if err != nil {
return fmt.Errorf("failed to enable studio mode: %w", err) return fmt.Errorf("failed to enable studio mode: %w", err)
} }
@ -35,9 +33,7 @@ type StudioModeDisableCmd struct{} // size = 0x0
// Run executes the command to disable studio mode. // Run executes the command to disable studio mode.
func (cmd *StudioModeDisableCmd) Run(ctx *context) error { func (cmd *StudioModeDisableCmd) Run(ctx *context) error {
_, err := ctx.Client.Ui.SetStudioModeEnabled( _, err := ctx.Client.Ui.SetStudioModeEnabled(ui.NewSetStudioModeEnabledParams().WithStudioModeEnabled(false))
ui.NewSetStudioModeEnabledParams().WithStudioModeEnabled(false),
)
if err != nil { if err != nil {
return fmt.Errorf("failed to disable studio mode: %w", err) return fmt.Errorf("failed to disable studio mode: %w", err)
} }
@ -57,9 +53,7 @@ func (cmd *StudioModeToggleCmd) Run(ctx *context) error {
} }
newStatus := !status.StudioModeEnabled newStatus := !status.StudioModeEnabled
_, err = ctx.Client.Ui.SetStudioModeEnabled( _, err = ctx.Client.Ui.SetStudioModeEnabled(ui.NewSetStudioModeEnabledParams().WithStudioModeEnabled(newStatus))
ui.NewSetStudioModeEnabledParams().WithStudioModeEnabled(newStatus),
)
if err != nil { if err != nil {
return fmt.Errorf("failed to toggle studio mode: %w", err) return fmt.Errorf("failed to toggle studio mode: %w", err)
} }

View File

@ -80,11 +80,6 @@ func (cmd *TextUpdateCmd) Run(ctx *context) error {
if cmd.NewText == "" { if cmd.NewText == "" {
cmd.NewText = "(empty)" cmd.NewText = "(empty)"
} }
fmt.Fprintf( fmt.Fprintf(ctx.Out, "Updated text for source %s to: %s\n", ctx.Style.Highlight(cmd.InputName), cmd.NewText)
ctx.Out,
"Updated text for source %s to: %s\n",
ctx.Style.Highlight(cmd.InputName),
cmd.NewText,
)
return nil return nil
} }