1+ /*
2+ Copyright © 2023-2025 Jens Hilligsøe
3+
4+ Permission is hereby granted, free of charge, to any person obtaining a copy
5+ of this software and associated documentation files (the "Software"), to deal
6+ in the Software without restriction, including without limitation the rights
7+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+ copies of the Software, and to permit persons to whom the Software is
9+ furnished to do so, subject to the following conditions:
10+
11+ The above copyright notice and this permission notice shall be included in
12+ all copies or substantial portions of the Software.
13+
14+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+ THE SOFTWARE.
21+ */
122package cmd
223
324import (
@@ -55,10 +76,11 @@ var speakerDiscoverCmd = &cobra.Command{
5576 return
5677 }
5778 for _ , speaker := range newSpeakers {
58- fmt .Printf ("Found speaker: %s (%s)\n " , speaker .Name , speaker .IPAddress )
79+ headerPrinter .Print ("Found speaker: " )
80+ contentPrinter .Printf ("%s (%s)\n " , speaker .Name , speaker .IPAddress )
5981 if save {
6082 if err := addSpeaker (speaker .IPAddress ); err != nil {
61- fmt .Printf ("Error adding speaker (%s): %s\n " , speaker .IPAddress , err )
83+ errorPrinter .Printf ("Error adding speaker (%s): %s\n " , speaker .IPAddress , err )
6284 }
6385 }
6486 }
@@ -71,7 +93,7 @@ var speakerAddCmd = &cobra.Command{
7193 Long : `Add a speaker` ,
7294 Run : func (cmd * cobra.Command , args []string ) {
7395 if err := addSpeaker (args [0 ]); err != nil {
74- fmt .Printf ("Error adding speaker (%s): %s\n " , args [0 ], err )
96+ errorPrinter .Printf ("Error adding speaker (%s): %s\n " , args [0 ], err )
7597 }
7698 },
7799}
@@ -83,11 +105,11 @@ var speakerRemoveCmd = &cobra.Command{
83105 Long : `Remove a speaker` ,
84106 Run : func (cmd * cobra.Command , args []string ) {
85107 if len (args ) != 1 {
86- fmt .Println ("Error: missing speaker IP address" )
108+ errorPrinter .Println ("Error: missing speaker IP address" )
87109 return
88110 }
89111 if err := removeSpeaker (args [0 ]); err != nil {
90- fmt .Printf ("Error removing speaker (%s): %s\n " , args [0 ], err )
112+ errorPrinter .Printf ("Error removing speaker (%s): %s\n " , args [0 ], err )
91113 }
92114 },
93115}
@@ -101,9 +123,9 @@ var speakerListCmd = &cobra.Command{
101123 defaultSpeakerIP := viper .GetString ("defaultSpeaker" )
102124 for _ , speaker := range speakers {
103125 if speaker .IPAddress == defaultSpeakerIP {
104- fmt .Printf ("%s (%s) [default]\n " , speaker .Name , speaker .IPAddress )
126+ contentPrinter .Printf ("%s (%s) [default]\n " , speaker .Name , speaker .IPAddress )
105127 } else {
106- fmt .Printf ("%s (%s)\n " , speaker .Name , speaker .IPAddress )
128+ contentPrinter .Printf ("%s (%s)\n " , speaker .Name , speaker .IPAddress )
107129 }
108130 }
109131 },
@@ -116,11 +138,12 @@ var speakerSetDefaultCmd = &cobra.Command{
116138 Long : "Set default speaker" ,
117139 Run : func (cmd * cobra.Command , args []string ) {
118140 if len (args ) != 1 {
119- fmt .Printf ("Default speaker is: %s (%s)\n " , defaultSpeaker .Name , defaultSpeaker .IPAddress )
141+ headerPrinter .Print ("Default speaker: " )
142+ contentPrinter .Printf ("%s (%s)\n " , defaultSpeaker .Name , defaultSpeaker .IPAddress )
120143 return
121144 }
122145 if err := setDefaultSpeaker (args [0 ]); err != nil {
123- fmt .Printf ("Error setting default speaker (%s): %s\n " , args [0 ], err )
146+ errorPrinter .Printf ("Error setting default speaker (%s): %s\n " , args [0 ], err )
124147 }
125148 },
126149 ValidArgsFunction : ConfiguredSpeakersCompletion ,
@@ -136,10 +159,13 @@ func addSpeaker(host string) (err error) {
136159 }
137160 speakers = append (speakers , speaker )
138161 viper .Set ("speakers" , speakers )
139- fmt .Printf ("Added speaker: %s (%s)\n " , speaker .Name , speaker .IPAddress )
162+ taskConpletedPrinter .Print ("Added speaker: " )
163+ contentPrinter .Printf ("%s (%s)\n " , speaker .Name , speaker .IPAddress )
164+
140165 if len (speakers ) == 1 {
141166 viper .Set ("defaultSpeaker" , speaker .IPAddress )
142- fmt .Printf ("Set default speaker: %s (%s)\n " , speaker .Name , speaker .IPAddress )
167+ taskConpletedPrinter .Printf ("Saved default speaker: " )
168+ contentPrinter .Printf ("%s (%s)\n " , speaker .Name , speaker .IPAddress )
143169 }
144170 viper .WriteConfig ()
145171 return
@@ -150,7 +176,7 @@ func removeSpeaker(host string) (err error) {
150176 if speaker .IPAddress == host {
151177 speakers = append (speakers [:i ], speakers [i + 1 :]... )
152178 viper .Set ("speakers" , speakers )
153- fmt .Printf ("Removed speaker: %s (%s)\n " , speaker .Name , speaker .IPAddress )
179+ taskConpletedPrinter .Printf ("Removed speaker: %s (%s)\n " , speaker .Name , speaker .IPAddress )
154180 viper .WriteConfig ()
155181 return
156182 }
0 commit comments