♻️ Refactor bool as pointer

Author: OpenWaygate

MODULE.bazel

@@ -19,6 +19,7 @@ use_repo(
     "com_github_mark3labs_mcp_go",
     "com_github_savioxavier_termlink",
     "com_github_spf13_cobra",
+    "com_github_spf13_pflag",
     "com_github_spf13_viper",
     "in_gopkg_yaml_v3",
     "org_golang_google_api",

cmd/activity/activity.go

@@ -6,11 +6,25 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const (
+	shortUsage           = "List YouTube activities"
+	longUsage            = "List YouTube activities"
+	channelIdUsage       = "ID of the channel"
+	homeUsage            = "true or false or empty"
+	maxResultsUsage      = "The maximum number of items that should be returned"
+	mineUsage            = "true or false or empty"
+	publishedAfterUsage  = "Filter on activities published after this date"
+	publishedBeforeUsage = "Filter on activities published before this date"
+	regionCodeUsage      = ""
+	partsUsage           = "Comma separated parts"
+	outputUsage          = "json or yaml"
+)
+
 var (
 	channelId       string
-	home            = utils.BoolPtr("false")
+	home            = utils.BoolPtr("")
 	maxResults      int64
-	mine            = utils.BoolPtr("true")
+	mine            = utils.BoolPtr("")
 	publishedAfter  string
 	publishedBefore string
 	regionCode      string
@@ -20,8 +34,15 @@ var (
 
 var activityCmd = &cobra.Command{
 	Use:   "activity",
-	Short: "List YouTube activities",
-	Long:  "List YouTube activities",
+	Short: shortUsage,
+	Long:  longUsage,
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		boolMap := map[string]*bool{
+			"home": home,
+			"mine": mine,
+		}
+		utils.ResetBool(boolMap, cmd.Flags())
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		_ = cmd.Help()
 	},

cmd/activity/list.go

@@ -12,51 +12,44 @@ import (
 )
 
 const (
-	shortDesc           = "List YouTube activities"
-	longDesc            = "List YouTube activities, such as likes, favorites, uploads, etc."
-	channelIdDesc       = "ID of the channel"
-	homeDesc            = "true or false"
-	maxResultsDesc      = "The maximum number of items that should be returned"
-	mineDesc            = "true or false"
-	publishedAfterDesc  = "Filter on activities published after this date"
-	publishedBeforeDesc = "Filter on activities published before this date"
-	regionCodeDesc      = ""
-	partsDesc           = "Comma separated parts"
-	outputDesc          = "json or yaml"
+	listShortUsage = "List YouTube activities"
+	listLongUsage  = "List YouTube activities, such as likes, favorites, uploads, etc."
 )
 
+var defaultParts = []string{"id", "snippet", "contentDetails"}
+
 var listTool = mcp.NewTool(
 	"activity.list",
-	mcp.WithDescription(longDesc),
+	mcp.WithDescription(listLongUsage),
 	mcp.WithString(
-		"channelId", mcp.DefaultString(""), mcp.Description(channelIdDesc),
+		"channelId", mcp.DefaultString(""), mcp.Description(channelIdUsage),
 	),
 	mcp.WithString(
 		"home", mcp.Enum("true", "false", ""),
-		mcp.DefaultString(""), mcp.Description(homeDesc),
+		mcp.DefaultString(""), mcp.Description(homeUsage),
 	),
 	mcp.WithNumber(
-		"maxResults", mcp.DefaultNumber(5), mcp.Description(maxResultsDesc),
+		"maxResults", mcp.DefaultNumber(5), mcp.Description(maxResultsUsage),
 	),
 	mcp.WithString(
 		"mine", mcp.Enum("true", "false", ""),
-		mcp.DefaultString("true"), mcp.Description(mineDesc),
+		mcp.DefaultString("true"), mcp.Description(mineUsage),
 	),
 	mcp.WithString(
-		"publishedAfter", mcp.DefaultString(""), mcp.Description(publishedAfterDesc),
+		"publishedAfter", mcp.DefaultString(""),
+		mcp.Description(publishedAfterUsage),
 	),
 	mcp.WithString(
 		"publishedBefore", mcp.DefaultString(""),
-		mcp.Description(publishedBeforeDesc),
+		mcp.Description(publishedBeforeUsage),
 	),
 	mcp.WithString(
-		"regionCode", mcp.DefaultString(""), mcp.Description(regionCodeDesc),
+		"regionCode", mcp.DefaultString(""), mcp.Description(regionCodeUsage),
 	),
 	mcp.WithArray(
-		"parts", mcp.DefaultArray([]string{"id", "snippet", "contentDetails"}),
-		mcp.Description(partsDesc),
+		"parts", mcp.DefaultArray(defaultParts), mcp.Description(partsUsage),
 	),
-	mcp.WithString("output", mcp.DefaultString(""), mcp.Description(outputDesc)),
+	mcp.WithString("output", mcp.DefaultString(""), mcp.Description(outputUsage)),
 )
 
 func run(writer io.Writer) error {
@@ -76,16 +69,8 @@ func run(writer io.Writer) error {
 
 var listCmd = &cobra.Command{
 	Use:   "list",
-	Short: shortDesc,
-	Long:  longDesc,
-	PreRun: func(cmd *cobra.Command, args []string) {
-		if !cmd.Flags().Lookup("home").Changed {
-			home = nil
-		}
-		if !cmd.Flags().Lookup("mine").Changed {
-			mine = nil
-		}
-	},
+	Short: listShortUsage,
+	Long:  listLongUsage,
 	Run: func(cmd *cobra.Command, args []string) {
 		err := run(cmd.OutOrStdout())
 		if err != nil {
@@ -99,25 +84,25 @@ func init() {
 	cmd.MCP.AddTool(listTool, listHandler)
 	activityCmd.AddCommand(listCmd)
 	listCmd.Flags().StringVarP(
-		&channelId, "channelId", "c", "", channelIdDesc,
+		&channelId, "channelId", "c", "", channelIdUsage,
 	)
-	listCmd.Flags().BoolVarP(home, "home", "H", true, homeDesc)
+	listCmd.Flags().BoolVarP(home, "home", "H", true, homeUsage)
 	listCmd.Flags().Int64VarP(
-		&maxResults, "maxResults", "n", 5, maxResultsDesc,
+		&maxResults, "maxResults", "n", 5, maxResultsUsage,
 	)
-	listCmd.Flags().BoolVarP(mine, "mine", "M", true, mineDesc)
+	listCmd.Flags().BoolVarP(mine, "mine", "M", true, mineUsage)
 	listCmd.Flags().StringVarP(
-		&publishedAfter, "publishedAfter", "a", "", publishedAfterDesc,
+		&publishedAfter, "publishedAfter", "a", "", publishedAfterUsage,
 	)
 	listCmd.Flags().StringVarP(
-		&publishedBefore, "publishedBefore", "b", "", publishedBeforeDesc,
+		&publishedBefore, "publishedBefore", "b", "", publishedBeforeUsage,
 	)
-	listCmd.Flags().StringVarP(&regionCode, "regionCode", "r", "", regionCodeDesc)
+	listCmd.Flags().StringVarP(&regionCode, "regionCode", "r", "", regionCodeUsage)
 
 	listCmd.Flags().StringArrayVarP(
-		&parts, "parts", "p", []string{"id", "snippet", "contentDetails"}, partsDesc,
+		&parts, "parts", "p", defaultParts, partsUsage,
 	)
-	listCmd.Flags().StringVarP(&output, "output", "o", "", outputDesc)
+	listCmd.Flags().StringVarP(&output, "output", "o", "", outputUsage)
 }
 
 func listHandler(ctx context.Context, request mcp.CallToolRequest) (

cmd/caption/BUILD.bazel

@@ -15,6 +15,8 @@ go_library(
     deps = [
         "//cmd",
         "//pkg/caption",
+        "//pkg/utils",
         "@com_github_spf13_cobra//:cobra",
+        "@com_github_spf13_pflag//:pflag",
     ],
 )

cmd/caption/caption.go

@@ -2,18 +2,20 @@ package caption
 
 import (
 	"github.com/eat-pray-ai/yutu/cmd"
+	"github.com/eat-pray-ai/yutu/pkg/utils"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var (
 	id                     string
 	file                   string
 	audioTrackType         string
-	isAutoSynced           bool
-	isCC                   bool
-	isDraft                bool
-	isEasyReader           bool
-	isLarge                bool
+	isAutoSynced           = utils.BoolPtr("")
+	isCC                   = utils.BoolPtr("")
+	isDraft                = utils.BoolPtr("")
+	isEasyReader           = utils.BoolPtr("")
+	isLarge                = utils.BoolPtr("")
 	language               string
 	name                   string
 	trackKind              string
@@ -30,6 +32,9 @@ var captionCmd = &cobra.Command{
 	Use:   "caption",
 	Short: "Manipulate YouTube captions",
 	Long:  "List, insert, update, download, or delete YouTube captions",
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		resetFlags(cmd.Flags())
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		_ = cmd.Help()
 	},
@@ -38,3 +43,15 @@ var captionCmd = &cobra.Command{
 func init() {
 	cmd.RootCmd.AddCommand(captionCmd)
 }
+
+func resetFlags(flagSet *pflag.FlagSet) {
+	boolMap := map[string]*bool{
+		"isAutoSynced": isAutoSynced,
+		"isCC":         isCC,
+		"isDraft":      isDraft,
+		"isEasyReader": isEasyReader,
+		"isLarge":      isLarge,
+	}
+
+	utils.ResetBool(boolMap, flagSet)
+}

cmd/caption/delete.go

@@ -25,5 +25,7 @@ func init() {
 
 	deleteCmd.Flags().StringVarP(&id, "id", "i", "", "ID of the caption")
 	deleteCmd.Flags().StringVarP(&onBehalfOf, "onBehalfOf", "b", "", "")
-	deleteCmd.Flags().StringVarP(&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "")
+	deleteCmd.Flags().StringVarP(
+		&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "",
+	)
 }

cmd/caption/download.go

@@ -27,11 +27,17 @@ func init() {
 	captionCmd.AddCommand(downloadCmd)
 
 	downloadCmd.Flags().StringVarP(&id, "id", "i", "", "ID of the caption")
-	downloadCmd.Flags().StringVarP(&file, "file", "f", "", "Path to save the caption file")
+	downloadCmd.Flags().StringVarP(
+		&file, "file", "f", "", "Path to save the caption file",
+	)
 	downloadCmd.Flags().StringVarP(&tfmt, "tfmt", "t", "", "sbv, srt or vtt")
-	downloadCmd.Flags().StringVarP(&tlang, "tlang", "l", "", "Translate the captions into this language")
+	downloadCmd.Flags().StringVarP(
+		&tlang, "tlang", "l", "", "Translate the captions into this language",
+	)
 	downloadCmd.Flags().StringVarP(&onBehalfOf, "onBehalfOf", "b", "", "")
-	downloadCmd.Flags().StringVarP(&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "")
+	downloadCmd.Flags().StringVarP(
+		&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "",
+	)
 
 	downloadCmd.MarkFlagRequired("id")
 	downloadCmd.MarkFlagRequired("file")

cmd/caption/insert.go

@@ -13,11 +13,11 @@ var insertCmd = &cobra.Command{
 		c := caption.NewCation(
 			caption.WithFile(file),
 			caption.WithAudioTrackType(audioTrackType),
-			caption.WithIsAutoSynced(isAutoSynced, true),
-			caption.WithIsCC(isCC, true),
-			caption.WithIsDraft(isDraft, true),
-			caption.WithIsEasyReader(isEasyReader, true),
-			caption.WithIsLarge(isLarge, true),
+			caption.WithIsAutoSynced(isAutoSynced),
+			caption.WithIsCC(isCC),
+			caption.WithIsDraft(isDraft),
+			caption.WithIsEasyReader(isEasyReader),
+			caption.WithIsLarge(isLarge),
 			caption.WithLanguage(language),
 			caption.WithName(name),
 			caption.WithTrackKind(trackKind),
@@ -33,31 +33,47 @@ var insertCmd = &cobra.Command{
 func init() {
 	captionCmd.AddCommand(insertCmd)
 
-	insertCmd.Flags().StringVarP(&file, "file", "f", "", "Path to the caption file")
 	insertCmd.Flags().StringVarP(
-		&audioTrackType, "audioTrackType", "a", "unknown", "unknown, primary, commentary or descriptive",
+		&file, "file", "f", "", "Path to the caption file",
+	)
+	insertCmd.Flags().StringVarP(
+		&audioTrackType, "audioTrackType", "a", "unknown",
+		"unknown, primary, commentary or descriptive",
 	)
 	insertCmd.Flags().BoolVarP(
-		&isAutoSynced, "isAutoSynced", "A", true,
+		isAutoSynced, "isAutoSynced", "A", true,
 		"Whether YouTube synchronized the caption track to the audio track in the video",
 	)
 	insertCmd.Flags().BoolVarP(
-		&isCC, "isCC", "C", false,
+		isCC, "isCC", "C", false,
 		"Whether the track contains closed captions for the deaf and hard of hearing",
 	)
-	insertCmd.Flags().BoolVarP(&isDraft, "isDraft", "D", false, "whether the caption track is a draft")
 	insertCmd.Flags().BoolVarP(
-		&isEasyReader, "isEasyReader", "E", false, "Whether caption track is formatted for 'easy reader'",
+		isDraft, "isDraft", "D", false, "whether the caption track is a draft",
+	)
+	insertCmd.Flags().BoolVarP(
+		isEasyReader, "isEasyReader", "E", false,
+		"Whether caption track is formatted for 'easy reader'",
 	)
 	insertCmd.Flags().BoolVarP(
-		&isLarge, "isLarge", "L", false,
+		isLarge, "isLarge", "L", false,
 		"Whether the caption track uses large text for the vision-impaired",
 	)
-	insertCmd.Flags().StringVarP(&language, "language", "l", "", "Language of the caption track")
-	insertCmd.Flags().StringVarP(&name, "name", "n", "", "Name of the caption track")
-	insertCmd.Flags().StringVarP(&trackKind, "trackKind", "t", "standard", "standard, ASR or forced")
+	insertCmd.Flags().StringVarP(
+		&language, "language", "l", "", "Language of the caption track",
+	)
+	insertCmd.Flags().StringVarP(
+		&name, "name", "n", "", "Name of the caption track",
+	)
+	insertCmd.Flags().StringVarP(
+		&trackKind, "trackKind", "t", "standard", "standard, ASR or forced",
+	)
 	insertCmd.Flags().StringVarP(&videoId, "videoId", "v", "", "ID of the video")
 	insertCmd.Flags().StringVarP(&onBehalfOf, "onBehalfOf", "b", "", "")
-	insertCmd.Flags().StringVarP(&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "")
-	insertCmd.Flags().StringVarP(&output, "output", "o", "", "json, yaml or silent")
+	insertCmd.Flags().StringVarP(
+		&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "",
+	)
+	insertCmd.Flags().StringVarP(
+		&output, "output", "o", "", "json, yaml or silent",
+	)
 }

cmd/caption/list.go

@@ -27,7 +27,11 @@ func init() {
 	listCmd.Flags().StringVarP(&id, "id", "i", "", "ID of the caption")
 	listCmd.Flags().StringVarP(&videoId, "videoId", "v", "", "ID of the video")
 	listCmd.Flags().StringVarP(&onBehalfOf, "onBehalfOf", "b", "", "")
-	listCmd.Flags().StringVarP(&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "")
-	listCmd.Flags().StringArrayVarP(&parts, "parts", "p", []string{"id", "snippet"}, "Comma separated parts")
+	listCmd.Flags().StringVarP(
+		&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", "",
+	)
+	listCmd.Flags().StringArrayVarP(
+		&parts, "parts", "p", []string{"id", "snippet"}, "Comma separated parts",
+	)
 	listCmd.Flags().StringVarP(&output, "output", "o", "", "json or yaml")
 }