aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--commands/msg/modify-labels.go69
-rw-r--r--doc/aerc.1.scd8
-rw-r--r--lib/msgstore.go9
-rw-r--r--widgets/spinner.go6
-rw-r--r--worker/types/messages.go7
5 files changed, 96 insertions, 3 deletions
diff --git a/commands/msg/modify-labels.go b/commands/msg/modify-labels.go
new file mode 100644
index 0000000..f33a9ca
--- /dev/null
+++ b/commands/msg/modify-labels.go
@@ -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
+}
diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd
index c3be01b..2ec17a4 100644
--- a/doc/aerc.1.scd
+++ b/doc/aerc.1.scd
@@ -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
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 2733288..73c79e7 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -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)
+}
diff --git a/widgets/spinner.go b/widgets/spinner.go
index be95d39..51b8c1b 100644
--- a/widgets/spinner.go
+++ b/widgets/spinner.go
@@ -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 {
diff --git a/worker/types/messages.go b/worker/types/messages.go
index 7ab94e0..9f40b8f 100644
--- a/worker/types/messages.go
+++ b/worker/types/messages.go
@@ -175,3 +175,10 @@ type MessagesDeleted struct {
Message
Uids []uint32
}
+
+type ModifyLabels struct {
+ Message
+ Uids []uint32
+ Add []string
+ Remove []string
+}