blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

checkmail: error if check-mail-cmd is not set

Browse source 
Send error message to UI if check-mail-cmd is required but not set.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Tim Culverhouse 2022-07-29 13:30:01 -05:00 committed by Robin Jarry
parent c816103a24
commit 44651b43b3
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
worker/maildir/worker.go
View file

@ -708,6 +708,10 @@ func (w *Worker) msgInfoFromUid(uid uint32) (*models.MessageInfo, error) {
} }
func (w *Worker) handleCheckMail(msg *types.CheckMail) { func (w *Worker) handleCheckMail(msg *types.CheckMail) {
if msg.Command == "" {
w.err(msg, fmt.Errorf("checkmail: no command specified"))
return
}
ctx, cancel := context.WithTimeout(context.Background(), msg.Timeout) ctx, cancel := context.WithTimeout(context.Background(), msg.Timeout)
defer cancel() defer cancel()
cmd := exec.CommandContext(ctx, "sh", "-c", msg.Command) cmd := exec.CommandContext(ctx, "sh", "-c", msg.Command)

4
worker/notmuch/worker.go
View file

@ -647,6 +647,10 @@ func (w *worker) sort(uids []uint32,
} }
func (w *worker) handleCheckMail(msg *types.CheckMail) { func (w *worker) handleCheckMail(msg *types.CheckMail) {
if msg.Command == "" {
w.err(msg, fmt.Errorf("checkmail: no command specified"))
return
}
ctx, cancel := context.WithTimeout(context.Background(), msg.Timeout) ctx, cancel := context.WithTimeout(context.Background(), msg.Timeout)
defer cancel() defer cancel()
cmd := exec.CommandContext(ctx, "sh", "-c", msg.Command) cmd := exec.CommandContext(ctx, "sh", "-c", msg.Command)