Changeset 5025:0cb476dc70a7

Timestamp:

2007-03-30 00:21:02 (22 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

default

Message:

Consult header cache if available for last known new mail count.
This prevents mutt from announcing new mail in mailboxes that have
unseen, but not new, messages, if those mailboxes are in the header
cache.

Files:

• imap/command.c (modified) (7 diffs)

imap/command.c

@@ -31 +31 @@
 #include "mx.h"
 #include "buffy.h"
+#if USE_HCACHE
+#include "hcache.h"
+#endif
 
 #include <ctype.h>
@@ -819 +822 @@
   IMAP_STATUS *status, sb;
   int olduv, oldun;
+#if USE_HCACHE
+  header_cache_t *hc = NULL;
+  unsigned int *uidvalidity = NULL;
+  unsigned int *uidnext = NULL;
+#endif
 
   mailbox = imap_next_word (s);
@@ -862 +870 @@
       s = imap_next_word (s);
   }
-  dprint (2, (debugfile, "%s (UIDVALIDITY: %d, UIDNEXT: %d) %d messages, %d recent, %d unseen\n",
+  dprint (3, (debugfile, "%s (UIDVALIDITY: %d, UIDNEXT: %d) %d messages, %d recent, %d unseen\n",
               status->name, status->uidvalidity, status->uidnext,
               status->messages, status->recent, status->unseen));
@@ -873 +881 @@
   }
 
-  dprint (2, (debugfile, "Running default STATUS handler\n"));
+  dprint (3, (debugfile, "Running default STATUS handler\n"));
 
   /* should perhaps move this code back to imap_buffy_check */
@@ -901 +909 @@
       if (value && !imap_mxcmp (mailbox, value))
       {
-        dprint (2, (debugfile, "Found %s in buffy list (OV: %d ON: %d U: %d)\n",
+        dprint (3, (debugfile, "Found %s in buffy list (OV: %d ON: %d U: %d)\n",
                     mailbox, olduv, oldun, status->unseen));
         
+#if USE_HCACHE
+        /* fetch seen info from hcache if we haven't seen it yet this session */
+        if (!olduv && !oldun)
+        {
+          hc = mutt_hcache_open (HeaderCache, inc->path);
+          if (hc)
+          {
+            uidvalidity = mutt_hcache_fetch_raw (hc, "/UIDVALIDITY", imap_hcache_keylen);
+            uidnext = mutt_hcache_fetch_raw (hc, "/UIDNEXT", imap_hcache_keylen);
+            olduv = uidvalidity ? *uidvalidity : 0;
+            oldun = uidnext ? *uidnext : 0;
+            FREE (&uidvalidity);
+            FREE (&uidnext);
+            mutt_hcache_close (hc);
+            dprint (3, (debugfile, "hcache olduv %d, oldun %d\n", olduv, oldun));
+          }
+        }
+#endif
         if (olduv && olduv == status->uidvalidity)
         {
@@ -909 +935 @@
           {
             inc->new = status->unseen;
+            /* forced back to keep detecting new mail until the mailbox is opened */
+            status->uidnext = oldun;
           }
         }
@@ -914 +942 @@
           inc->new = status->unseen;
 
-        /* forced back to keep detecting new mail until the mailbox is opened */
-        status->uidnext = oldun;
-
         FREE (&value);
         return;