items create, items update の --file, --write フラグを廃止

Author: koki-develop

cmd/qiita/flags.go

@@ -65,18 +65,6 @@ var (
 
 // items create
 var (
-	// --file
-	flagItemsCreateFile = &flags.String{Flag: &flags.Flag{
-		Name:        "file",
-		Description: "create an item from a file",
-	}}
-
-	// --write
-	flagItemsCreateWrite = &flags.Bool{Flag: &flags.Flag{
-		Name:        "write",
-		Description: "write information about the created item to a file",
-	}}
-
 	// --title
 	flagItemsCreateTitle = &flags.String{Flag: &flags.Flag{
 		Name:        "title",
@@ -110,18 +98,6 @@ var (
 
 // items update
 var (
-	// --file
-	flagItemsUpdateFile = &flags.String{Flag: &flags.Flag{
-		Name:        "file",
-		Description: "update an item from a file",
-	}}
-
-	// --write
-	flagItemsUpdateWrite = &flags.Bool{Flag: &flags.Flag{
-		Name:        "write",
-		Description: "write information about the updated item to a file",
-	}}
-
 	// --title
 	flagItemsUpdateTitle = &flags.String{Flag: &flags.Flag{
 		Name:        "title",

cmd/qiita/items.go

@@ -90,8 +90,6 @@ var itemsCreateCmd = &cobra.Command{
 		}
 
 		if err := c.ItemsCreate(&cli.ItemsCreateParameters{
-			FlagFile:    flagItemsCreateFile,    // --file
-			FlagWrite:   flagItemsCreateWrite,   // --write
 			FlagTitle:   flagItemsCreateTitle,   // --title
 			FlagBody:    flagItemsCreateBody,    // --body
 			FlagTags:    flagItemsCreateTags,    // --tags
@@ -118,8 +116,6 @@ var itemsUpdateCmd = &cobra.Command{
 
 		if err := c.ItemsUpdate(&cli.ItemsUpdateParameters{
 			Args:        args,
-			FlagFile:    flagItemsUpdateFile,    // --file
-			FlagWrite:   flagItemsUpdateWrite,   // --write
 			FlagTitle:   flagItemsUpdateTitle,   // --title
 			FlagTags:    flagItemsUpdateTags,    // --tags
 			FlagBody:    flagItemsUpdateBody,    // --body

cmd/qiita/root.go

@@ -97,8 +97,6 @@ func init() {
 	flags.Flags{
 		flagFormat,             // --format
 		flagItemsColumns,       // --columns
-		flagItemsCreateFile,    // --file
-		flagItemsCreateWrite,   // --write
 		flagItemsCreateTitle,   // --title
 		flagItemsCreateTags,    // --tags
 		flagItemsCreateBody,    // --body
@@ -110,8 +108,6 @@ func init() {
 	flags.Flags{
 		flagFormat,             // --format
 		flagItemsColumns,       // --columns
-		flagItemsUpdateFile,    // --file
-		flagItemsUpdateWrite,   // --write
 		flagItemsUpdateTitle,   // --title
 		flagItemsUpdateTags,    // --tags
 		flagItemsUpdateBody,    // --body

internal/cli/items.go

@@ -79,8 +79,6 @@ func (c *CLI) ItemsGet(params *ItemsGetParameters) error {
 }
 
 type ItemsCreateParameters struct {
-	FlagFile    *flags.String      // --file
-	FlagWrite   *flags.Bool        // --write
 	FlagTitle   *flags.String      // --title
 	FlagTags    *flags.StringSlice // --tags
 	FlagBody    *flags.String      // --body
@@ -90,54 +88,21 @@ type ItemsCreateParameters struct {
 
 // $ qiita items create
 func (c *CLI) ItemsCreate(params *ItemsCreateParameters) error {
-	if params.FlagWrite.Changed(c.command) && !params.FlagFile.Changed(c.command) {
-		return ErrWriteWithoutFile
-	}
-	file := params.FlagFile.Get(c.command, false)
-
-	p := &qiita.CreateItemParameters{}
-
-	if file != nil {
-		md, fm, err := c.readMarkdown(*file)
-		if err != nil {
-			return err
-		}
-		if fm.ID != nil {
-			return ErrCreateWithID
-		}
-		p.Title = fm.Title
-		p.Tags = fm.QiitaTags()
-		p.Body = &md
-		p.Private = fm.Private
-	}
-
-	if params.FlagTitle.Changed(c.command) {
-		p.Title = params.FlagTitle.Get(c.command, true)
+	p := &qiita.CreateItemParameters{
+		Title:   params.FlagTitle.Get(c.command, false),
+		Body:    params.FlagBody.Get(c.command, false),
+		Private: params.FlagPrivate.Get(c.command, false),
+		Tweet:   params.FlagTweet.Get(c.command, false),
 	}
 	if params.FlagTags.Changed(c.command) {
 		p.Tags = util.Ptr(qiita.TagsFromStrings(*params.FlagTags.Get(c.command, true)))
 	}
-	if params.FlagBody.Changed(c.command) {
-		p.Body = params.FlagBody.Get(c.command, true)
-	}
-	if params.FlagPrivate.Changed(c.command) {
-		p.Private = params.FlagPrivate.Get(c.command, true)
-	}
-	if params.FlagTweet.Changed(c.command) {
-		p.Tweet = params.FlagTweet.Get(c.command, true)
-	}
 
 	item, err := c.client.CreateItem(p)
 	if err != nil {
 		return err
 	}
 
-	if *params.FlagWrite.Get(c.command, true) {
-		if err := c.writeMarkdown(*file, item); err != nil {
-			return err
-		}
-	}
-
 	if err := c.printer.Print(c.writer, item); err != nil {
 		return err
 	}
@@ -147,68 +112,28 @@ func (c *CLI) ItemsCreate(params *ItemsCreateParameters) error {
 
 type ItemsUpdateParameters struct {
 	Args        []string
-	FlagFile    *flags.String      // --file
-	FlagWrite   *flags.Bool        // --write
 	FlagTitle   *flags.String      // --title
 	FlagTags    *flags.StringSlice // --tags
 	FlagBody    *flags.String      // --body
 	FlagPrivate *flags.Bool        // --private
 }
 
 func (c *CLI) ItemsUpdate(params *ItemsUpdateParameters) error {
-	if params.FlagWrite.Changed(c.command) && !params.FlagFile.Changed(c.command) {
-		return ErrWriteWithoutFile
-	}
-	file := params.FlagFile.Get(c.command, false)
-
-	var id string
-	p := &qiita.UpdateItemParameters{}
-
-	if file != nil {
-		md, fm, err := c.readMarkdown(*file)
-		if err != nil {
-			return err
-		}
-		if fm.ID != nil {
-			id = *fm.ID
-		}
-		p.Title = fm.Title
-		p.Tags = fm.QiitaTags()
-		p.Body = &md
-		p.Private = fm.Private
-	}
-
-	if len(params.Args) > 0 {
-		id = params.Args[0]
-	}
-	if id == "" {
-		return ErrIDRequired
-	}
-
-	if params.FlagTitle.Changed(c.command) {
-		p.Title = params.FlagTitle.Get(c.command, true)
+	id := params.Args[0]
+	p := &qiita.UpdateItemParameters{
+		Title:   params.FlagTitle.Get(c.command, false),
+		Body:    params.FlagBody.Get(c.command, false),
+		Private: params.FlagPrivate.Get(c.command, false),
 	}
 	if params.FlagTags.Changed(c.command) {
 		p.Tags = util.Ptr(qiita.TagsFromStrings(*params.FlagTags.Get(c.command, true)))
 	}
-	if params.FlagBody.Changed(c.command) {
-		p.Body = params.FlagBody.Get(c.command, true)
-	}
-	if params.FlagPrivate.Changed(c.command) {
-		p.Private = params.FlagPrivate.Get(c.command, true)
-	}
 
 	item, err := c.client.UpdateItem(id, p)
 	if err != nil {
 		return err
 	}
 
-	if *params.FlagWrite.Get(c.command, true) {
-		if err := c.writeMarkdown(*file, item); err != nil {
-			return err
-		}
-	}
-
 	if err := c.printer.Print(c.writer, item); err != nil {
 		return err
 	}