1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
|
diff --git a/app/account.go b/app/account.go
index b5bed86e27c03d4926cc3dbd95ad612ab8508e54..734ba37ad7ccd7c2827fbd116cab7d9f6c75fd4f 100644
--- a/app/account.go
+++ b/app/account.go
@@ -265,6 +265,15 @@ if err != nil {
msg := fmt.Sprintf("mail-deleted hook: %s", err)
PushError(msg)
}
+ }, func(dest string) {
+ err := hooks.RunHook(&hooks.MailAdded{
+ Account: acct.Name(),
+ Folder: dest,
+ })
+ if err != nil {
+ msg := fmt.Sprintf("mail-added hook: %s", err)
+ PushError(msg)
+ }
},
acct.updateSplitView,
acct.dirlist.UiConfig(name).ThreadContext,
diff --git a/commands/account/import-mbox.go b/commands/account/import-mbox.go
index 774dfa8f2c72026cb9f0bbe43130c9f7b15e277b..7aa393b6f42d67478cf4efe6607add8804fd94df 100644
--- a/commands/account/import-mbox.go
+++ b/commands/account/import-mbox.go
@@ -65,7 +65,6 @@ if err != nil {
app.PushError(err.Error())
return
}
- worker := acct.Worker()
var appended uint32
for i, m := range messages {
@@ -79,27 +78,28 @@ log.Errorf("could not get reader for uid %d", m.UID())
break
}
nbytes, _ := io.Copy(&buf, r)
- worker.PostAction(&types.AppendMessage{
- Destination: folder,
- Flags: models.SeenFlag,
- Date: time.Now(),
- Reader: &buf,
- Length: int(nbytes),
- }, func(msg types.WorkerMessage) {
- switch msg := msg.(type) {
- case *types.Unsupported:
- errMsg := fmt.Sprintf("%s: AppendMessage is unsupported", args[0])
- log.Errorf(errMsg)
- app.PushError(errMsg)
- return
- case *types.Error:
- log.Errorf("AppendMessage failed: %v", msg.Error)
- done <- false
- case *types.Done:
- atomic.AddUint32(&appended, 1)
- done <- true
- }
- })
+ store.Append(
+ folder,
+ models.SeenFlag,
+ time.Now(),
+ &buf,
+ int(nbytes),
+ func(msg types.WorkerMessage) {
+ switch msg := msg.(type) {
+ case *types.Unsupported:
+ errMsg := fmt.Sprintf("%s: AppendMessage is unsupported", args[0])
+ log.Errorf(errMsg)
+ app.PushError(errMsg)
+ return
+ case *types.Error:
+ log.Errorf("AppendMessage failed: %v", msg.Error)
+ done <- false
+ case *types.Done:
+ atomic.AddUint32(&appended, 1)
+ done <- true
+ }
+ },
+ )
select {
case ok := <-done:
diff --git a/commands/compose/postpone.go b/commands/compose/postpone.go
index 3ce9cc849ede1c8cb050044bede0f35b45c29887..098b703914e0032d1e767318fec53dae1a03870d 100644
--- a/commands/compose/postpone.go
+++ b/commands/compose/postpone.go
@@ -34,6 +34,10 @@ acct := app.SelectedAccount()
if acct == nil {
return errors.New("No account selected")
}
+ store := acct.Store()
+ if store == nil {
+ return errors.New("No message store selected")
+ }
tab := app.SelectedTab()
if tab == nil {
return errors.New("No tab selected")
@@ -98,22 +102,23 @@ if err != nil {
handleErr(errors.Wrap(err, "WriteMessage"))
return
}
- worker.PostAction(&types.AppendMessage{
- Destination: targetFolder,
- Flags: models.SeenFlag,
- Date: time.Now(),
- Reader: buf,
- Length: buf.Len(),
- }, func(msg types.WorkerMessage) {
- switch msg := msg.(type) {
- case *types.Done:
- app.PushStatus("Message postponed.", 10*time.Second)
- composer.SetPostponed()
- composer.Close()
- case *types.Error:
- handleErr(msg.Error)
- }
- })
+ store.Append(
+ targetFolder,
+ models.SeenFlag,
+ time.Now(),
+ buf,
+ buf.Len(),
+ func(msg types.WorkerMessage) {
+ switch msg := msg.(type) {
+ case *types.Done:
+ app.PushStatus("Message postponed.", 10*time.Second)
+ composer.SetPostponed()
+ composer.Close()
+ case *types.Error:
+ handleErr(msg.Error)
+ }
+ },
+ )
}()
if !alreadyCreated {
diff --git a/commands/compose/send.go b/commands/compose/send.go
index 1047ebade7c27ca0ed9e2d1627ff68babd44539b..91fd42bdff98d2f60fbab469f1b8a1a9f34579a6 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -228,8 +228,7 @@ return
}
if ctx.copyto != "" && ctx.scheme != "jmap" {
app.PushStatus("Copying to "+ctx.copyto, 10*time.Second)
- errch := copyToSent(composer.Worker(), ctx.copyto,
- copyBuf.Len(), ©Buf)
+ errch := copyToSent(ctx.copyto, copyBuf.Len(), ©Buf)
err = <-errch
if err != nil {
errmsg := fmt.Sprintf(
@@ -558,23 +557,32 @@
return writer, err
}
-func copyToSent(worker *types.Worker, dest string,
- n int, msg io.Reader,
-) <-chan error {
- errCh := make(chan error)
- worker.PostAction(&types.AppendMessage{
- Destination: dest,
- Flags: models.SeenFlag,
- Date: time.Now(),
- Reader: msg,
- Length: n,
- }, func(msg types.WorkerMessage) {
- switch msg := msg.(type) {
- case *types.Done:
- errCh <- nil
- case *types.Error:
- errCh <- msg.Error
- }
- })
+func copyToSent(dest string, n int, msg io.Reader) <-chan error {
+ errCh := make(chan error, 1)
+ acct := app.SelectedAccount()
+ if acct == nil {
+ errCh <- errors.New("No account selected")
+ return errCh
+ }
+ store := acct.Store()
+ if store == nil {
+ errCh <- errors.New("No message store selected")
+ return errCh
+ }
+ store.Append(
+ dest,
+ models.SeenFlag,
+ time.Now(),
+ msg,
+ n,
+ func(msg types.WorkerMessage) {
+ switch msg := msg.(type) {
+ case *types.Done:
+ errCh <- nil
+ case *types.Error:
+ errCh <- msg.Error
+ }
+ },
+ )
return errCh
}
diff --git a/config/aerc.conf b/config/aerc.conf
index cf9aafa249ff79c1ba0777169eaa2514f06fc6ac..d8142197cc9f984a31268027c3eb44bbc12ccca2 100644
--- a/config/aerc.conf
+++ b/config/aerc.conf
@@ -585,6 +585,10 @@ # Executed when mail is deleted from a folder
#mail-deleted=mbsync "$AERC_ACCOUNT:$AERC_FOLDER" &
#
+# Executed when aerc adds mail to a folder
+#mail-added=mbsync "$AERC_ACCOUNT:$AERC_FOLDER" &
+
+#
# Executed when aerc starts
#aerc-startup=aerc :terminal calcurse && aerc :next-tab
diff --git a/config/hooks.go b/config/hooks.go
index 7a6047c10ebb90f5cffb97b7404f7fd91dfe880c..b1b71a25b9489fe6a3c6ca14355bf227d8ecfa87 100644
--- a/config/hooks.go
+++ b/config/hooks.go
@@ -12,6 +12,7 @@ AercStartup string `ini:"aerc-startup"`
AercShutdown string `ini:"aerc-shutdown"`
MailReceived string `ini:"mail-received"`
MailDeleted string `ini:"mail-deleted"`
+ MailAdded string `ini:"mail-added"`
}
var Hooks HooksConfig
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 200c0609376bc0b81c04c0948db2782ec1ef2895..34bfb88258362dd2eb96bac48e8b34f4d546f947 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -971,6 +971,21 @@ Example:
*mail-deleted* = _mbsync "$AERC_ACCOUNT:$AERC_FOLDER"_
+*mail-added* = _<command>_
+ Executed when a message is added to a folder. Note that this hook is not
+ triggered when a new message is received (use *mail-received* for that) but
+ rather is only triggered when aerc itself adds a message to a folder, e.g.
+ when moving or copying a message.
+
+ Variables:
+
+ - *AERC_ACCOUNT*
+ - *AERC_FOLDER*
+
+ Example:
+
+ *mail-added* = _mbsync "$AERC_ACCOUNT:$AERC_FOLDER"_
+
*aerc-shutdown* = _<command>_
Executed when aerc shuts down. Aerc will wait for the command to finish
before exiting.
diff --git a/lib/hooks/mail-added.go b/lib/hooks/mail-added.go
new file mode 100644
index 0000000000000000000000000000000000000000..f146d01017d5aaf6724a57cd7a777a4f95d3eeea
--- /dev/null
+++ b/lib/hooks/mail-added.go
@@ -0,0 +1,23 @@
+package hooks
+
+import (
+ "fmt"
+
+ "git.sr.ht/~rjarry/aerc/config"
+)
+
+type MailAdded struct {
+ Account string
+ Folder string
+}
+
+func (m *MailAdded) Cmd() string {
+ return config.Hooks.MailAdded
+}
+
+func (m *MailAdded) Env() []string {
+ return []string{
+ fmt.Sprintf("AERC_ACCOUNT=%s", m.Account),
+ fmt.Sprintf("AERC_FOLDER=%s", m.Folder),
+ }
+}
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 9c6b750dc419c7f20488b2c813f172fa2fc15781..cb81abef25aa6a8dd7b9d36d91bb724a012b6bee 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -69,6 +69,7 @@
triggerNewEmail func(*models.MessageInfo)
triggerDirectoryChange func()
triggerMailDeleted func()
+ triggerMailAdded func(string)
threadBuilderDebounce *time.Timer
threadBuilderDelay time.Duration
@@ -89,7 +90,8 @@ thread bool, clientThreads bool, clientThreadsDelay time.Duration,
reverseOrder bool, reverseThreadOrder bool, sortThreadSiblings bool,
triggerNewEmail func(*models.MessageInfo),
triggerDirectoryChange func(), triggerMailDeleted func(),
- onSelect func(*models.MessageInfo), threadContext bool,
+ triggerMailAdded func(string), onSelect func(*models.MessageInfo),
+ threadContext bool,
) *MessageStore {
if !worker.Backend.Capabilities().Thread {
clientThreads = true
@@ -124,6 +126,7 @@
triggerNewEmail: triggerNewEmail,
triggerDirectoryChange: triggerDirectoryChange,
triggerMailDeleted: triggerMailDeleted,
+ triggerMailAdded: triggerMailAdded,
threadBuilderDelay: clientThreadsDelay,
@@ -608,7 +611,12 @@
store.worker.PostAction(&types.CopyMessages{
Destination: dest,
Uids: uids,
- }, cb)
+ }, func(msg types.WorkerMessage) {
+ if _, ok := msg.(*types.Done); ok {
+ store.triggerMailAdded(dest)
+ }
+ cb(msg)
+ })
}
func (store *MessageStore) Move(uids []uint32, dest string, createDest bool,
@@ -635,8 +643,26 @@ store.revertDeleted(uids)
cb(msg)
case *types.Done:
store.triggerMailDeleted()
+ store.triggerMailAdded(dest)
cb(msg)
}
+ })
+}
+
+func (store *MessageStore) Append(dest string, flags models.Flags, date time.Time,
+ reader io.Reader, length int, cb func(msg types.WorkerMessage),
+) {
+ store.worker.PostAction(&types.AppendMessage{
+ Destination: dest,
+ Flags: flags,
+ Date: date,
+ Reader: reader,
+ Length: length,
+ }, func(msg types.WorkerMessage) {
+ if _, ok := msg.(*types.Done); ok {
+ store.triggerMailAdded(dest)
+ }
+ cb(msg)
})
}
|