#include "buffy.h"
#include "mailbox.h"
#include "mx.h"
+#include "sidebar.h"
#include "mutt_curses.h"
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);
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)
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;
for (tmp = Incoming; tmp; tmp = tmp->next)
{
- if ( tmp->new == 1 )
- tmp->has_new = 1;
+ if ( tmp->new == 1 )
+ tmp->has_new = 1;
tmp->new = 0;
#ifdef USE_IMAP
else
#endif
if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
- (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
+ (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
{
/* if the mailbox still doesn't exist, set the newly created flag to
* be ready for when it does. */
/* check to see if the folder is the currently selected folder
* before polling */
if (!Context || !Context->path ||
- (
- (0
+ (
+ (0
#ifdef USE_IMAP
- || tmp->magic == M_IMAP
+ || tmp->magic == M_IMAP
#endif
#ifdef USE_POP
- || tmp->magic == M_POP
+ || tmp->magic == M_POP
#endif
#ifdef USE_NNTP
- || tmp->magic == M_NNTP
+ || tmp->magic == M_NNTP
#endif
- ) ? mutt_strcmp (tmp->path, Context->path) :
- (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino)
- )
+ ) ? mutt_strcmp (tmp->path, Context->path) :
+ (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino)
+ )
)
{
switch (tmp->magic)
case M_MBOX:
case M_MMDF:
- {
- if (STAT_CHECK || tmp->msgcount == 0)
- {
- BUFFY b = *tmp;
- int msgcount = 0;
- int msg_unread = 0;
- 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;
- }
+ if (SidebarWidth == 0 || !option (OPTMBOXPANE)) {
+ if (STAT_CHECK) {
+ BuffyCount++;
+ tmp->new = tmp->has_new = 1;
+ }
#ifdef BUFFY_SIZE
- else
- {
- /* some other program has deleted mail from the folder */
- tmp->size = (long) sb.st_size;
- }
+ else
+ {
+ /* some other program has deleted mail from the folder */
+ 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;
- }
- break;
+ } 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:
- snprintf (path, sizeof (path), "%s/new", tmp->path);
- if ((dirp = opendir (path)) == NULL)
- {
- tmp->magic = 0;
- break;
- }
- tmp->msgcount = 0;
- tmp->msg_unread = 0;
- tmp->msg_flagged = 0;
- while ((de = readdir (dirp)) != NULL)
- {
- char *p;
- if (*de->d_name != '.' &&
- (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
- {
- /* one new and undeleted message is enough */
- if (tmp->new != 1)
- {
+ snprintf (path, sizeof (path), "%s/new", tmp->path);
+ if ((dirp = opendir (path)) == NULL)
+ {
+ tmp->magic = 0;
+ break;
+ }
+ tmp->msgcount = 0;
+ tmp->msg_unread = 0;
+ tmp->new = 0;
+ while ((de = readdir (dirp)) != NULL)
+ {
+ char *p;
+ if (*de->d_name != '.' &&
+ (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
+ {
+ /* one new and undeleted message is enough */
+ if (tmp->new == 0)
+ {
BuffyCount++;
- tmp->has_new = tmp->new = 1;
- }
- tmp->msgcount++;
- tmp->msg_unread++;
- }
- }
- closedir (dirp);
-#if 1
- /* I commented this out because it led to an infite "New mail in ..." loop,
- * and when looking at the code, the check seems to be overly eager.
- * -- ak
- */
- snprintf (path, sizeof (path), "%s/cur", tmp->path);
- if ((dirp = opendir (path)) == NULL)
- {
- tmp->magic = 0;
- break;
- }
- while ((de = readdir (dirp)) != NULL)
- {
- char *p;
- if (*de->d_name != '.' &&
- (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
- {
- /* one new and undeleted message is enough */
- BuffyCount++;
-#if 0
- /* we're checking for read and not new mail;
- * seems like copy'n'paste error
- */
- tmp->has_new = tmp->new = 1;
-#endif
+ tmp->has_new = tmp->new = 1;
+ if (SidebarWidth == 0 || !option (OPTMBOXPANE))
+ /* if sidebar invisible -> done */
+ break;
+ }
tmp->msgcount++;
- }
- }
- closedir (dirp);
-#endif
- break;
+ tmp->msg_unread++;
+ tmp->new++;
+ }
+ }
+ closedir (dirp);
- case M_MH:
- {
- DIR *dp;
- struct dirent *de;
- if ((tmp->new = mh_buffy (tmp->path)) > 0)
- BuffyCount++;
-
- if ((dp = opendir (path)) == NULL)
+ if (SidebarWidth > 0 && option (OPTMBOXPANE))
+ {
+ /* only count total mail if sidebar visible */
+ snprintf (path, sizeof (path), "%s/cur", tmp->path);
+ if ((dirp = opendir (path)) == NULL)
+ {
+ tmp->magic = 0;
+ break;
+ }
+ while ((de = readdir (dirp)) != NULL)
+ {
+ char *p;
+ if (*de->d_name != '.' &&
+ (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
+ {
+ tmp->msgcount++;
+ }
+ }
+ closedir (dirp);
+ }
break;
- tmp->msgcount = 0;
- while ((de = readdir (dp)))
- {
- if (mh_valid_message (de->d_name))
+
+ case M_MH:
+ if ((tmp->new = mh_buffy (tmp->path)) > 0)
+ BuffyCount++;
+ if (SidebarWidth > 0 && option (OPTMBOXPANE))
{
- tmp->msgcount++;
- tmp->has_new = tmp->new = 1;
+ DIR *dp;
+ struct dirent *de;
+ if ((dp = opendir (path)) == NULL)
+ break;
+ tmp->msgcount = 0;
+ while ((de = readdir (dp)))
+ {
+ if (mh_valid_message (de->d_name))
+ {
+ tmp->msgcount++;
+ tmp->has_new = tmp->new = 1;
+ }
+ }
+ closedir (dp);
}
- }
- closedir (dp);
- }
- break;
-
+ break;
+
#ifdef USE_IMAP
case M_IMAP:
- tmp->msgcount = imap_mailbox_check(tmp->path, 0);
- if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) {
- BuffyCount++;
- }
- else
- tmp->new = 0;
-
- break;
+ tmp->msgcount = imap_mailbox_check(tmp->path, 0);
+ if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) {
+ BuffyCount++;
+ }
+ else
+ tmp->new = 0;
+ break;
#endif
#ifdef USE_POP
case M_POP:
- break;
+ break;
#endif
#ifdef USE_NNTP
case M_NNTP:
- break;
+ break;
#endif
}
}
}
if (!first)
{
+ /* on new mail: redraw sidebar */
+ draw_sidebar (CurrentMenu);
mutt_message ("%s", buffylist);
return (1);
}
projects / apps / madmutt.git / blobdiff