Skip to content

Commit d0ae276

Browse files
peteski22peteski22
committed
Rename PackageResults to ServerResults for printer
1 parent 4317613 commit d0ae276

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
lines changed

‎cmd/search.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ func NewSearchCmd(baseCmd *internalcmd.BaseCmd, opt ...cmdopts.CmdOption) (*cobr
3636
return nil, err
3737
}
3838

39-
pkgPrinter := printer.NewPackagePrinter()
39+
pkgPrinter := printer.NewServerPrinter()
4040

4141
c := &SearchCmd{
4242
BaseCmd: baseCmd,
4343
Format: internalcmd.FormatText, // Default to plain text
4444
registryBuilder: opts.RegistryBuilder,
45-
packagePrinter: printer.NewPackageResultsPrinter(pkgPrinter),
45+
packagePrinter: printer.NewServerResultsPrinter(pkgPrinter),
4646
}
4747

4848
cobraCommand := &cobra.Command{

‎internal/printer/server_printer.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,54 @@ import (
1313
"github.com/mozilla-ai/mcpd/v2/internal/runtime"
1414
)
1515

16-
var _ output.Printer[packages.Server] = (*PackagePrinter)(nil)
16+
var _ output.Printer[packages.Server] = (*ServerPrinter)(nil)
1717

18-
func DefaultPackageHeader() output.WriteFunc[packages.Server] {
18+
func DefaultServerHeader() output.WriteFunc[packages.Server] {
1919
return nil
2020
}
2121

22-
func DefaultPackageFooter() output.WriteFunc[packages.Server] {
22+
func DefaultServerFooter() output.WriteFunc[packages.Server] {
2323
return func(w io.Writer, _ int) {
2424
_, _ = fmt.Fprintln(w, "")
2525
_, _ = fmt.Fprintln(w, "────────────────────────────────────────────")
2626
_, _ = fmt.Fprintln(w, "")
2727
}
2828
}
2929

30-
type PackagePrinter struct {
30+
type ServerPrinter struct {
3131
headerFunc output.WriteFunc[packages.Server]
3232
footerFunc output.WriteFunc[packages.Server]
3333
}
3434

35-
func NewPackagePrinter() *PackagePrinter {
36-
return &PackagePrinter{
37-
headerFunc: DefaultPackageHeader(),
38-
footerFunc: DefaultPackageFooter(),
35+
func NewServerPrinter() *ServerPrinter {
36+
return &ServerPrinter{
37+
headerFunc: DefaultServerHeader(),
38+
footerFunc: DefaultServerFooter(),
3939
}
4040
}
4141

42-
func (p *PackagePrinter) Header(w io.Writer, count int) {
42+
func (p *ServerPrinter) Header(w io.Writer, count int) {
4343
if p.headerFunc != nil {
4444
p.headerFunc(w, count)
4545
}
4646
}
4747

48-
func (p *PackagePrinter) SetHeader(fn output.WriteFunc[packages.Server]) {
48+
func (p *ServerPrinter) SetHeader(fn output.WriteFunc[packages.Server]) {
4949
p.headerFunc = fn
5050
}
5151

52-
func (p *PackagePrinter) Footer(w io.Writer, count int) {
52+
func (p *ServerPrinter) Footer(w io.Writer, count int) {
5353
if p.footerFunc != nil {
5454
p.footerFunc(w, count)
5555
}
5656
}
5757

58-
func (p *PackagePrinter) SetFooter(fn output.WriteFunc[packages.Server]) {
58+
func (p *ServerPrinter) SetFooter(fn output.WriteFunc[packages.Server]) {
5959
p.footerFunc = fn
6060
}
6161

62-
// Item outputs a single package entry.
63-
func (p *PackagePrinter) Item(w io.Writer, pkg packages.Server) error {
62+
// Item outputs a single server entry.
63+
func (p *ServerPrinter) Item(w io.Writer, pkg packages.Server) error {
6464
parts := []string{
6565
fmt.Sprintf(" 🆔 %s", pkg.ID),
6666
}
@@ -130,7 +130,7 @@ func padRight(s string, width int) string {
130130
return s + strings.Repeat(" ", width-len(s))
131131
}
132132

133-
func (p *PackagePrinter) printRuntimes(w io.Writer, pkg packages.Server) {
133+
func (p *ServerPrinter) printRuntimes(w io.Writer, pkg packages.Server) {
134134
if len(pkg.Installations) == 0 {
135135
return
136136
}
@@ -167,7 +167,7 @@ func (p *PackagePrinter) printRuntimes(w io.Writer, pkg packages.Server) {
167167
}
168168
}
169169

170-
func (p *PackagePrinter) printTools(w io.Writer, pkg packages.Server) {
170+
func (p *ServerPrinter) printTools(w io.Writer, pkg packages.Server) {
171171
slices.SortFunc(pkg.Tools, func(a, b packages.Tool) int {
172172
return cmp.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
173173
})
@@ -178,7 +178,7 @@ func (p *PackagePrinter) printTools(w io.Writer, pkg packages.Server) {
178178
}
179179
}
180180

181-
func (p *PackagePrinter) printEnvVars(w io.Writer, pkg packages.Server) {
181+
func (p *ServerPrinter) printEnvVars(w io.Writer, pkg packages.Server) {
182182
envs := pkg.Arguments.FilterBy(packages.EnvVar).Ordered()
183183
if len(envs) == 0 {
184184
return
@@ -190,7 +190,7 @@ func (p *PackagePrinter) printEnvVars(w io.Writer, pkg packages.Server) {
190190
}
191191
}
192192

193-
func (p *PackagePrinter) printRequiredEnvs(w io.Writer, pkg packages.Server) {
193+
func (p *ServerPrinter) printRequiredEnvs(w io.Writer, pkg packages.Server) {
194194
envs := pkg.Arguments.FilterBy(packages.EnvVar, packages.Required).Names()
195195
if len(envs) == 0 {
196196
return
@@ -204,7 +204,7 @@ func (p *PackagePrinter) printRequiredEnvs(w io.Writer, pkg packages.Server) {
204204
}
205205
}
206206

207-
func (p *PackagePrinter) printPositionalArgs(w io.Writer, pkg packages.Server) {
207+
func (p *ServerPrinter) printPositionalArgs(w io.Writer, pkg packages.Server) {
208208
args := pkg.Arguments.FilterBy(packages.PositionalArgument).Ordered()
209209
if len(args) == 0 {
210210
return
@@ -216,7 +216,7 @@ func (p *PackagePrinter) printPositionalArgs(w io.Writer, pkg packages.Server) {
216216
}
217217
}
218218

219-
func (p *PackagePrinter) printValueFlags(w io.Writer, pkg packages.Server) {
219+
func (p *ServerPrinter) printValueFlags(w io.Writer, pkg packages.Server) {
220220
args := pkg.Arguments.FilterBy(packages.ValueArgument).Ordered()
221221
if len(args) == 0 {
222222
return
@@ -228,7 +228,7 @@ func (p *PackagePrinter) printValueFlags(w io.Writer, pkg packages.Server) {
228228
}
229229
}
230230

231-
func (p *PackagePrinter) printBoolFlags(w io.Writer, pkg packages.Server) {
231+
func (p *ServerPrinter) printBoolFlags(w io.Writer, pkg packages.Server) {
232232
args := pkg.Arguments.FilterBy(packages.BoolArgument).Ordered()
233233
if len(args) == 0 {
234234
return
@@ -240,7 +240,7 @@ func (p *PackagePrinter) printBoolFlags(w io.Writer, pkg packages.Server) {
240240
}
241241
}
242242

243-
func (p *PackagePrinter) printRequiredArgs(w io.Writer, pkg packages.Server) {
243+
func (p *ServerPrinter) printRequiredArgs(w io.Writer, pkg packages.Server) {
244244
args := pkg.Arguments.FilterBy(packages.Argument, packages.Required).Ordered()
245245
if len(args) == 0 {
246246
return

‎internal/printer/server_results_printer.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,49 @@ import (
88
"github.com/mozilla-ai/mcpd/v2/internal/packages"
99
)
1010

11-
type PackageResultsPrinter struct {
12-
headerFunc output.WriteFunc[packages.Server]
13-
footerFunc output.WriteFunc[packages.Server]
14-
PackagePrinter output.Printer[packages.Server]
11+
type ServerResultsPrinter struct {
12+
headerFunc output.WriteFunc[packages.Server]
13+
footerFunc output.WriteFunc[packages.Server]
14+
Printer output.Printer[packages.Server]
1515
}
1616

17-
func NewPackageResultsPrinter(prn output.Printer[packages.Server]) *PackageResultsPrinter {
18-
return &PackageResultsPrinter{
19-
headerFunc: DefaultResultsHeader(),
20-
footerFunc: DefaultResultsFooter(),
21-
PackagePrinter: prn,
17+
func NewServerResultsPrinter(prn output.Printer[packages.Server]) *ServerResultsPrinter {
18+
return &ServerResultsPrinter{
19+
headerFunc: DefaultResultsHeader(),
20+
footerFunc: DefaultResultsFooter(),
21+
Printer: prn,
2222
}
2323
}
2424

25-
func (p *PackageResultsPrinter) Header(w io.Writer, count int) {
25+
func (p *ServerResultsPrinter) Header(w io.Writer, count int) {
2626
if p.headerFunc != nil {
2727
p.headerFunc(w, count)
2828
}
2929
}
3030

31-
func (p *PackageResultsPrinter) SetHeader(fn output.WriteFunc[packages.Server]) {
31+
func (p *ServerResultsPrinter) SetHeader(fn output.WriteFunc[packages.Server]) {
3232
p.headerFunc = fn
3333
}
3434

35-
func (p *PackageResultsPrinter) Item(w io.Writer, pkg packages.Server) error {
36-
p.PackagePrinter.Header(w, 0)
35+
func (p *ServerResultsPrinter) Item(w io.Writer, pkg packages.Server) error {
36+
p.Printer.Header(w, 0)
3737

38-
if err := p.PackagePrinter.Item(w, pkg); err != nil {
38+
if err := p.Printer.Item(w, pkg); err != nil {
3939
return err
4040
}
4141

42-
p.PackagePrinter.Footer(w, 0)
42+
p.Printer.Footer(w, 0)
4343

4444
return nil
4545
}
4646

47-
func (p *PackageResultsPrinter) Footer(w io.Writer, count int) {
47+
func (p *ServerResultsPrinter) Footer(w io.Writer, count int) {
4848
if p.footerFunc != nil {
4949
p.footerFunc(w, count)
5050
}
5151
}
5252

53-
func (p *PackageResultsPrinter) SetFooter(fn output.WriteFunc[packages.Server]) {
53+
func (p *ServerResultsPrinter) SetFooter(fn output.WriteFunc[packages.Server]) {
5454
p.footerFunc = fn
5555
}
5656

@@ -66,7 +66,7 @@ func DefaultResultsHeader() output.WriteFunc[packages.Server] {
6666

6767
func DefaultResultsFooter() output.WriteFunc[packages.Server] {
6868
return func(w io.Writer, count int) {
69-
_, _ = fmt.Fprintf(w, "📦 Found %d package%s\n", count, map[bool]string{true: "s"}[count > 1])
69+
_, _ = fmt.Fprintf(w, "📦 Found %d servers%s\n", count, map[bool]string{true: "s"}[count > 1])
7070
_, _ = fmt.Fprintln(w, "")
7171
}
7272
}

‎internal/printer/server_results_printer_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestPackageListPrinter_Header(t *testing.T) {
4343
t.Parallel()
4444

4545
buf := &bytes.Buffer{}
46-
printer := NewPackageResultsPrinter(&testPrinterInner{})
46+
printer := NewServerResultsPrinter(&testPrinterInner{})
4747
printer.Header(buf, 5)
4848

4949
out := buf.String()
@@ -56,7 +56,7 @@ func TestPackageListPrinter_Item(t *testing.T) {
5656
t.Parallel()
5757

5858
inner := &testPrinterInner{}
59-
printer := NewPackageResultsPrinter(inner)
59+
printer := NewServerResultsPrinter(inner)
6060

6161
pkg := newPkg("testpkg")
6262
err := printer.Item(nil, pkg)
@@ -65,7 +65,7 @@ func TestPackageListPrinter_Item(t *testing.T) {
6565

6666
// error case
6767
inner = &testPrinterInner{errOnPackage: "badpkg"}
68-
printer = NewPackageResultsPrinter(inner)
68+
printer = NewServerResultsPrinter(inner)
6969
bad := newPkg("badpkg")
7070
err = printer.Item(nil, bad)
7171
require.EqualError(t, err, "print error")
@@ -75,7 +75,7 @@ func TestPackageListPrinter_Footer(t *testing.T) {
7575
t.Parallel()
7676

7777
buf := &bytes.Buffer{}
78-
printer := NewPackageResultsPrinter(&testPrinterInner{})
78+
printer := NewServerResultsPrinter(&testPrinterInner{})
7979

8080
// singular
8181
printer.Footer(buf, 1)

0 commit comments

Comments
 (0)