#include "rfc1524.h"
#include "rfc2047.h"
#include "nntp.h"
+#include "sidebar.h"
+#include "buffy.h"
#include "mutt_crypt.h"
#include <ctype.h>
#include <stdlib.h>
+#define WANT_LISTGROUP_COMMAND 0
+
static unsigned int _checked = 0;
+void nntp_sync_sidebar (NNTP_DATA* data) {
+ int i = 0;
+ BUFFY* tmp = NULL;
+ char buf[STRING];
+
+ if (list_empty (Incoming))
+ return;
+
+ /* unfortunately, NNTP_DATA::group only is the plain
+ * group name, so for every single update, we need to
+ * compose the full string which must be defined via
+ * mailboxes command ;-((( FIXME
+ */
+ buf[0] = '\0';
+ snprintf (buf, sizeof (buf), "nntp%s://%s%s%s%s/%s",
+ (data->nserv->conn->account.flags & M_ACCT_SSL) ? "s" : "",
+ NONULL (data->nserv->conn->account.user),
+ *data->nserv->conn->account.pass ? ":" : "",
+ *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
+ data->nserv->conn->account.host,
+ data->group);
+
+ /* bail out if group not found via mailboxes */
+ if ((i = buffy_lookup (buf)) < 0)
+ return;
+
+ tmp = (BUFFY*) Incoming->data[i];
+ /* copied from browser.c */
+ if (option (OPTMARKOLD) &&
+ data->lastCached >= data->firstMessage &&
+ data->lastCached <= data->lastMessage)
+ tmp->msg_unread = data->lastMessage - data->lastCached;
+ else
+ tmp->msg_unread = data->unread;
+ tmp->new = data->unread > 0;
+ /* this is closest to a "total" count we can get */
+ tmp->msgcount = data->lastMessage - data->firstMessage;
+}
+
static void nntp_error (const char *where, const char *msg) {
debug_print (1, ("unexpected response in %s: %s\n", where, msg));
}
if (str_ncmp ("500", buf, 3))
serv->hasXPAT = 1;
+#if WANT_LISTGROUP_COMMAND
mutt_socket_write (conn, "LISTGROUP\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return (nntp_connect_error (serv));
if (str_ncmp ("500", buf, 3))
serv->hasLISTGROUP = 1;
+#endif
mutt_socket_write (conn, "XGTITLE +\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
* -3 - error in funct(*line, *data).
*/
static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
- int (*funct) (char *, void *), void *data,
- int tagged)
+ progress_t* bar, int (*funct) (char *, void *),
+ void *data, int tagged)
{
char buf[LONG_STRING];
char *inbuf, *p;
int done = FALSE;
int chunk, line;
+ long pos = 0;
size_t lenbuf = 0;
int ret;
}
strfcpy (inbuf + lenbuf, p, sizeof (buf));
+ pos += chunk;
if (chunk >= sizeof (buf)) {
lenbuf += str_len (p);
}
else {
- line++;
- if (msg && ReadInc && (line % ReadInc == 0)) {
- if (tagged)
- mutt_message (_("%s (tagged: %d) %d"), msg, tagged, line);
- else
- mutt_message ("%s %d", msg, line);
+ if (bar) {
+ mutt_progress_bar (bar, pos);
+ } else if (msg) {
+ line++;
+ if (ReadInc && (line % ReadInc == 0)) {
+ if (tagged)
+ mutt_message (_("%s (tagged: %d) %d"), msg, tagged, line);
+ else
+ mutt_message ("%s %d", msg, line);
+ }
}
if (ret == 0 && funct (inbuf, data) < 0)
if (colon) {
*colon = '\0';
colon++;
- nntp_get_status (ctx, h, p, atoi (colon));
+ nntp_get_status (ctx, h, b, atoi (colon));
if (h && h->article_num == 0 && str_cmp (group, b) == 0)
h->article_num = atoi (colon);
}
else
snprintf (buf, sizeof (buf), "HEAD %s\r\n", msgid);
- ret = mutt_nntp_fetch (nntp_data, buf, NULL, nntp_read_tempfile, f, 0);
+ ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_read_tempfile, f, 0);
if (ret) {
if (ret != -1)
debug_print (1, ("%s\n", buf));
#undef news
}
-static void nntp_get_desc (NNTP_DATA * data, char *mask, char *msg)
+static void nntp_get_desc (NNTP_DATA * data, char *mask, char *msg, progress_t* bar)
{
char buf[STRING];
snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
else
snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);
- if (mutt_nntp_fetch (data, buf, msg, parse_description, data->nserv, 0) !=
+ if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
0) {
#ifdef DEBUG
nntp_error ("nntp_get_desc()", buf);
break;
case 1:
hdr->env->subject = str_dup (b);
- /* Now we need to do the things which would normally be done in
- * mutt_read_rfc822_header() */
- if (hdr->env->subject) {
- regmatch_t pmatch[1];
-
- rfc2047_decode (&hdr->env->subject);
-
- if (regexec (ReplyRegexp.rx, hdr->env->subject, 1, pmatch, 0) == 0)
- hdr->env->real_subj = hdr->env->subject + pmatch[0].rm_eo;
- else
- hdr->env->real_subj = hdr->env->subject;
- }
break;
case 2:
rfc822_free_address (&hdr->env->from);
hdr->env->from = rfc822_parse_adrlist (hdr->env->from, b);
- rfc2047_decode_adrlist (hdr->env->from);
+ /* same as for mutt_parse_rfc822_line():
+ * don't leave from info NULL if there's an invalid address (or
+ * whatever) in From: field; mutt would just display it as empty
+ * and mark mail/(esp.) news article as your own. aaargh! this
+ * bothered me for _years_ */
+ if (!hdr->env->from) {
+ hdr->env->from = rfc822_new_address ();
+ hdr->env->from->personal = str_dup (b);
+ }
break;
case 3:
hdr->date_sent = mutt_parse_date (b, hdr);
hdr->env->xref = str_dup (b);
nntp_parse_xref (ctx, nntp_data->group, b, hdr);
}
+ rfc2047_decode_envelope (hdr->env);
if (!*p)
return -1;
b = p;
} FETCH_CONTEXT;
#define fc ((FETCH_CONTEXT *) c)
+
+#if WANT_LISTGROUP_COMMAND
static int _nntp_fetch_numbers (unsigned int num, void *c)
{
if (num < fc->base || num > fc->last)
return 0;
return (_nntp_fetch_numbers ((unsigned int) atoi (line), c));
}
+#endif
static int add_xover_line (char *line, void *c)
{
fc.base = first;
fc.last = last;
fc.messages = mem_calloc (last - first + 1, sizeof (unsigned short));
+#if WANT_LISTGROUP_COMMAND
if (nntp_data->nserv->hasLISTGROUP) {
snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group);
- if (mutt_nntp_fetch (nntp_data, buf, NULL, nntp_fetch_numbers, &fc, 0) !=
+ if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_fetch_numbers, &fc, 0) !=
0) {
mutt_error (_("LISTGROUP command failed: %s"), buf);
sleep (2);
}
}
else {
+#endif
for (num = 0; num < last - first + 1; num++)
fc.messages[num] = 1;
+#if WANT_LISTGROUP_COMMAND
}
+#endif
/* CACHE: must be loaded xover cache here */
num = nntp_data->lastCached - first + 1;
fc.last = last;
fc.msg = msg;
snprintf (buf, sizeof (buf), "XOVER %d-%d\r\n", first, last);
- ret = mutt_nntp_fetch (nntp_data, buf, NULL, add_xover_line, &fc, 0);
+ ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, add_xover_line, &fc, 0);
if (ctx->msgcount > oldmsgcount)
mx_update_context (ctx, ctx->msgcount - oldmsgcount);
if (ret != 0) {
unsigned int first;
ACCOUNT acct;
+ memset (&acct, 0, sizeof (ACCOUNT));
+
if (nntp_parse_url (ctx->path, &acct, buf, sizeof (buf)) < 0 || !*buf) {
mutt_error (_("%s is an invalid newsgroup specification!"), ctx->path);
mutt_sleep (2);
mutt_message (_("Selecting %s..."), nntp_data->group);
if (!nntp_data->desc) {
- nntp_get_desc (nntp_data, nntp_data->group, NULL);
+ nntp_get_desc (nntp_data, nntp_data->group, NULL, NULL);
if (nntp_data->desc)
nntp_save_cache_index (serv);
}
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
NNTP_CACHE *cache;
- char *m = _("Fetching message...");
int ret;
+ progress_t bar;
/* see if we already have the message in our cache */
cache =
/* clear the previous entry */
unlink (cache->path);
- free (cache->path);
-
- mutt_message (m);
+ mem_free (&cache->path);
cache->index = ctx->hdrs[msgno]->index;
mutt_mktemp (path);
snprintf (buf, sizeof (buf), "ARTICLE %d\r\n",
ctx->hdrs[msgno]->article_num);
- ret = mutt_nntp_fetch ((NNTP_DATA *) ctx->data, buf, m, nntp_read_tempfile,
+ bar.msg = _("Fetching message...");
+ bar.size = 0;
+ mutt_progress_bar (&bar, 0);
+
+ ret = mutt_nntp_fetch ((NNTP_DATA *) ctx->data, buf, NULL, &bar, nntp_read_tempfile,
msg->fp, ctx->tagged);
if (ret == 1) {
mutt_error (_("Article %d not found on server"),
ctx->hdrs[msgno]->env =
mutt_read_rfc822_header (msg->fp, ctx->hdrs[msgno], 0, 0);
/* fix content length */
- fseek (msg->fp, 0, SEEK_END);
- ctx->hdrs[msgno]->content->length = ftell (msg->fp) -
+ fseeko (msg->fp, 0, SEEK_END);
+ ctx->hdrs[msgno]->content->length = ftello (msg->fp) -
ctx->hdrs[msgno]->content->offset;
/* this is called in mutt before the open which fetches the message,
if ((tmp = hash_find (data->nserv->newsgroups, data->group)) == NULL
|| tmp != data)
nntp_delete_data (data);
+ else
+ nntp_sync_sidebar (data);
}
/* commit changes and terminate connection */
nntp_data->entries[0].first = 1;
nntp_data->entries[0].last = 0;
}
+ nntp_sync_sidebar (nntp_data);
}
time (&nntp_data->nserv->check_time);
if (l->data && ((NNTP_DATA *) l->data)->subscribed)
_nntp_check_mailbox (NULL, (NNTP_DATA *) l->data);
}
+ sidebar_draw (CurrentMenu);
}
else if (!force)
return 0;
else
nntp_data.group = NULL;
l = serv->tail;
- if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."),
+ if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."), NULL,
add_group, serv, 0) != 0) {
#ifdef DEBUG
nntp_error ("nntp_check_newgroups()", buf);
l = l->next;
((NNTP_DATA *) l->data)->new = 1;
nntp_get_desc ((NNTP_DATA *) l->data, ((NNTP_DATA *) l->data)->group,
- NULL);
+ NULL, NULL);
}
if (emp.next)
nntp_save_cache_index (serv);
nntp_data.nserv = serv;
nntp_data.group = NULL;
- if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, add_group, serv, 0) < 0) {
+ if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, NULL, add_group, serv, 0) < 0) {
#ifdef DEBUG
nntp_error ("nntp_get_active()", "LIST\r\n");
#endif
strfcpy (msg, _("Loading descriptions..."), sizeof (msg));
mutt_message (msg);
- nntp_get_desc (&nntp_data, "*", msg);
+ nntp_get_desc (&nntp_data, "*", msg, NULL);
for (tmp = serv->list; tmp; tmp = tmp->next) {
NNTP_DATA *data = (NNTP_DATA *) tmp->data;
cc.num = 0;
cc.max = 25;
cc.child = mem_malloc (sizeof (unsigned int) * 25);
- if (mutt_nntp_fetch (nntp_data, buf, NULL, check_children, &cc, 0)) {
+ if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, check_children, &cc, 0)) {
mem_free (&cc.child);
return -1;
}
projects / apps / madmutt.git / blobdiff