~sircmpwn/aerc

a93b4de6f3c362d6e0db0b1f6d3f2e1c9a5cd64d — Reto Brunner 1 year, 4 months ago 618a500
Add modify-labels command

This adds the event type as well as the command implementation, but no backend
supports it yet.
A commands/msg/modify-labels.go => commands/msg/modify-labels.go +69 -0
@@ 0,0 1,69 @@
package msg

import (
	"errors"
	"time"

	"git.sr.ht/~sircmpwn/aerc/widgets"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
	"github.com/gdamore/tcell"
)

type ModifyLabels struct{}

func init() {
	register(ModifyLabels{})
}

func (ModifyLabels) Aliases() []string {
	return []string{"modify-labels"}
}

func (ModifyLabels) Complete(aerc *widgets.Aerc, args []string) []string {
	return nil
}

func (ModifyLabels) Execute(aerc *widgets.Aerc, args []string) error {
	changes := args[1:]
	if len(changes) == 0 {
		return errors.New("Usage: modify-labels <[+-]label> ...")
	}

	widget := aerc.SelectedTab().(widgets.ProvidesMessage)
	acct := widget.SelectedAccount()
	if acct == nil {
		return errors.New("No account selected")
	}
	store := widget.Store()
	if store == nil {
		return errors.New("Cannot perform action. Messages still loading")
	}
	msg, err := widget.SelectedMessage()
	if err != nil {
		return err
	}
	var add, remove []string
	for _, l := range changes {
		switch l[0] {
		case '+':
			add = append(add, l[1:])
		case '-':
			remove = append(remove, l[1:])
		default:
			// if no operand is given assume add
			add = append(add, l)
		}
	}
	store.ModifyLabels([]uint32{msg.Uid}, add, remove, func(
		msg types.WorkerMessage) {

		switch msg := msg.(type) {
		case *types.Done:
			aerc.PushStatus("labels updated", 10*time.Second)
		case *types.Error:
			aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
				Color(tcell.ColorDefault, tcell.ColorRed)
		}
	})
	return nil
}

M doc/aerc.1.scd => doc/aerc.1.scd +8 -0
@@ 133,6 133,14 @@ message list, the message in the message viewer, etc).

	*-t*: Toggle the selected message between read and unread.

*modify-labels* <[+-]label>...
	Modify message labels (e.g. notmuch tags). Labels prefixed with a '+' are
	added, those prefixed with a '-' removed. As a convenience, labels without
	either operand add the specified label.

	Example: `modify-labels +inbox -spam unread` adds the labels inbox and unread
	and removes spam

*unsubscribe*
	Attempt to automatically unsubscribe the user from the mailing list through
	use of the List-Unsubscribe header. If supported, aerc may open a compose

M lib/msgstore.go => lib/msgstore.go +9 -0
@@ 425,3 425,12 @@ func (store *MessageStore) NextResult() {
func (store *MessageStore) PrevResult() {
	store.nextPrevResult(-1)
}

func (store *MessageStore) ModifyLabels(uids []uint32, add, remove []string,
	cb func(msg types.WorkerMessage)) {
	store.worker.PostAction(&types.ModifyLabels{
		Uids:   uids,
		Add:    add,
		Remove: remove,
	}, cb)
}

M widgets/spinner.go => widgets/spinner.go +3 -3
@@ 1,9 1,9 @@
package widgets

import (
	"strings"
	"sync/atomic"
	"time"
	"strings"

	"github.com/gdamore/tcell"



@@ 13,9 13,9 @@ import (

type Spinner struct {
	ui.Invalidatable
	frame int64 // access via atomic
	frame  int64 // access via atomic
	frames []string
	stop  chan struct{}
	stop   chan struct{}
}

func NewSpinner(uiConf *config.UIConfig) *Spinner {

M worker/types/messages.go => worker/types/messages.go +7 -0
@@ 175,3 175,10 @@ type MessagesDeleted struct {
	Message
	Uids []uint32
}

type ModifyLabels struct {
	Message
	Uids   []uint32
	Add    []string
	Remove []string
}