#include "prefs_account.h"
#include "inputdialog.h"
#include "alertpanel.h"
+#include "log.h"
+#include "progressindicator.h"
+#if USE_OPENSSL
+# include "ssl.h"
+#endif
#define NNTP_PORT 119
+#if USE_OPENSSL
+#define NNTPS_PORT 563
+#endif
static void news_folder_init (Folder *folder,
const gchar *name,
const gchar *path);
+#if USE_OPENSSL
+static Session *news_session_new (const gchar *server,
+ gushort port,
+ const gchar *userid,
+ const gchar *passwd,
+ SSLType ssl_type);
+#else
static Session *news_session_new (const gchar *server,
gushort port,
const gchar *userid,
const gchar *passwd);
+#endif
static gint news_get_article_cmd (NNTPSession *session,
const gchar *cmd,
static gint news_get_article (NNTPSession *session,
gint num,
gchar *filename);
-static gint news_get_header (NNTPSession *session,
- gint num,
- gchar *filename);
static gint news_select_group (NNTPSession *session,
const gchar *group,
gint *num,
gint *first,
gint *last);
-static GSList *news_get_uncached_articles(NNTPSession *session,
- FolderItem *item,
- gint cache_last,
- gint *rfirst,
- gint *rlast);
static MsgInfo *news_parse_xover (const gchar *xover_str);
static gchar *news_parse_xhdr (const gchar *xhdr_str,
MsgInfo *msginfo);
-static GSList *news_delete_old_articles (GSList *alist,
- FolderItem *item,
- gint first);
-static void news_delete_all_articles (FolderItem *item);
-
static gint news_remove_msg (Folder *folder,
FolderItem *item,
gint num);
+gint news_get_num_list (Folder *folder,
+ FolderItem *item,
+ GSList **list);
+MsgInfo *news_get_msginfo (Folder *folder,
+ FolderItem *item,
+ gint num);
+GSList *news_get_msginfos (Folder *folder,
+ FolderItem *item,
+ GSList *msgnum_list);
+
+gint news_post_stream (Folder *folder,
+ FILE *fp);
Folder *news_folder_new(const gchar *name, const gchar *path)
{
return folder;
}
-void news_folder_destroy(NewsFolder *folder)
+void news_folder_destroy(Folder *folder)
{
+ gchar *dir;
+
+ dir = folder_get_path(folder);
+ if (is_dir_exist(dir))
+ remove_dir_recursive(dir);
+ g_free(dir);
+
folder_remote_folder_destroy(REMOTE_FOLDER(folder));
}
static void news_folder_init(Folder *folder, const gchar *name,
const gchar *path)
{
- folder_remote_folder_init(folder, name, path);
-
folder->type = F_NEWS;
+ folder_remote_folder_init(folder, name, path);
+
+/*
folder->get_msg_list = news_get_article_list;
+*/
folder->fetch_msg = news_fetch_msg;
+/*
folder->scan = news_scan_group;
+*/
+ folder->destroy = news_folder_destroy;
folder->remove_msg = news_remove_msg;
+ folder->get_num_list = news_get_num_list;
+ folder->get_msginfo = news_get_msginfo;
+ folder->get_msginfos = news_get_msginfos;
}
+#if USE_OPENSSL
+static Session *news_session_new(const gchar *server, gushort port,
+ const gchar *userid, const gchar *passwd,
+ SSLType ssl_type)
+#else
static Session *news_session_new(const gchar *server, gushort port,
const gchar *userid, const gchar *passwd)
+#endif
{
gchar buf[NNTPBUFSIZE];
NNTPSession *session;
log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
+#if USE_OPENSSL
+ if (userid && passwd)
+ nntp_sock = nntp_open_auth(server, port, buf, userid, passwd,
+ ssl_type);
+ else
+ nntp_sock = nntp_open(server, port, buf, ssl_type);
+#else
if (userid && passwd)
nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
else
nntp_sock = nntp_open(server, port, buf);
+#endif
+
if (nntp_sock == NULL)
return NULL;
SESSION(session)->phase = SESSION_READY;
SESSION(session)->last_access_time = time(NULL);
SESSION(session)->data = NULL;
+
+ SESSION(session)->destroy = news_session_destroy;
+
session->group = NULL;
return SESSION(session);
}
-void news_session_destroy(NNTPSession *session)
+void news_session_destroy(Session *session)
{
- nntp_close(session->nntp_sock);
- session->nntp_sock = NULL;
- SESSION(session)->sock = NULL;
+ nntp_close(NNTP_SESSION(session)->nntp_sock);
+ NNTP_SESSION(session)->nntp_sock = NULL;
+ session->sock = NULL;
- g_free(session->group);
+ g_free(NNTP_SESSION(session)->group);
}
static Session *news_session_new_for_folder(Folder *folder)
PrefsAccount *ac;
const gchar *userid = NULL;
gchar *passwd = NULL;
+ gushort port;
+ gchar buf[NNTPBUFSIZE];
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
userid);
}
- session = news_session_new(ac->nntp_server,
- ac->set_nntpport ? ac->nntpport : NNTP_PORT,
- userid, passwd);
+#if USE_OPENSSL
+ port = ac->set_nntpport ? ac->nntpport
+ : ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
+ session = news_session_new(ac->nntp_server, port, userid, passwd,
+ ac->ssl_nntp);
+#else
+ port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
+ session = news_session_new(ac->nntp_server, port, userid, passwd);
+#endif
+ if ((session != NULL) && ac->use_nntp_auth && ac->use_nntp_auth_onconnect)
+ nntp_forceauth(NNTP_SESSION(session)->nntp_sock, buf, userid, passwd);
+
g_free(passwd);
return session;
if (!rfolder->session) {
rfolder->session = news_session_new_for_folder(folder);
- statusbar_pop_all();
return NNTP_SESSION(rfolder->session);
}
if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
return NNTP_SESSION(rfolder->session);
}
if (nntp_mode(NNTP_SESSION(rfolder->session)->nntp_sock, FALSE)
!= NN_SUCCESS) {
- log_warning(_("NNTP connection to %s:%d has been"
- " disconnected. Reconnecting...\n"),
+ log_warning("NNTP connection to %s:%d has been"
+ " disconnected. Reconnecting...\n",
folder->account->nntp_server,
folder->account->set_nntpport ?
folder->account->nntpport : NNTP_PORT);
if (rfolder->session)
rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
return NNTP_SESSION(rfolder->session);
}
-GSList *news_get_article_list(Folder *folder, FolderItem *item,
- gboolean use_cache)
-{
- GSList *alist;
- NNTPSession *session;
-
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(folder->type == F_NEWS, NULL);
-
- session = news_session_get(folder);
-
- if (!session) {
- alist = procmsg_read_cache(item, FALSE);
- item->last_num = procmsg_get_last_num_in_cache(alist);
- } else if (use_cache) {
- GSList *newlist;
- gint cache_last;
- gint first, last;
-
- alist = procmsg_read_cache(item, FALSE);
-
- cache_last = procmsg_get_last_num_in_cache(alist);
- newlist = news_get_uncached_articles
- (session, item, cache_last, &first, &last);
- alist = news_delete_old_articles(alist, item, first);
-
- alist = g_slist_concat(alist, newlist);
- item->last_num = last;
- } else {
- gint last;
-
- alist = news_get_uncached_articles
- (session, item, 0, NULL, &last);
- news_delete_all_articles(item);
- item->last_num = last;
- }
-
- procmsg_set_flags(alist, item);
-
- statusbar_pop_all();
-
- return alist;
-}
-
gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
{
gchar *path, *filename;
g_free(path);
if (is_file_exist(filename)) {
- debug_print(_("article %d has been already cached.\n"), num);
+ debug_print("article %d has been already cached.\n", num);
return filename;
}
}
ok = news_select_group(session, item->path, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != NN_SUCCESS) {
- g_warning(_("can't select group %s\n"), item->path);
+ g_warning("can't select group %s\n", item->path);
g_free(filename);
return NULL;
}
- debug_print(_("getting article %d...\n"), num);
+ debug_print("getting article %d...\n", num);
ok = news_get_article(NNTP_SESSION(REMOTE_FOLDER(folder)->session),
num, filename);
- statusbar_pop_all();
if (ok < 0) {
- g_warning(_("can't read article %d\n"), num);
+ g_warning("can't read article %d\n", num);
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
g_free(filename);
return NULL;
}
return filename;
}
-void news_scan_group(Folder *folder, FolderItem *item)
+gint news_scan_group(Folder *folder, FolderItem *item)
{
NNTPSession *session;
gint num = 0, first = 0, last = 0;
- gint new = 0, unread = 0, total = 0;
- gint min = 0, max = 0;
- gchar *path;
gint ok;
- g_return_if_fail(folder != NULL);
- g_return_if_fail(item != NULL);
+ g_return_val_if_fail(folder != NULL, -1);
+ g_return_val_if_fail(item != NULL, -1);
session = news_session_get(folder);
- if (!session) return;
+ if (!session) return -1;
ok = news_select_group(session, item->path, &num, &first, &last);
if (ok != NN_SUCCESS) {
- log_warning(_("can't set group: %s\n"), item->path);
- return;
+ log_warning("can't set group: %s\n", item->path);
+ return -1;
}
if (num == 0) {
item->new = item->unread = item->total = item->last_num = 0;
- return;
+ return 0;
}
+/*
path = folder_item_get_path(item);
if (path && is_dir_exist(path)) {
procmsg_get_mark_sum(path, &new, &unread, &total, &min, &max,
}
g_free(path);
- if (first < min) {
- new = unread = total = num;
- } else if (max < first) {
+ if (max < first || last < min)
new = unread = total = num;
- } else if (last > max) {
- new += last - max;
- unread += last - max;
+ else {
+ if (min < first)
+ min = first;
+
+ if (last < max)
+ max = last;
+ else if (max < last) {
+ new += last - max;
+ unread += last - max;
+ }
+
if (new > num) new = num;
if (unread > num) unread = num;
}
+
item->new = new;
item->unread = unread;
item->total = num;
item->last_num = last;
+*/
+ return 0;
}
static NewsGroupInfo *news_group_info_new(const gchar *name,
filename = g_strconcat(path, G_DIR_SEPARATOR_S, NEWSGROUP_LIST, NULL);
g_free(path);
- if ((fp = fopen(filename, "r")) == NULL) {
+ if ((fp = fopen(filename, "rb")) == NULL) {
NNTPSession *session;
session = news_session_get(folder);
if (nntp_list(session->nntp_sock) != NN_SUCCESS) {
g_free(filename);
- statusbar_pop_all();
return NULL;
}
- statusbar_pop_all();
if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
- log_warning(_("can't retrieve newsgroup list\n"));
+ log_warning("can't retrieve newsgroup list\n");
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
g_free(filename);
return NULL;
}
- if ((fp = fopen(filename, "r")) == NULL) {
+ if ((fp = fopen(filename, "rb")) == NULL) {
FILE_OP_ERROR(filename, "fopen");
g_free(filename);
return NULL;
list = g_slist_sort(list, (GCompareFunc)news_group_info_compare);
- statusbar_pop_all();
-
return list;
}
gint news_post(Folder *folder, const gchar *file)
{
- NNTPSession *session;
FILE *fp;
gint ok;
g_return_val_if_fail(folder->type == F_NEWS, -1);
g_return_val_if_fail(file != NULL, -1);
- session = news_session_get(folder);
- if (!session) return -1;
-
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
+ ok = news_post_stream(folder, fp);
+
+ fclose(fp);
+
+ return ok;
+}
+
+gint news_post_stream(Folder *folder, FILE *fp)
+{
+ NNTPSession *session;
+ gint ok;
+
+ g_return_val_if_fail(folder != NULL, -1);
+ g_return_val_if_fail(folder->type == F_NEWS, -1);
+ g_return_val_if_fail(fp != NULL, -1);
+
+ session = news_session_get(folder);
+ if (!session) return -1;
+
ok = nntp_post(session->nntp_sock, fp);
if (ok != NN_SUCCESS) {
- log_warning(_("can't post article.\n"));
+ log_warning("can't post article.\n");
return -1;
}
- fclose(fp);
-
- statusbar_pop_all();
-
return 0;
}
g_free(msgid);
if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
- log_warning(_("can't retrieve article %d\n"), num);
+ log_warning("can't retrieve article %d\n", num);
return -1;
}
static gint news_remove_msg(Folder *folder, FolderItem *item, gint num)
{
- return 0;
+ gchar * dir;
+ gint r;
+
+ dir = folder_item_get_path(item);
+ debug_print("news_remove_msg: removing msg %d in %s\n",num,dir);
+ r = remove_numbered_files(dir, num, num);
+ g_free(dir);
+
+ return r;
}
static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
return news_get_article_cmd(session, "ARTICLE", num, filename);
}
-static gint news_get_header(NNTPSession *session, gint num, gchar *filename)
-{
- return news_get_article_cmd(session, "HEAD", num, filename);
-}
-
/**
* news_select_group:
* @session: Active NNTP session.
return ok;
}
-static GSList *news_get_uncached_articles(NNTPSession *session,
- FolderItem *item, gint cache_last,
- gint *rfirst, gint *rlast)
+#define PARSE_ONE_PARAM(p, srcp) \
+{ \
+ p = strchr(srcp, '\t'); \
+ if (!p) return NULL; \
+ else \
+ *p++ = '\0'; \
+}
+
+static MsgInfo *news_parse_xover(const gchar *xover_str)
{
- gint ok;
- gint num = 0, first = 0, last = 0, begin = 0, end = 0;
- gchar buf[NNTPBUFSIZE];
- GSList *newlist = NULL;
- GSList *llast = NULL;
MsgInfo *msginfo;
+ gchar buf[NNTPBUFSIZE];
+ gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp, *xref;
+ gchar *p;
+ gint num, size_int, line_int;
+ gchar *xover_buf;
- if (rfirst) *rfirst = 0;
- if (rlast) *rlast = 0;
+ Xstrdup_a(xover_buf, xover_str, return NULL);
- g_return_val_if_fail(session != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->folder != NULL, NULL);
- g_return_val_if_fail(item->folder->type == F_NEWS, NULL);
+ PARSE_ONE_PARAM(subject, xover_buf);
+ PARSE_ONE_PARAM(sender, subject);
+ PARSE_ONE_PARAM(date, sender);
+ PARSE_ONE_PARAM(msgid, date);
+ PARSE_ONE_PARAM(ref, msgid);
+ PARSE_ONE_PARAM(size, ref);
+ PARSE_ONE_PARAM(line, size);
+ PARSE_ONE_PARAM(xref, line);
+
+ tmp = strchr(xref, '\t');
+ if (!tmp) tmp = strchr(line, '\r');
+ if (!tmp) tmp = strchr(line, '\n');
+ if (tmp) *tmp = '\0';
+
+ num = atoi(xover_str);
+ size_int = atoi(size);
+ line_int = atoi(line);
+
+ /* set MsgInfo */
+ msginfo = procmsg_msginfo_new();
+ msginfo->msgnum = num;
+ msginfo->size = size_int;
+
+ msginfo->date = g_strdup(date);
+ msginfo->date_t = procheader_date_parse(NULL, date, 0);
+
+ conv_unmime_header(buf, sizeof(buf), sender, NULL);
+ msginfo->from = g_strdup(buf);
+ msginfo->fromname = procheader_get_fromname(buf);
+
+ conv_unmime_header(buf, sizeof(buf), subject, NULL);
+ msginfo->subject = g_strdup(buf);
+
+ extract_parenthesis(msgid, '<', '>');
+ remove_space(msgid);
+ if (*msgid != '\0')
+ msginfo->msgid = g_strdup(msgid);
+
+ msginfo->references = g_strdup(ref);
+ eliminate_parenthesis(ref, '(', ')');
+ if ((p = strrchr(ref, '<')) != NULL) {
+ extract_parenthesis(p, '<', '>');
+ remove_space(p);
+ if (*p != '\0')
+ msginfo->inreplyto = g_strdup(p);
+ }
+
+ msginfo->xref = g_strdup(xref);
+ p = msginfo->xref+strlen(msginfo->xref) - 1;
+ while (*p == '\r' || *p == '\n') {
+ *p = '\0';
+ p--;
+ }
+
+ return msginfo;
+}
+
+static gchar *news_parse_xhdr(const gchar *xhdr_str, MsgInfo *msginfo)
+{
+ gchar *p;
+ gchar *tmp;
+ gint num;
+
+ p = strchr(xhdr_str, ' ');
+ if (!p)
+ return NULL;
+ else
+ p++;
+
+ num = atoi(xhdr_str);
+ if (msginfo->msgnum != num) return NULL;
+
+ tmp = strchr(p, '\r');
+ if (!tmp) tmp = strchr(p, '\n');
+
+ if (tmp)
+ return g_strndup(p, tmp - p);
+ else
+ return g_strdup(p);
+}
+
+gint news_cancel_article(Folder * folder, MsgInfo * msginfo)
+{
+ gchar * tmp;
+ FILE * tmpfp;
+ gchar buf[BUFFSIZE];
+
+ tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
+ G_DIR_SEPARATOR, (gint)msginfo);
+ if (tmp == NULL)
+ return -1;
+
+ if ((tmpfp = fopen(tmp, "wb")) == NULL) {
+ FILE_OP_ERROR(tmp, "fopen");
+ return -1;
+ }
+ if (change_file_mode_rw(tmpfp, tmp) < 0) {
+ FILE_OP_ERROR(tmp, "chmod");
+ g_warning("can't change file mode\n");
+ }
+
+ fprintf(tmpfp, "From: %s\r\n", msginfo->from);
+ fprintf(tmpfp, "Newsgroups: %s\r\n", msginfo->newsgroups);
+ fprintf(tmpfp, "Subject: cmsg cancel <%s>\r\n", msginfo->msgid);
+ fprintf(tmpfp, "Control: cancel <%s>\r\n", msginfo->msgid);
+ fprintf(tmpfp, "Approved: %s\r\n", msginfo->from);
+ fprintf(tmpfp, "X-Cancelled-by: %s\r\n", msginfo->from);
+ get_rfc822_date(buf, sizeof(buf));
+ fprintf(tmpfp, "Date: %s\r\n", buf);
+ fprintf(tmpfp, "\r\n");
+ fprintf(tmpfp, "removed with sylpheed\r\n");
+
+ fclose(tmpfp);
+
+ news_post(folder, tmp);
+ remove(tmp);
+
+ g_free(tmp);
+
+ return 0;
+}
+
+gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
+{
+ NNTPSession *session;
+ gint i, ok, num, first, last, nummsgs = 0;
+ gchar *dir;
+
+ g_return_val_if_fail(item != NULL, -1);
+ g_return_val_if_fail(item->folder != NULL, -1);
+ g_return_val_if_fail(item->folder->type == F_NEWS, -1);
+
+ session = news_session_get(folder);
+ g_return_val_if_fail(session != NULL, -1);
ok = news_select_group(session, item->path, &num, &first, &last);
if (ok != NN_SUCCESS) {
log_warning(_("can't set group: %s\n"), item->path);
- return NULL;
+ return -1;
}
- /* calculate getting overview range */
- if (first > last) {
+ if(last < first) {
log_warning(_("invalid article range: %d - %d\n"),
first, last);
+ return 0;
+ }
+
+ for(i = first; i <= last; i++) {
+ *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(i));
+ nummsgs++;
+ }
+
+ dir = folder_item_get_path(item);
+ debug_print("removing old messages from %d to %d in %s\n", first, last, dir);
+ remove_numbered_files(dir, 1, first - 1);
+ g_free(dir);
+
+ return nummsgs;
+}
+
+#define READ_TO_LISTEND(hdr) \
+ while (!(buf[0] == '.' && buf[1] == '\r')) { \
+ if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) { \
+ log_warning(_("error occurred while getting %s.\n"), hdr); \
+ return msginfo; \
+ } \
+ }
+
+MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
+{
+ NNTPSession *session;
+ MsgInfo *msginfo = NULL;
+ gchar buf[NNTPBUFSIZE];
+
+ session = news_session_get(folder);
+ g_return_val_if_fail(session != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
+ g_return_val_if_fail(item->folder != NULL, NULL);
+ g_return_val_if_fail(item->folder->type == F_NEWS, NULL);
+
+ log_message(_("getting xover %d in %s...\n"),
+ num, item->path);
+ if (nntp_xover(session->nntp_sock, num, num) != NN_SUCCESS) {
+ log_warning(_("can't get xover\n"));
return NULL;
}
- if (cache_last < first)
- begin = first;
- else if (last < cache_last)
- begin = first;
- else if (last == cache_last) {
- debug_print(_("no new articles.\n"));
+
+ if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+ log_warning(_("error occurred while getting xover.\n"));
return NULL;
- } else
- begin = cache_last + 1;
- end = last;
+ }
+
+ msginfo = news_parse_xover(buf);
+ if (!msginfo) {
+ log_warning(_("invalid xover line: %s\n"), buf);
+ }
+
+ READ_TO_LISTEND("xover");
+
+ if(!msginfo)
+ return NULL;
+
+ msginfo->folder = item;
+ msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
+ msginfo->flags.tmp_flags = MSG_NEWS;
+ msginfo->newsgroups = g_strdup(item->path);
+
+ if (nntp_xhdr(session->nntp_sock, "to", num, num) != NN_SUCCESS) {
+ log_warning(_("can't get xhdr\n"));
+ return msginfo;
+ }
+
+ if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+ log_warning(_("error occurred while getting xhdr.\n"));
+ return msginfo;
+ }
+
+ msginfo->to = news_parse_xhdr(buf, msginfo);
+
+ READ_TO_LISTEND("xhdr (to)");
- if (rfirst) *rfirst = first;
- if (rlast) *rlast = last;
+ if (nntp_xhdr(session->nntp_sock, "cc", num, num) != NN_SUCCESS) {
+ log_warning(_("can't get xhdr\n"));
+ return msginfo;
+ }
+
+ if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+ log_warning(_("error occurred while getting xhdr.\n"));
+ return msginfo;
+ }
+
+ msginfo->cc = news_parse_xhdr(buf, msginfo);
+
+ READ_TO_LISTEND("xhdr (cc)");
- if (prefs_common.max_articles > 0 &&
- end - begin + 1 > prefs_common.max_articles)
- begin = end - prefs_common.max_articles + 1;
+ return msginfo;
+}
+
+static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *item, guint begin, guint end)
+{
+ gchar buf[NNTPBUFSIZE];
+ GSList *newlist = NULL;
+ GSList *llast = NULL;
+ MsgInfo *msginfo;
+ guint count = 0, lines = (end - begin + 1) * 3;
+
+ g_return_val_if_fail(session != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
log_message(_("getting xover %d - %d in %s...\n"),
begin, end, item->path);
log_warning(_("error occurred while getting xover.\n"));
return newlist;
}
+ count++;
+ progressindicator_set_percentage
+ (PROGRESS_TYPE_NETWORK, session->fetch_base_percentage + ((gfloat) count / (gfloat) lines));
if (buf[0] == '.' && buf[1] == '\r') break;
log_warning(_("error occurred while getting xhdr.\n"));
return newlist;
}
+ count++;
+ progressindicator_set_percentage
+ (PROGRESS_TYPE_NETWORK, session->fetch_base_percentage + ((gfloat) count / (gfloat) lines));
if (buf[0] == '.' && buf[1] == '\r') break;
if (!llast) {
log_warning(_("error occurred while getting xhdr.\n"));
return newlist;
}
+ count++;
+ progressindicator_set_percentage
+ (PROGRESS_TYPE_NETWORK, session->fetch_base_percentage + ((gfloat) count / (gfloat) lines));
if (buf[0] == '.' && buf[1] == '\r') break;
if (!llast) {
return newlist;
}
-#define PARSE_ONE_PARAM(p, srcp) \
-{ \
- p = strchr(srcp, '\t'); \
- if (!p) return NULL; \
- else \
- *p++ = '\0'; \
-}
-
-static MsgInfo *news_parse_xover(const gchar *xover_str)
-{
- MsgInfo *msginfo;
- gchar buf[NNTPBUFSIZE];
- gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp;
- gchar *p;
- gint num, size_int, line_int;
- gchar *xover_buf;
-
- Xstrdup_a(xover_buf, xover_str, return NULL);
-
- PARSE_ONE_PARAM(subject, xover_buf);
- PARSE_ONE_PARAM(sender, subject);
- PARSE_ONE_PARAM(date, sender);
- PARSE_ONE_PARAM(msgid, date);
- PARSE_ONE_PARAM(ref, msgid);
- PARSE_ONE_PARAM(size, ref);
- PARSE_ONE_PARAM(line, size);
-
- tmp = strchr(line, '\t');
- if (!tmp) tmp = strchr(line, '\r');
- if (!tmp) tmp = strchr(line, '\n');
- if (tmp) *tmp = '\0';
-
- num = atoi(xover_str);
- size_int = atoi(size);
- line_int = atoi(line);
-
- /* set MsgInfo */
- msginfo = g_new0(MsgInfo, 1);
- msginfo->msgnum = num;
- msginfo->size = size_int;
-
- msginfo->date = g_strdup(date);
- msginfo->date_t = procheader_date_parse(NULL, date, 0);
-
- conv_unmime_header(buf, sizeof(buf), sender, NULL);
- msginfo->from = g_strdup(buf);
- msginfo->fromname = procheader_get_fromname(buf);
-
- conv_unmime_header(buf, sizeof(buf), subject, NULL);
- msginfo->subject = g_strdup(buf);
-
- extract_parenthesis(msgid, '<', '>');
- remove_space(msgid);
- if (*msgid != '\0')
- msginfo->msgid = g_strdup(msgid);
-
- msginfo->references = g_strdup(ref);
- eliminate_parenthesis(ref, '(', ')');
- if ((p = strrchr(ref, '<')) != NULL) {
- extract_parenthesis(p, '<', '>');
- remove_space(p);
- if (*p != '\0')
- msginfo->inreplyto = g_strdup(p);
- }
-
- return msginfo;
-}
-
-static gchar *news_parse_xhdr(const gchar *xhdr_str, MsgInfo *msginfo)
+gint news_fetch_msgnum_sort(gconstpointer a, gconstpointer b)
{
- gchar *p;
- gchar *tmp;
- gint num;
-
- p = strchr(xhdr_str, ' ');
- if (!p)
- return NULL;
- else
- p++;
-
- num = atoi(xhdr_str);
- if (msginfo->msgnum != num) return NULL;
-
- tmp = strchr(p, '\r');
- if (!tmp) tmp = strchr(p, '\n');
-
- if (tmp)
- return g_strndup(p, tmp - p);
- else
- return g_strdup(p);
+ return (GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b));
}
-static GSList *news_delete_old_articles(GSList *alist, FolderItem *item,
- gint first)
+GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
{
- GSList *cur, *next;
- MsgInfo *msginfo;
- gchar *dir;
-
- g_return_val_if_fail(item != NULL, alist);
- g_return_val_if_fail(item->folder != NULL, alist);
- g_return_val_if_fail(item->folder->type == F_NEWS, alist);
-
- if (first < 2) return alist;
-
- debug_print(_("Deleting cached articles 1 - %d ... "), first - 1);
-
- dir = folder_item_get_path(item);
- remove_numbered_files(dir, 1, first - 1);
- g_free(dir);
-
- for (cur = alist; cur != NULL; ) {
- next = cur->next;
+ NNTPSession *session;
+ GSList *elem, *msginfo_list = NULL, *tmp_msgnum_list, *tmp_msginfo_list;
+ guint first, last, next;
+ guint tofetch, fetched;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(folder->type == F_NEWS, NULL);
+ g_return_val_if_fail(msgnum_list != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
+
+ session = news_session_get(folder);
+ g_return_val_if_fail(session != NULL, NULL);
- msginfo = (MsgInfo *)cur->data;
- if (msginfo && msginfo->msgnum < first) {
- procmsg_msginfo_free(msginfo);
- alist = g_slist_remove(alist, msginfo);
+ tmp_msgnum_list = g_slist_copy(msgnum_list);
+ tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, news_fetch_msgnum_sort);
+
+ progressindicator_start(PROGRESS_TYPE_NETWORK);
+ tofetch = g_slist_length(tmp_msgnum_list);
+ fetched = 0;
+
+ first = GPOINTER_TO_INT(tmp_msgnum_list->data);
+ last = first;
+ for(elem = g_slist_next(tmp_msgnum_list); elem != NULL; elem = g_slist_next(elem)) {
+ next = GPOINTER_TO_INT(elem->data);
+ if(next != (last + 1)) {
+ session->fetch_base_percentage = (gfloat) fetched / (gfloat) tofetch;
+ tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
+ msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
+ fetched = last - first + 1;
+ first = next;
}
-
- cur = next;
+ last = next;
}
+ tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
+ msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
- return alist;
-}
-
-static void news_delete_all_articles(FolderItem *item)
-{
- gchar *dir;
-
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->type == F_NEWS);
-
- debug_print(_("\tDeleting all cached articles... "));
-
- dir = folder_item_get_path(item);
- remove_all_numbered_files(dir);
- g_free(dir);
+ g_slist_free(tmp_msgnum_list);
+
+ progressindicator_stop(PROGRESS_TYPE_NETWORK);
- debug_print(_("done.\n"));
+ return msginfo_list;
}
projects / claws.git / blobdiff