diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-05-15 19:41:21 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-05-15 19:41:21 -0400 |
commit | b0bf09b98fc038c1bc9921d568c06260b7448a15 (patch) | |
tree | acad72b3ec224d95c551a11ba35cf4e8522641e1 /worker/types | |
parent | 52b318127fe7ec001ca824947193b2cb7b0ebda6 (diff) | |
download | aerc-b0bf09b98fc038c1bc9921d568c06260b7448a15.tar.gz |
Copy sent emails to the Sent folder
Or rather, to a user-specified folder
Diffstat (limited to 'worker/types')
-rw-r--r-- | worker/types/messages.go | 20 | ||||
-rw-r--r-- | worker/types/worker.go | 16 |
2 files changed, 32 insertions, 4 deletions
diff --git a/worker/types/messages.go b/worker/types/messages.go index e97ae025..8687b5ed 100644 --- a/worker/types/messages.go +++ b/worker/types/messages.go @@ -12,10 +12,13 @@ import ( type WorkerMessage interface { InResponseTo() WorkerMessage + getId() int + setId(id int) } type Message struct { inResponseTo WorkerMessage + id int } func RespondTo(msg WorkerMessage) Message { @@ -28,6 +31,14 @@ func (m Message) InResponseTo() WorkerMessage { return m.inResponseTo } +func (m Message) getId() int { + return m.id +} + +func (m Message) setId(id int) { + m.id = id +} + // Meta-messages type Done struct { @@ -103,6 +114,15 @@ type CopyMessages struct { Uids imap.SeqSet } +type AppendMessage struct { + Message + Destination string + Flags []string + Date time.Time + Reader io.Reader + Length int +} + // Messages type CertificateApprovalRequest struct { diff --git a/worker/types/worker.go b/worker/types/worker.go index 0ed216a2..e2af61fb 100644 --- a/worker/types/worker.go +++ b/worker/types/worker.go @@ -5,6 +5,8 @@ import ( "sync" ) +var nextId int = 1 + type Backend interface { Run() } @@ -15,7 +17,7 @@ type Worker struct { Messages chan WorkerMessage Logger *log.Logger - callbacks map[WorkerMessage]func(msg WorkerMessage) // protected by mutex + callbacks map[int]func(msg WorkerMessage) // protected by mutex mutex sync.Mutex } @@ -24,16 +26,19 @@ func NewWorker(logger *log.Logger) *Worker { Actions: make(chan WorkerMessage, 50), Messages: make(chan WorkerMessage, 50), Logger: logger, - callbacks: make(map[WorkerMessage]func(msg WorkerMessage)), + callbacks: make(map[int]func(msg WorkerMessage)), } } func (worker *Worker) setCallback(msg WorkerMessage, cb func(msg WorkerMessage)) { + msg.setId(nextId) + nextId++ + if cb != nil { worker.mutex.Lock() - worker.callbacks[msg] = cb + worker.callbacks[msg.getId()] = cb worker.mutex.Unlock() } } @@ -41,8 +46,11 @@ func (worker *Worker) setCallback(msg WorkerMessage, func (worker *Worker) getCallback(msg WorkerMessage) (func(msg WorkerMessage), bool) { + if msg == nil { + return nil, false + } worker.mutex.Lock() - cb, ok := worker.callbacks[msg] + cb, ok := worker.callbacks[msg.getId()] worker.mutex.Unlock() return cb, ok |