Rocco Rutte:

[apps/madmutt.git] / buffy.c

diff --git a/buffy.c b/buffy.c
index a90b0a8..a7e7ca5 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -24,6 +24,7 @@
 #include "buffy.h"
 #include "mailbox.h"
 #include "mx.h"
+#include "sidebar.h"
 
 #include "mutt_curses.h"
 
@@ -171,12 +172,25 @@ void mutt_update_mailbox (BUFFY * b)
 
 int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *err)
 {
-  BUFFY **tmp,*tmp1;
+  BUFFY **tmp,*tmp1,*last;
   char buf[_POSIX_PATH_MAX];
+  int dup = 0;
 #ifdef BUFFY_SIZE
   struct stat sb;
 #endif /* BUFFY_SIZE */
 
+  /*
+   * FIXME
+   * to get rid of correcting the ->prev pointers in sidebar.c,
+   * correct them right here
+   */
+
+  /*
+   * FIXME
+   * if we really want to make the sort order of the sidebar
+   * configurable, this has to go right here
+   */
+  
   while (MoreArgs (s))
   {
     mutt_extract_token (path, s, 0);
@@ -200,12 +214,19 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
     if(!*buf) continue;
 
     /* simple check to avoid duplicates */
-    for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
+    dup = 0;
+    for (tmp = &Incoming; *tmp && dup == 0; tmp = &((*tmp)->next))
     {
-      if (mutt_strcmp (buf, (*tmp)->path) == 0)
-       break;
+      if (mutt_strcmp (buf, (*tmp)->path) == 0) {
+        dup = 1;
+        break;
+      }
     }
 
+    if (dup == 1)
+      continue;
+    tmp = &Incoming;
+
     if(data == M_UNMAILBOXES)
     {
       if(*tmp)
@@ -218,16 +239,32 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
       continue;
     }
 
-    if (!*tmp)
-    {
-      *tmp = (BUFFY *) safe_calloc (1, sizeof (BUFFY));
-      (*tmp)->path = safe_strdup (buf);
-      (*tmp)->next = NULL;
-      /* it is tempting to set magic right here */
-      (*tmp)->magic = 0;
-      
+    /* loop over list while it's sorted */
+    tmp1 = NULL;
+    last = NULL;
+    for (tmp = &Incoming; *tmp ; tmp = &((*tmp)->next)) {
+      /*
+       * FIXME
+       * change this to get whatever sorting order
+       */
+      if (mutt_strcmp (buf, (*tmp)->path) < 0) {
+        tmp1 = (*tmp);
+        break;
+      }
+      last = (*tmp);
     }
 
+    /* we want: last -> tmp -> tmp1 */
+    *tmp = (BUFFY *) safe_calloc (1, sizeof (BUFFY));
+    (*tmp)->path = safe_strdup (buf);
+    (*tmp)->magic = 0;
+
+    /* correct pointers */
+    (*tmp)->next = tmp1;
+    if (last)
+      last->next = (*tmp);
+
+    /* left as-is */
     (*tmp)->new = 0;
     (*tmp)->notified = 1;
     (*tmp)->newly_created = 0;
@@ -359,38 +396,11 @@ int mutt_buffy_check (int force)
       case M_MBOX:
       case M_MMDF:
 
-    {
-        if (STAT_CHECK || tmp->msgcount == 0)
-        {
-          BuffyCount++;
-          /* only do complete count if sidebar visible */
-          if (SidebarWidth > 0)
-          {
-            BUFFY b = *tmp;
-            int msgcount = 0;
-            int msg_unread = 0;
+        if (SidebarWidth == 0 || !option (OPTMBOXPANE)) {
+          if (STAT_CHECK) {
             BuffyCount++;
-            /* parse the mailbox, to see how much mail there is */
-            ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT,
-              NULL);
-            if(ctx)
-            {
-                msgcount = ctx->msgcount;
-                msg_unread = ctx->unread;
-                mx_close_mailbox(ctx, 0);
-            }
-            *tmp = b;
-            tmp->msgcount = msgcount;
-            tmp->msg_unread = msg_unread;
-            if(STAT_CHECK)
-                tmp->has_new = tmp->new = 1;
+            tmp->new = tmp->has_new = 1;
           }
-          else
-          {
-            /* sidebar invisible -> done */
-            tmp->new = 1;
-          }
-        }
 #ifdef BUFFY_SIZE
           else
           {
@@ -398,10 +408,25 @@ int mutt_buffy_check (int force)
             tmp->size = (long) sb.st_size;
           }
 #endif
-          if (tmp->newly_created &&
-              (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
-            tmp->newly_created = 0;
+        } else if (SidebarWidth > 0 && option (OPTMBOXPANE) && 
+                   (STAT_CHECK || tmp->msgcount == 0)) {
+          /* sidebar visible */
+          int msg_count = 0, msg_unread = 0, msg_new = 0;
+          BuffyCount++;
+          if ((ctx = mx_open_mailbox (tmp->path, M_READONLY | M_QUIET | M_NOSORT, NULL)) != NULL) {
+            msg_count = ctx->msgcount;
+            msg_unread = ctx->unread;
+            msg_new = ctx->new;
+            mx_close_mailbox (ctx, 0);
           }
+          tmp->msgcount = msg_count;
+          tmp->msg_unread = msg_unread;
+          tmp->new = msg_new;
+          tmp->has_new = msg_new > 0;
+        }
+        if (tmp->newly_created &&
+            (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
+          tmp->newly_created = 0;
         break;
 
       case M_MAILDIR:
@@ -414,6 +439,7 @@ int mutt_buffy_check (int force)
         }
         tmp->msgcount = 0;
         tmp->msg_unread = 0;
+        tmp->new = 0;
         while ((de = readdir (dirp)) != NULL)
         {
           char *p;
@@ -421,24 +447,22 @@ int mutt_buffy_check (int force)
               (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
           {
             /* one new and undeleted message is enough */
-            if (tmp->new != 1)
+            if (tmp->new == 0)
             {
                BuffyCount++;
                tmp->has_new = tmp->new = 1;
-               if (SidebarWidth == 0)
-               {
+               if (SidebarWidth == 0 || !option (OPTMBOXPANE))
                  /* if sidebar invisible -> done */
-                 tmp->new = 1;
                  break;
-               }
             }
             tmp->msgcount++;
             tmp->msg_unread++;
+            tmp->new++;
           }
         }
         closedir (dirp);
 
-        if (SidebarWidth > 0)
+        if (SidebarWidth > 0 && option (OPTMBOXPANE))
         {
           /* only count total mail if sidebar visible */
           snprintf (path, sizeof (path), "%s/cur", tmp->path);
@@ -453,7 +477,6 @@ int mutt_buffy_check (int force)
             if (*de->d_name != '.' && 
                 (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
             {
-              BuffyCount++;
               tmp->msgcount++;
             }
           }
@@ -464,7 +487,7 @@ int mutt_buffy_check (int force)
       case M_MH:
         if ((tmp->new = mh_buffy (tmp->path)) > 0)
           BuffyCount++;
-        if (SidebarWidth > 0)
+        if (SidebarWidth > 0 && option (OPTMBOXPANE))
         {
           DIR *dp;
           struct dirent *de;
@@ -565,6 +588,8 @@ int mutt_buffy_list (void)
   }
   if (!first)
   {
+    /* on new mail: redraw sidebar */
+    draw_sidebar (CurrentMenu);
     mutt_message ("%s", buffylist);
     return (1);
   }