Skip to content

Commit 5d92e0b

Browse files
OpenWaygateOpenWaygate
committed
♻️ Extract common usages and add enum options
issue #64
1 parent 774446b commit 5d92e0b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+273
-302
lines changed

‎cmd/activity/activity.go‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ import (
77
)
88

99
const (
10-
short = "List YouTube activities"
11-
long = "List YouTube activities, such as likes, favorites, uploads, etc"
12-
ciUsage = "ID of the channel"
13-
homeUsage = "true, false, or empty"
14-
mrUsage = "The maximum number of items that should be returned"
15-
mineUsage = "true, false, or empty"
16-
paUsage = "Filter on activities published after this date"
17-
pbUsage = "Filter on activities published before this date"
18-
rcUsage = ""
19-
partsUsage = "Comma separated parts"
10+
short = "List YouTube activities"
11+
long = "List YouTube activities, such as likes, favorites, uploads, etc"
12+
ciUsage = "ID of the channel"
13+
homeUsage = "true, false, or empty"
14+
mineUsage = "true, false, or empty"
15+
paUsage = "Filter on activities published after this date"
16+
pbUsage = "Filter on activities published before this date"
17+
rcUsage = ""
2018
)
2119

2220
var (

‎cmd/activity/list.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func init() {
1818
activityCmd.AddCommand(listCmd)
1919
listCmd.Flags().StringVarP(&channelId, "channelId", "c", "", ciUsage)
2020
listCmd.Flags().BoolVarP(home, "home", "H", true, homeUsage)
21-
listCmd.Flags().Int64VarP(&maxResults, "maxResults", "n", 5, mrUsage)
21+
listCmd.Flags().Int64VarP(&maxResults, "maxResults", "n", 5, cmd.MRUsage)
2222
listCmd.Flags().BoolVarP(mine, "mine", "M", true, mineUsage)
2323
listCmd.Flags().StringVarP(
2424
&publishedAfter, "publishedAfter", "a", "", paUsage,
@@ -27,9 +27,11 @@ func init() {
2727
&publishedBefore, "publishedBefore", "b", "", pbUsage,
2828
)
2929
listCmd.Flags().StringVarP(&regionCode, "regionCode", "r", "", rcUsage)
30-
listCmd.Flags().StringSliceVarP(&parts, "parts", "p", defaultParts, partsUsage)
30+
listCmd.Flags().StringSliceVarP(
31+
&parts, "parts", "p", defaultParts, cmd.PartsUsage,
32+
)
3133
listCmd.Flags().StringVarP(&output, "output", "o", "table", cmd.TableUsage)
32-
listCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JpUsage)
34+
listCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JPUsage)
3335
}
3436

3537
var listCmd = &cobra.Command{
@@ -62,7 +64,7 @@ var listTool = mcp.NewTool(
6264
),
6365
mcp.WithNumber(
6466
"maxResults", mcp.DefaultNumber(5),
65-
mcp.Description(mrUsage), mcp.Required(),
67+
mcp.Description(cmd.MRUsage), mcp.Required(),
6668
),
6769
mcp.WithString(
6870
"mine", mcp.Enum("true", "false", ""),
@@ -83,15 +85,15 @@ var listTool = mcp.NewTool(
8385
mcp.WithArray(
8486
"parts", mcp.DefaultArray(defaultParts),
8587
mcp.Items(map[string]any{"type": "string"}),
86-
mcp.Description(partsUsage), mcp.Required(),
88+
mcp.Description(cmd.PartsUsage), mcp.Required(),
8789
),
8890
mcp.WithString(
89-
"output", mcp.DefaultString("table"),
90-
mcp.Description(cmd.TableUsage), mcp.Required(),
91+
"output", mcp.Enum("json", "yaml", "table"),
92+
mcp.DefaultString("table"), mcp.Description(cmd.TableUsage), mcp.Required(),
9193
),
9294
mcp.WithString(
9395
"jsonpath", mcp.DefaultString(""),
94-
mcp.Description(cmd.JpUsage), mcp.Required(),
96+
mcp.Description(cmd.JPUsage), mcp.Required(),
9597
),
9698
)
9799

‎cmd/caption/caption.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const (
2121
nameUsage = "Name of the caption track"
2222
tkUsage = "standard, ASR, or forced"
2323
vidUsage = "ID of the video"
24-
partsUsage = "Comma separated parts"
2524
tfmtUsage = "sbv, srt, or vtt"
2625
tlangUsage = "Translate the captions into this language"
2726
)

‎cmd/caption/insert.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func init() {
4444
&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "",
4545
)
4646
insertCmd.Flags().StringVarP(&output, "output", "o", "", cmd.SilentUsage)
47-
insertCmd.Flags().StringVarP(&jpath, "jsonPath", "j", "", cmd.JpUsage)
47+
insertCmd.Flags().StringVarP(&jpath, "jsonPath", "j", "", cmd.JPUsage)
4848

4949
_ = insertCmd.MarkFlagRequired("file")
5050
_ = insertCmd.MarkFlagRequired("videoId")
@@ -124,12 +124,12 @@ var insertTool = mcp.NewTool(
124124
mcp.Description(""), mcp.Required(),
125125
),
126126
mcp.WithString(
127-
"output", mcp.DefaultString(""),
128-
mcp.Description(cmd.SilentUsage), mcp.Required(),
127+
"output", mcp.Enum("json", "yaml", "silent", ""),
128+
mcp.DefaultString(""), mcp.Description(cmd.SilentUsage), mcp.Required(),
129129
),
130130
mcp.WithString(
131131
"jsonpath", mcp.DefaultString(""),
132-
mcp.Description(cmd.JpUsage), mcp.Required(),
132+
mcp.Description(cmd.JPUsage), mcp.Required(),
133133
),
134134
)
135135

‎cmd/caption/list.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ func init() {
2727
&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "",
2828
)
2929
listCmd.Flags().StringSliceVarP(
30-
&parts, "parts", "p", []string{"id", "snippet"}, partsUsage,
30+
&parts, "parts", "p", []string{"id", "snippet"}, cmd.PartsUsage,
3131
)
3232
listCmd.Flags().StringVarP(&output, "output", "o", "table", cmd.TableUsage)
33-
listCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JpUsage)
33+
listCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JPUsage)
3434
}
3535

3636
var listCmd = &cobra.Command{
@@ -73,15 +73,15 @@ var listTool = mcp.NewTool(
7373
mcp.WithArray(
7474
"parts", mcp.DefaultArray([]string{"id", "snippet"}),
7575
mcp.Items(map[string]any{"type": "string"}),
76-
mcp.Description(partsUsage), mcp.Required(),
76+
mcp.Description(cmd.PartsUsage), mcp.Required(),
7777
),
7878
mcp.WithString(
79-
"output", mcp.DefaultString("table"),
80-
mcp.Description(cmd.TableUsage), mcp.Required(),
79+
"output", mcp.Enum("json", "yaml", "table"),
80+
mcp.DefaultString("table"), mcp.Description(cmd.TableUsage), mcp.Required(),
8181
),
8282
mcp.WithString(
8383
"jsonpath", mcp.DefaultString(""),
84-
mcp.Description(cmd.JpUsage), mcp.Required(),
84+
mcp.Description(cmd.JPUsage), mcp.Required(),
8585
),
8686
)
8787

‎cmd/caption/update.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func init() {
4444
&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "",
4545
)
4646
updateCmd.Flags().StringVarP(&output, "output", "o", "", cmd.SilentUsage)
47-
updateCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JpUsage)
47+
updateCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JPUsage)
4848

4949
_ = updateCmd.MarkFlagRequired("videoId")
5050
}
@@ -122,12 +122,12 @@ var updateTool = mcp.NewTool(
122122
mcp.Description(""), mcp.Required(),
123123
),
124124
mcp.WithString(
125-
"output", mcp.DefaultString(""),
126-
mcp.Description(cmd.SilentUsage), mcp.Required(),
125+
"output", mcp.Enum("json", "yaml", "silent", ""),
126+
mcp.DefaultString(""), mcp.Description(cmd.SilentUsage), mcp.Required(),
127127
),
128128
mcp.WithString(
129129
"jsonpath", mcp.DefaultString(""),
130-
mcp.Description(cmd.JpUsage), mcp.Required(),
130+
mcp.Description(cmd.JPUsage), mcp.Required(),
131131
),
132132
)
133133

‎cmd/channel/channel.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ const (
1616
fuUsage = "Return the channel associated with a YouTube username"
1717
hlUsage = "Specifies the localization language of the metadata"
1818
mbmUsage = "Return the channels managed by the authenticated user"
19-
mrUsage = "The maximum number of items that should be returned"
2019
mineUsage = "Return the ids of channels owned by the authenticated user"
2120
msUsage = "Return the channels subscribed to the authenticated user"
2221
countryUsage = "Country of the channel"
2322
curlUsage = "Custom URL of the channel"
2423
dlUsage = "The language of the channel's default title and description"
2524
descUsage = "Description of the channel"
2625
titleUsage = "Title of the channel"
27-
partsUsage = "Comma separated parts"
2826
)
2927

3028
var (

‎cmd/channel/list.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func init() {
3636
managedByMe, "managedByMe", "E", false, mbmUsage,
3737
)
3838
listCmd.Flags().Int64VarP(
39-
&maxResults, "maxResults", "n", 5, mrUsage,
39+
&maxResults, "maxResults", "n", 5, cmd.MRUsage,
4040
)
4141
listCmd.Flags().BoolVarP(mine, "mine", "M", true, mineUsage)
4242
listCmd.Flags().BoolVarP(
@@ -46,10 +46,10 @@ func init() {
4646
&onBehalfOfContentOwner, "onBehalfOfContentOwner", "b", "", "",
4747
)
4848
listCmd.Flags().StringSliceVarP(
49-
&parts, "parts", "p", []string{"id", "snippet", "status"}, partsUsage,
49+
&parts, "parts", "p", []string{"id", "snippet", "status"}, cmd.PartsUsage,
5050
)
5151
listCmd.Flags().StringVarP(&output, "output", "o", "table", cmd.TableUsage)
52-
listCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JpUsage)
52+
listCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JPUsage)
5353
}
5454

5555
var listCmd = &cobra.Command{
@@ -99,7 +99,7 @@ var listTool = mcp.NewTool(
9999
),
100100
mcp.WithNumber(
101101
"maxResults", mcp.DefaultNumber(5),
102-
mcp.Description(mrUsage), mcp.Required(),
102+
mcp.Description(cmd.MRUsage), mcp.Required(),
103103
),
104104
mcp.WithString(
105105
"mine", mcp.Enum("true", "false", ""),
@@ -116,15 +116,15 @@ var listTool = mcp.NewTool(
116116
mcp.WithArray(
117117
"parts", mcp.DefaultArray([]string{"id", "snippet", "status"}),
118118
mcp.Items(map[string]any{"type": "string"}),
119-
mcp.Description(partsUsage), mcp.Required(),
119+
mcp.Description(cmd.PartsUsage), mcp.Required(),
120120
),
121121
mcp.WithString(
122-
"output", mcp.DefaultString("table"),
123-
mcp.Description(cmd.TableUsage), mcp.Required(),
122+
"output", mcp.Enum("json", "yaml", "table"),
123+
mcp.DefaultString("table"), mcp.Description(cmd.TableUsage), mcp.Required(),
124124
),
125125
mcp.WithString(
126126
"jsonpath", mcp.DefaultString(""),
127-
mcp.Description(cmd.JpUsage), mcp.Required(),
127+
mcp.Description(cmd.JPUsage), mcp.Required(),
128128
),
129129
)
130130

‎cmd/channel/update.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func init() {
3131
)
3232
updateCmd.Flags().StringVarP(&title, "title", "t", "", titleUsage)
3333
updateCmd.Flags().StringVarP(&output, "output", "o", "", cmd.SilentUsage)
34-
updateCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JpUsage)
34+
updateCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JPUsage)
3535

3636
_ = updateCmd.MarkFlagRequired("id")
3737
}
@@ -86,13 +86,12 @@ var updateTool = mcp.NewTool(
8686
mcp.Description(titleUsage), mcp.Required(),
8787
),
8888
mcp.WithString(
89-
"output", mcp.DefaultString(""),
90-
mcp.Description(cmd.SilentUsage),
91-
mcp.Required(),
89+
"output", mcp.Enum("json", "yaml", "silent", ""),
90+
mcp.DefaultString(""), mcp.Description(cmd.SilentUsage), mcp.Required(),
9291
),
9392
mcp.WithString(
9493
"jsonpath", mcp.DefaultString(""),
95-
mcp.Description(cmd.JpUsage),
94+
mcp.Description(cmd.JPUsage),
9695
mcp.Required(),
9796
),
9897
)

‎cmd/channelBanner/insert.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func init() {
2323
&onBehalfOfContentOwnerChannel, "onBehalfOfContentOwnerChannel", "B", "", "",
2424
)
2525
insertCmd.Flags().StringVarP(&output, "output", "o", "", cmd.SilentUsage)
26-
insertCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JpUsage)
26+
insertCmd.Flags().StringVarP(&jpath, "jsonpath", "j", "", cmd.JPUsage)
2727

2828
_ = insertCmd.MarkFlagRequired("channelId")
2929
_ = insertCmd.MarkFlagRequired("file")
@@ -66,12 +66,12 @@ var insertTool = mcp.NewTool(
6666
mcp.Description(""), mcp.Required(),
6767
),
6868
mcp.WithString(
69-
"output", mcp.DefaultString(""),
70-
mcp.Description(cmd.SilentUsage), mcp.Required(),
69+
"output", mcp.Enum("json", "yaml", "silent", ""),
70+
mcp.DefaultString(""), mcp.Description(cmd.SilentUsage), mcp.Required(),
7171
),
7272
mcp.WithString(
7373
"jsonpath", mcp.DefaultString(""),
74-
mcp.Description(cmd.JpUsage), mcp.Required(),
74+
mcp.Description(cmd.JPUsage), mcp.Required(),
7575
),
7676
)
7777

0 commit comments

Comments
 (0)