Skip to content

Commit 0df6b62

Browse files
committed
cli: Warn about upcoming --uid=true change
1 parent 2e14868 commit 0df6b62

File tree

1 file changed

+29
-5
lines changed

1 file changed

+29
-5
lines changed

internal/cli/ctl/imap.go

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,10 @@ func msgsRemove(be module.Storage, ctx *cli.Context) error {
600600
return cli.Exit("Error: SEQSET is required", 2)
601601
}
602602

603+
if !ctx.Bool("uid") {
604+
fmt.Fprintln(os.Stderr, "WARNING: --uid=true will be the default in 0.7")
605+
}
606+
603607
seq, err := imap.ParseSeqSet(seqset)
604608
if err != nil {
605609
return err
@@ -643,6 +647,10 @@ func msgsCopy(be module.Storage, ctx *cli.Context) error {
643647
return cli.Exit("Error: TGTMAILBOX is required", 2)
644648
}
645649

650+
if !ctx.Bool("uid") {
651+
fmt.Fprintln(os.Stderr, "WARNING: --uid=true will be the default in 0.7")
652+
}
653+
646654
seq, err := imap.ParseSeqSet(seqset)
647655
if err != nil {
648656
return err
@@ -679,6 +687,10 @@ func msgsMove(be module.Storage, ctx *cli.Context) error {
679687
return cli.Exit("Error: TGTMAILBOX is required", 2)
680688
}
681689

690+
if !ctx.Bool("uid") {
691+
fmt.Fprintln(os.Stderr, "WARNING: --uid=true will be the default in 0.7")
692+
}
693+
682694
seq, err := imap.ParseSeqSet(seqset)
683695
if err != nil {
684696
return err
@@ -709,8 +721,12 @@ func msgsList(be module.Storage, ctx *cli.Context) error {
709721
return cli.Exit("Error: MAILBOX is required", 2)
710722
}
711723
seqset := ctx.Args().Get(2)
724+
uid := ctx.Bool("uid")
712725
if seqset == "" {
713726
seqset = "1:*"
727+
uid = true
728+
} else if !uid {
729+
fmt.Fprintln(os.Stderr, "WARNING: --uid=true will be the default in 0.7")
714730
}
715731

716732
seq, err := imap.ParseSeqSet(seqset)
@@ -730,7 +746,7 @@ func msgsList(be module.Storage, ctx *cli.Context) error {
730746

731747
ch := make(chan *imap.Message, 10)
732748
go func() {
733-
err = mbox.ListMessages(ctx.Bool("uid"), seq, []imap.FetchItem{imap.FetchEnvelope, imap.FetchInternalDate, imap.FetchRFC822Size, imap.FetchFlags, imap.FetchUid}, ch)
749+
err = mbox.ListMessages(uid, seq, []imap.FetchItem{imap.FetchEnvelope, imap.FetchInternalDate, imap.FetchRFC822Size, imap.FetchFlags, imap.FetchUid}, ch)
734750
}()
735751

736752
for msg := range ch {
@@ -785,8 +801,12 @@ func msgsDump(be module.Storage, ctx *cli.Context) error {
785801
return cli.Exit("Error: MAILBOX is required", 2)
786802
}
787803
seqset := ctx.Args().Get(2)
804+
uid := ctx.Bool("uid")
788805
if seqset == "" {
789-
seqset = "*"
806+
seqset = "1:*"
807+
uid = true
808+
} else if !uid {
809+
fmt.Fprintln(os.Stderr, "WARNING: --uid=true will be the default in 0.7")
790810
}
791811

792812
seq, err := imap.ParseSeqSet(seqset)
@@ -806,7 +826,7 @@ func msgsDump(be module.Storage, ctx *cli.Context) error {
806826

807827
ch := make(chan *imap.Message, 10)
808828
go func() {
809-
err = mbox.ListMessages(ctx.Bool("uid"), seq, []imap.FetchItem{imap.FetchRFC822}, ch)
829+
err = mbox.ListMessages(uid, seq, []imap.FetchItem{imap.FetchRFC822}, ch)
810830
}()
811831

812832
for msg := range ch {
@@ -833,6 +853,10 @@ func msgsFlags(be module.Storage, ctx *cli.Context) error {
833853
return cli.Exit("Error: SEQ is required", 2)
834854
}
835855

856+
if !ctx.Bool("uid") {
857+
fmt.Fprintln(os.Stderr, "WARNING: --uid=true will be the default in 0.7")
858+
}
859+
836860
seq, err := imap.ParseSeqSet(seqStr)
837861
if err != nil {
838862
return err
@@ -843,7 +867,7 @@ func msgsFlags(be module.Storage, ctx *cli.Context) error {
843867
return err
844868
}
845869

846-
_, mbox, err := u.GetMailbox(name, true, nil)
870+
_, mbox, err := u.GetMailbox(name, false, nil)
847871
if err != nil {
848872
return err
849873
}
@@ -865,5 +889,5 @@ func msgsFlags(be module.Storage, ctx *cli.Context) error {
865889
panic("unknown command: " + ctx.Command.Name)
866890
}
867891

868-
return mbox.UpdateMessagesFlags(ctx.IsSet("uid"), seq, op, true, flags)
892+
return mbox.UpdateMessagesFlags(ctx.Bool("uid"), seq, op, true, flags)
869893
}

0 commit comments

Comments
 (0)