Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## [Unreleased]

### Fixed
- `sonos scene apply` reports a failure when ungrouping, mute, or volume restore fails, instead of succeeding.

## [0.3.5] - 2026-10-23

**Highlights:** Fix the reachable crypto/x509 vulnerability GO-2026-6809 with Go 1.27.3, explain SMAPI API-client identity rejections, and correctly label initial watch events.
Expand Down
2 changes: 1 addition & 1 deletion docs/scenes.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sonos scene apply evening
sonos scene delete evening
```

Apply is best-effort and idempotent — running `sonos scene apply evening` twice is safe.
Apply reports an error when ungrouping, joining, mute, or volume restore fails. Running `sonos scene apply evening` again is safe when the speakers accept the calls.

## Targeting one room (experimental)

Expand Down
12 changes: 9 additions & 3 deletions internal/cli/scene.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,9 @@ func newSceneApplyCmd(flags *rootFlags) *cobra.Command {
if ip == "" {
continue
}
_ = newSceneSpeakerClient(ip, flags.Timeout).LeaveGroup(cmd.Context())
if err := newSceneSpeakerClient(ip, flags.Timeout).LeaveGroup(cmd.Context()); err != nil {
return fmt.Errorf("leave group for %s: %w", dev.Name, err)
}
}

// Step 2: rebuild groups.
Expand Down Expand Up @@ -342,8 +344,12 @@ func newSceneApplyCmd(flags *rootFlags) *cobra.Command {
continue
}
c := newSceneSpeakerClient(ip, flags.Timeout)
_ = c.SetMute(cmd.Context(), dev.Mute)
_ = c.SetVolume(cmd.Context(), dev.Volume)
if err := c.SetMute(cmd.Context(), dev.Mute); err != nil {
return fmt.Errorf("set mute for %s: %w", dev.Name, err)
}
if err := c.SetVolume(cmd.Context(), dev.Volume); err != nil {
return fmt.Errorf("set volume for %s: %w", dev.Name, err)
}
}

return writeOK(cmd, flags, "scene.apply", map[string]any{"name": scene.Name, "only": strings.TrimSpace(only)})
Expand Down
79 changes: 76 additions & 3 deletions internal/cli/scene_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,18 @@ type fakeSceneSpeaker struct {

setVolCalls int
setVolValue int
setVolErr error

setMuteCalls int
setMuteValue bool
setMuteErr error

leaveErr error
}

func (f *fakeSceneSpeaker) LeaveGroup(ctx context.Context) error {
f.leaveCalls++
return nil
return f.leaveErr
}

func (f *fakeSceneSpeaker) JoinGroup(ctx context.Context, coordinatorUUID string) error {
Expand All @@ -91,13 +95,13 @@ func (f *fakeSceneSpeaker) GetVolume(ctx context.Context) (int, error) { return
func (f *fakeSceneSpeaker) SetVolume(ctx context.Context, volume int) error {
f.setVolCalls++
f.setVolValue = volume
return nil
return f.setVolErr
}
func (f *fakeSceneSpeaker) GetMute(ctx context.Context) (bool, error) { return f.mute, nil }
func (f *fakeSceneSpeaker) SetMute(ctx context.Context, mute bool) error {
f.setMuteCalls++
f.setMuteValue = mute
return nil
return f.setMuteErr
}

func TestSceneSaveCapturesGroupsAndDeviceAudio(t *testing.T) {
Expand Down Expand Up @@ -269,6 +273,75 @@ func TestSceneApplyUngroupsJoinsAndRestoresAudio(t *testing.T) {
}
}

func TestSceneApplyReportsLeaveAndLevelErrors(t *testing.T) {
flags := &rootFlags{Timeout: 2 * time.Second, Format: formatJSON}
scene := scenes.Scene{
Name: "Work",
Groups: []scenes.SceneGroup{{
CoordinatorUUID: "RINCON_A1400",
MemberUUIDs: []string{"RINCON_A1400", "RINCON_B1400"},
}},
Devices: []scenes.SceneDevice{
{UUID: "RINCON_A1400", Name: "A", IP: "192.168.1.10", Volume: 5, Mute: false},
{UUID: "RINCON_B1400", Name: "B", IP: "192.168.1.11", Volume: 15, Mute: true},
},
}
top := sonos.Topology{
ByIP: map[string]sonos.Member{
"192.168.1.10": {Name: "A", IP: "192.168.1.10", UUID: "RINCON_A1400", IsVisible: true},
"192.168.1.11": {Name: "B", IP: "192.168.1.11", UUID: "RINCON_B1400", IsVisible: true},
},
}
origStore := newSceneStore
origTG := newSceneTopologyGetter
origClient := newSceneSpeakerClient
t.Cleanup(func() {
newSceneStore = origStore
newSceneTopologyGetter = origTG
newSceneSpeakerClient = origClient
})
newSceneTopologyGetter = func(ctx context.Context, timeout time.Duration) (sceneTopologyGetter, error) {
return &fakeSceneTopologyGetter{top: top}, nil
}

cases := []struct {
name string
speaker *fakeSceneSpeaker
want string
}{
{name: "leave", speaker: &fakeSceneSpeaker{ip: "192.168.1.10", leaveErr: errors.New("busy")}, want: "leave group for A"},
{name: "mute", speaker: &fakeSceneSpeaker{ip: "192.168.1.10", setMuteErr: errors.New("busy")}, want: "set mute for A"},
{name: "volume", speaker: &fakeSceneSpeaker{ip: "192.168.1.10", setVolErr: errors.New("busy")}, want: "set volume for A"},
}
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
store := &fakeSceneStore{scenes: map[string]scenes.Scene{"Work": scene}}
speakers := map[string]*fakeSceneSpeaker{
"192.168.1.10": tc.speaker,
"192.168.1.11": {ip: "192.168.1.11"},
}
newSceneStore = func() (scenes.Store, error) { return store, nil }
newSceneSpeakerClient = func(ip string, timeout time.Duration) sceneSpeakerClient {
return speakers[ip]
}
cmd := newSceneCmd(flags)
var out strings.Builder
cmd.SetOut(&out)
cmd.SetErr(newDiscardWriter())
cmd.SetArgs([]string{"apply", "Work"})
cmd.SilenceErrors = true
cmd.SilenceUsage = true
err := cmd.ExecuteContext(context.Background())
if err == nil || !strings.Contains(err.Error(), tc.want) {
t.Fatalf("error = %v, want %q", err, tc.want)
}
if strings.Contains(out.String(), "scene.apply") {
t.Fatalf("printed success: %s", out.String())
}
})
}
}

func TestSceneApplyMissingScene(t *testing.T) {
flags := &rootFlags{Timeout: 2 * time.Second}
cmd := newSceneCmd(flags)
Expand Down