diff options
Diffstat (limited to 'worker/imap/open.go')
-rw-r--r-- | worker/imap/open.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/worker/imap/open.go b/worker/imap/open.go index ced307be..21953932 100644 --- a/worker/imap/open.go +++ b/worker/imap/open.go @@ -5,12 +5,11 @@ import ( sortthread "github.com/emersion/go-imap-sortthread" - "git.sr.ht/~rjarry/aerc/log" "git.sr.ht/~rjarry/aerc/worker/types" ) func (imapw *IMAPWorker) handleOpenDirectory(msg *types.OpenDirectory) { - log.Debugf("Opening %s", msg.Directory) + imapw.worker.Debugf("Opening %s", msg.Directory) sel, err := imapw.client.Select(msg.Directory, false) if err != nil { @@ -27,7 +26,7 @@ func (imapw *IMAPWorker) handleOpenDirectory(msg *types.OpenDirectory) { func (imapw *IMAPWorker) handleFetchDirectoryContents( msg *types.FetchDirectoryContents, ) { - log.Tracef("Fetching UID list") + imapw.worker.Tracef("Fetching UID list") searchCriteria, err := parseSearch(msg.FilterCriteria) if err != nil { @@ -52,9 +51,9 @@ func (imapw *IMAPWorker) handleFetchDirectoryContents( } else { if err != nil { // Non fatal, but we do want to print to get some debug info - log.Errorf("can't check for SORT support: %v", err) + imapw.worker.Errorf("can't check for SORT support: %v", err) } else if len(sortCriteria) > 0 { - log.Warnf("SORT is not supported but requested: list messages by UID") + imapw.worker.Warnf("SORT is not supported but requested: list messages by UID") } uids, err = imapw.client.UidSearch(searchCriteria) } @@ -64,7 +63,7 @@ func (imapw *IMAPWorker) handleFetchDirectoryContents( Error: err, }, nil) } else { - log.Tracef("Found %d UIDs", len(uids)) + imapw.worker.Tracef("Found %d UIDs", len(uids)) if len(msg.FilterCriteria) == 1 { // Only initialize if we are not filtering imapw.seqMap.Initialize(uids) @@ -105,7 +104,7 @@ func translateSortCriterions( func (imapw *IMAPWorker) handleDirectoryThreaded( msg *types.FetchDirectoryThreaded, ) { - log.Tracef("Fetching threaded UID list") + imapw.worker.Tracef("Fetching threaded UID list") searchCriteria, err := parseSearch(msg.FilterCriteria) if err != nil { @@ -125,7 +124,7 @@ func (imapw *IMAPWorker) handleDirectoryThreaded( } else { aercThreads, count := convertThreads(threads, nil) sort.Sort(types.ByUID(aercThreads)) - log.Tracef("Found %d threaded messages", count) + imapw.worker.Tracef("Found %d threaded messages", count) if len(msg.FilterCriteria) == 1 { // Only initialize if we are not filtering var uids []uint32 |