#include "buffy.h"
#include "mailbox.h"
#include "mx.h"
+#include "sidebar.h"
#include "mutt_curses.h"
#include <stdio.h>
-static time_t BuffyTime = 0; /* last time we started checking for mail */
-time_t BuffyDoneTime = 0; /* last time we knew for sure how much mail there was. */
-static short BuffyCount = 0; /* how many boxes with new mail */
-static short BuffyNotify = 0; /* # of unnotified new boxes */
+static time_t BuffyTime = 0; /* last time we started checking for mail */
+#ifdef USE_IMAP
+static time_t ImapBuffyTime = 0; /* last time we started checking for mail */
+#endif
+static short BuffyCount = 0; /* how many boxes with new mail */
+static short BuffyNotify = 0; /* # of unnotified new boxes */
#ifdef BUFFY_SIZE
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;
DIR *dirp;
char path[_POSIX_PATH_MAX];
struct stat contex_sb;
- time_t t;
+ time_t now, last1, last2;
CONTEXT *ctx;
#ifdef USE_IMAP
/* update postponed count as well, on force */
/* fastest return if there are no mailboxes */
if (!Incoming)
return 0;
- t = time (NULL);
- if (!force && (t - BuffyTime < BuffyTimeout))
+ now = time (NULL);
+ if (!force && (now - BuffyTime < BuffyTimeout)
+#ifdef USE_IMAP
+ && (now - ImapBuffyTime < ImapBuffyTimeout))
+#else
+ )
+#endif
return BuffyCount;
-
- BuffyTime = t;
+
+ last1 = BuffyTime;
+ if (force || now - BuffyTime >= BuffyTimeout)
+ BuffyTime = now;
+#ifdef USE_IMAP
+ last2 = ImapBuffyTime;
+ if (force || now - ImapBuffyTime >= ImapBuffyTimeout)
+ ImapBuffyTime = now;
+#endif
BuffyCount = 0;
BuffyNotify = 0;
for (tmp = Incoming; tmp; tmp = tmp->next)
{
- if ( tmp->new == 1 )
- tmp->has_new = 1;
- tmp->new = 0;
-
#ifdef USE_IMAP
if (mx_is_imap (tmp->path))
tmp->magic = M_IMAP;
{
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;
- 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)
+ /* only check on force or $mail_check reached */
+ if (force || (now - last1 >= BuffyTimeout)) {
+ tmp->new = 0;
+ tmp->msg_unread = 0;
+ if (SidebarWidth == 0 || !option (OPTMBOXPANE)) {
+ if (STAT_CHECK) {
+ BuffyCount++;
+ tmp->new = tmp->has_new = 1;
+ }
+#ifdef BUFFY_SIZE
+ else
{
- msgcount = ctx->msgcount;
- msg_unread = ctx->unread;
- mx_close_mailbox(ctx, 0);
+ /* some other program has deleted mail from the folder */
+ tmp->size = (long) sb.st_size;
}
- *tmp = b;
- tmp->msgcount = msgcount;
+#endif
+ } else if (SidebarWidth > 0 && option (OPTMBOXPANE) &&
+ (STAT_CHECK || tmp->msgcount == 0)) {
+ /* sidebar visible */
+ int msg_count = 0, msg_new = 0, msg_unread = 0;
+ BuffyCount++;
+ if ((ctx = mx_open_mailbox (tmp->path, M_READONLY | M_QUIET | M_NOSORT, NULL)) != NULL) {
+ msg_count = ctx->msgcount;
+ msg_new = ctx->new;
+ msg_unread = ctx->unread;
+ mx_close_mailbox (ctx, 0);
+ }
+ tmp->msgcount = msg_count;
+ tmp->new = msg_new;
tmp->msg_unread = msg_unread;
- if(STAT_CHECK)
- tmp->has_new = tmp->new = 1;
- }
- else
- {
- /* sidebar invisible -> done */
- tmp->new = 1;
+ tmp->has_new = msg_new > 0;
}
- }
-#ifdef BUFFY_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;
- }
+ tmp->has_new = tmp->new > 0;
+ } else if (tmp->new > 0) {
+ /* keep current stats if !force and !$mail_check reached */
+ BuffyCount++;
+ tmp->has_new = 1;
+ }
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;
- 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)
- {
- BuffyCount++;
- tmp->has_new = tmp->new = 1;
- if (SidebarWidth == 0)
- {
- /* if sidebar invisible -> done */
- tmp->new = 1;
- break;
- }
- }
- tmp->msgcount++;
- tmp->msg_unread++;
- }
- }
- closedir (dirp);
-
- if (SidebarWidth > 0)
- {
- /* only count total mail if sidebar visible */
- snprintf (path, sizeof (path), "%s/cur", tmp->path);
+ /* only check on force or $mail_check reached */
+ if (force || (now - last1 >= BuffyTimeout)) {
+ snprintf (path, sizeof (path), "%s/new", tmp->path);
if ((dirp = opendir (path)) == NULL)
{
tmp->magic = 0;
break;
}
+ tmp->new = 0;
+ tmp->msg_unread = 0;
+ tmp->msgcount = 0;
while ((de = readdir (dirp)) != NULL)
{
char *p;
if (*de->d_name != '.' &&
(!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
{
- BuffyCount++;
+ /* one new and undeleted message is enough */
+ if (tmp->new == 0)
+ {
+ BuffyCount++;
+ tmp->has_new = tmp->new = 1;
+ if (SidebarWidth == 0 || !option (OPTMBOXPANE))
+ /* if sidebar invisible -> done */
+ break;
+ }
tmp->msgcount++;
+ tmp->msg_unread++;
+ tmp->new++;
}
}
closedir (dirp);
+ tmp->has_new = tmp->new > 0;
+
+ 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);
+ }
+ } else if (tmp->new > 0) {
+ /* keep current stats if !force and !$mail_check reached */
+ BuffyCount++;
+ tmp->has_new = 1;
}
break;
case M_MH:
- if ((tmp->new = mh_buffy (tmp->path)) > 0)
- BuffyCount++;
- if (SidebarWidth > 0)
- {
- DIR *dp;
- struct dirent *de;
- if ((dp = opendir (path)) == NULL)
- break;
- tmp->msgcount = 0;
- while ((de = readdir (dp)))
+ /* only check on force or $mail_check reached */
+ if (force || (now - last1 >= BuffyTimeout)) {
+ tmp->new = 0;
+ tmp->msg_unread = 0;
+ if ((tmp->new = mh_buffy (tmp->path)) > 0)
+ BuffyCount++;
+ if (SidebarWidth > 0 && option (OPTMBOXPANE))
{
- if (mh_valid_message (de->d_name))
+ DIR *dp;
+ struct dirent *de;
+ if ((dp = opendir (path)) == NULL)
+ break;
+ tmp->msgcount = 0;
+ while ((de = readdir (dp)))
{
- tmp->msgcount++;
- tmp->has_new = tmp->new = 1;
+ if (mh_valid_message (de->d_name))
+ {
+ tmp->msgcount++;
+ tmp->msg_unread++;
+ tmp->new++;
+ }
}
+ closedir (dp);
}
- closedir (dp);
+ tmp->has_new = tmp->new > 0;
+ } else if (tmp->new > 0) {
+ /* keep current stats if !force and !$mail_check reached */
+ BuffyCount++;
+ tmp->has_new = 1;
}
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) {
+ /* only check on force or $imap_mail_check reached */
+ if (force || (now - last2 >= ImapBuffyTimeout)) {
+ tmp->new = 0;
+ tmp->msg_unread = 0;
+ tmp->msgcount = imap_mailbox_check (tmp->path, 0);
+ if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) {
+ BuffyCount++;
+ tmp->has_new = tmp->new > 0;
+ tmp->msg_unread = tmp->new; /* for sidebar; wtf? */
+ }
+ else
+ tmp->new = 0;
+ } else if (tmp->new > 0) {
+ /* keep current stats if !force and !$imap_mail_check reached */
BuffyCount++;
+ tmp->has_new = 1;
}
- else
- tmp->new = 0;
break;
#endif
tmp->notified = 0;
else if (!tmp->notified)
BuffyNotify++;
+ tmp->has_new = tmp->new > 0;
}
-
- BuffyDoneTime = BuffyTime;
+ if (BuffyCount > 0)
+ draw_sidebar (CurrentMenu);
return (BuffyCount);
}
char buffylist[160];
int pos;
int first;
-
int have_unnotified = BuffyNotify;
-
+
+ if (option (OPTFORCEBUFFYCHECK))
+ mutt_buffy_check (1);
+
pos = 0;
first = 1;
buffylist[0] = 0;
}
if (!first)
{
+ /* on new mail: redraw sidebar */
+ draw_sidebar (CurrentMenu);
mutt_message ("%s", buffylist);
return (1);
}
projects / apps / madmutt.git / blobdiff