show progress while fetching news headers
[claws.git] / src / news.c
index 973909a7fadaf548aafdf5b88a9249e439e34f85..caa76add9831e472e075d738facbc4ab2ca94572 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <dirent.h>
 #include <unistd.h>
+#include <time.h>
 
 #include "intl.h"
 #include "news.h"
 #include "prefs_account.h"
 #include "inputdialog.h"
 #include "alertpanel.h"
+#include "log.h"
+#include "mainwindow.h"
+#include "inc.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,
@@ -61,12 +83,12 @@ static gint news_get_article_cmd     (NNTPSession   *session,
 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);
+                                         const gchar   *group,
+                                         gint          *num,
+                                         gint          *first,
+                                         gint          *last);
 static GSList *news_get_uncached_articles(NNTPSession  *session,
                                          FolderItem    *item,
                                          gint           cache_last,
@@ -79,10 +101,76 @@ static GSList *news_delete_old_articles     (GSList        *alist,
                                          FolderItem    *item,
                                          gint           first);
 static void news_delete_all_articles    (FolderItem    *item);
+static void news_delete_expired_caches  (GSList        *alist,
+                                         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)
+{
+       Folder *folder;
+
+       folder = (Folder *)g_new0(NewsFolder, 1);
+       news_folder_init(folder, name, path);
 
+       return 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->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;
@@ -92,46 +180,46 @@ static Session *news_session_new(const gchar *server, gushort port,
 
        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 = g_new(NNTPSession, 1);
-       SESSION(session)->type      = SESSION_NEWS;
-       SESSION(session)->server    = g_strdup(server);
-       session->nntp_sock          = nntp_sock;
-       SESSION(session)->sock      = nntp_sock->sock;
-       SESSION(session)->connected = TRUE;
-       SESSION(session)->phase     = SESSION_READY;
-       SESSION(session)->data      = NULL;
-       session->group = NULL;
+       SESSION(session)->type             = SESSION_NEWS;
+       SESSION(session)->server           = g_strdup(server);
+       session->nntp_sock                 = nntp_sock;
+       SESSION(session)->sock             = nntp_sock->sock;
+       SESSION(session)->connected        = TRUE;
+       SESSION(session)->phase            = SESSION_READY;
+       SESSION(session)->last_access_time = time(NULL);
+       SESSION(session)->data             = NULL;
 
-       return SESSION(session);
-}
+       SESSION(session)->destroy          = news_session_destroy;
 
-void news_session_destroy(NNTPSession *session)
-{
-       nntp_close(session->nntp_sock);
-       session->nntp_sock = NULL;
-       SESSION(session)->sock = NULL;
+       session->group = NULL;
 
-       g_free(session->group);
+       return SESSION(session);
 }
 
-static gchar *news_query_password(const gchar *server, const gchar *user)
+void news_session_destroy(Session *session)
 {
-       gchar *message;
-       gchar *pass;
-
-       message = g_strdup_printf(_("Input password for %s on %s:"),
-                                 user, server);
-       pass = input_dialog_with_invisible(_("Input password"), message, NULL);
-       g_free(message);
+       nntp_close(NNTP_SESSION(session)->nntp_sock);
+       NNTP_SESSION(session)->nntp_sock = NULL;
+       session->sock = NULL;
 
-       return pass;
+       g_free(NNTP_SESSION(session)->group);
 }
 
 static Session *news_session_new_for_folder(Folder *folder)
@@ -140,6 +228,8 @@ 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);
@@ -150,12 +240,22 @@ static Session *news_session_new_for_folder(Folder *folder)
                if (ac->passwd && ac->passwd[0])
                        passwd = g_strdup(ac->passwd);
                else
-                       passwd = news_query_password(ac->nntp_server, userid);
+                       passwd = input_dialog_query_password(ac->nntp_server,
+                                                            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 (ac->use_nntp_auth && ac->use_nntp_auth_onconnect)
+               nntp_forceauth(NNTP_SESSION(session)->nntp_sock, buf, userid, passwd);
+
        g_free(passwd);
 
        return session;
@@ -163,34 +263,36 @@ static Session *news_session_new_for_folder(Folder *folder)
 
 NNTPSession *news_session_get(Folder *folder)
 {
-       NNTPSession *session;
+       RemoteFolder *rfolder = REMOTE_FOLDER(folder);
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(folder->type == F_NEWS, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
 
-       if (!REMOTE_FOLDER(folder)->session) {
-               REMOTE_FOLDER(folder)->session =
-                       news_session_new_for_folder(folder);
-               statusbar_pop_all();
-               return NNTP_SESSION(REMOTE_FOLDER(folder)->session);
+       if (!rfolder->session) {
+               rfolder->session = news_session_new_for_folder(folder);
+               return NNTP_SESSION(rfolder->session);
        }
 
-       session = NNTP_SESSION(REMOTE_FOLDER(folder)->session);
+       if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
+               rfolder->session->last_access_time = time(NULL);
+               return NNTP_SESSION(rfolder->session);
+       }
 
-       if (nntp_mode(session->nntp_sock, FALSE) != NN_SUCCESS) {
-               log_warning(_("NNTP connection to %s:%d has been"
-                             " disconnected. Reconnecting...\n"),
+       if (nntp_mode(NNTP_SESSION(rfolder->session)->nntp_sock, FALSE)
+           != NN_SUCCESS) {
+               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);
-               session_destroy(REMOTE_FOLDER(folder)->session);
-               REMOTE_FOLDER(folder)->session =
-                       news_session_new_for_folder(folder);
+               session_destroy(rfolder->session);
+               rfolder->session = news_session_new_for_folder(folder);
        }
 
-       statusbar_pop_all();
-       return NNTP_SESSION(REMOTE_FOLDER(folder)->session);
+       if (rfolder->session)
+               rfolder->session->last_access_time = time(NULL);
+       return NNTP_SESSION(rfolder->session);
 }
 
 GSList *news_get_article_list(Folder *folder, FolderItem *item,
@@ -207,7 +309,7 @@ GSList *news_get_article_list(Folder *folder, FolderItem *item,
 
        if (!session) {
                alist = procmsg_read_cache(item, FALSE);
-               item->last_num = procmsg_get_last_num_in_cache(alist);
+               item->last_num = procmsg_get_last_num_in_msg_list(alist);
        } else if (use_cache) {
                GSList *newlist;
                gint cache_last;
@@ -215,12 +317,20 @@ GSList *news_get_article_list(Folder *folder, FolderItem *item,
 
                alist = procmsg_read_cache(item, FALSE);
 
-               cache_last = procmsg_get_last_num_in_cache(alist);
+               cache_last = procmsg_get_last_num_in_msg_list(alist);
                newlist = news_get_uncached_articles
                        (session, item, cache_last, &first, &last);
-               alist = news_delete_old_articles(alist, item, first);
+               if (first == 0 && last == 0) {
+                       news_delete_all_articles(item);
+                       procmsg_msg_list_free(alist);
+                       alist = NULL;
+               } else {
+                       alist = news_delete_old_articles(alist, item, first);
+                       news_delete_expired_caches(alist, item);
+               }
 
                alist = g_slist_concat(alist, newlist);
+
                item->last_num = last;
        } else {
                gint last;
@@ -233,8 +343,6 @@ GSList *news_get_article_list(Folder *folder, FolderItem *item,
 
        procmsg_set_flags(alist, item);
 
-       statusbar_pop_all();
-
        return alist;
 }
 
@@ -250,12 +358,11 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
        path = folder_item_get_path(item);
        if (!is_dir_exist(path))
                make_dir_hier(path);
-
        filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
        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;
        }
 
@@ -265,20 +372,18 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
                return NULL;
        }
 
-       ok = news_select_group(session, item->path);
-       statusbar_pop_all();
+       ok = news_select_group(session, item->path, NULL, NULL, NULL);
        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);
                g_free(filename);
                return NULL;
        }
@@ -286,8 +391,86 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
        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 ok;
+
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(item != NULL, -1);
+
+       session = news_session_get(folder);
+       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 -1;
+       }
+
+       if (num == 0) {
+               item->new = item->unread = item->total = item->last_num = 0;
+               return 0;
+       }
+
+/*
+       path = folder_item_get_path(item);
+       if (path && is_dir_exist(path)) {
+               procmsg_get_mark_sum(path, &new, &unread, &total, &min, &max,
+                                    first);
+       }
+       g_free(path);
+
+       if (max < first || last < min)
+               new = unread = total = num;
+       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,
+                                         gint first, gint last, gchar type)
+{
+       NewsGroupInfo *ginfo;
+
+       ginfo = g_new(NewsGroupInfo, 1);
+       ginfo->name = g_strdup(name);
+       ginfo->first = first;
+       ginfo->last = last;
+       ginfo->type = type;
+
+       return ginfo;
+}
+
+static void news_group_info_free(NewsGroupInfo *ginfo)
+{
+       g_free(ginfo->name);
+       g_free(ginfo);
+}
+
+static gint news_group_info_compare(NewsGroupInfo *ginfo1,
+                                   NewsGroupInfo *ginfo2)
+{
+       return g_strcasecmp(ginfo1->name, ginfo2->name);
 }
 
 GSList *news_get_group_list(Folder *folder)
@@ -302,10 +485,12 @@ GSList *news_get_group_list(Folder *folder)
        g_return_val_if_fail(folder->type == F_NEWS, NULL);
 
        path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
+       if (!is_dir_exist(path))
+               make_dir_hier(path);
        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);
@@ -316,17 +501,17 @@ GSList *news_get_group_list(Folder *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;
@@ -335,12 +520,27 @@ GSList *news_get_group_list(Folder *folder)
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                gchar *p = buf;
-               while (*p != '\0' && *p != ' ') p++;
+               gchar *name;
+               gint last_num;
+               gint first_num;
+               gchar type;
+               NewsGroupInfo *ginfo;
+
+               p = strchr(p, ' ');
+               if (!p) continue;
                *p = '\0';
+               p++;
+               name = buf;
+
+               if (sscanf(p, "%d %d %c", &last_num, &first_num, &type) < 3)
+                       continue;
+
+               ginfo = news_group_info_new(name, first_num, last_num, type);
+
                if (!last)
-                       last = list = g_slist_append(NULL, g_strdup(buf));
+                       last = list = g_slist_append(NULL, ginfo);
                else {
-                       last = g_slist_append(last, g_strdup(buf));
+                       last = g_slist_append(last, ginfo);
                        last = last->next;
                }
        }
@@ -348,14 +548,23 @@ GSList *news_get_group_list(Folder *folder)
        fclose(fp);
        g_free(filename);
 
-       list = g_slist_sort(list, (GCompareFunc)g_strcasecmp);
-
-       statusbar_pop_all();
+       list = g_slist_sort(list, (GCompareFunc)news_group_info_compare);
 
        return list;
 }
 
-void news_remove_group_list(Folder *folder)
+void news_group_list_free(GSList *group_list)
+{
+       GSList *cur;
+
+       if (!group_list) return;
+
+       for (cur = group_list; cur != NULL; cur = cur->next)
+               news_group_info_free((NewsGroupInfo *)cur->data);
+       g_slist_free(group_list);
+}
+
+void news_remove_group_list_cache(Folder *folder)
 {
        gchar *path, *filename;
 
@@ -375,7 +584,6 @@ void news_remove_group_list(Folder *folder)
 
 gint news_post(Folder *folder, const gchar *file)
 {
-       NNTPSession *session;
        FILE *fp;
        gint ok;
 
@@ -383,24 +591,36 @@ gint news_post(Folder *folder, const gchar *file)
        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;
 }
 
@@ -417,45 +637,62 @@ static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
        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;
        }
 
        return 0;
 }
 
-static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
+static gint news_remove_msg(Folder *folder, FolderItem *item, gint num)
 {
-       return news_get_article_cmd(session, "ARTICLE", num, filename);
+       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_header(NNTPSession *session, gint num, gchar *filename)
+static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
 {
-       return news_get_article_cmd(session, "HEAD", num, filename);
+       return news_get_article_cmd(session, "ARTICLE", num, filename);
 }
 
 /**
  * news_select_group:
  * @session: Active NNTP session.
  * @group: Newsgroup name.
+ * @num: Estimated number of articles.
+ * @first: First article number.
+ * @last: Last article number.
  *
  * Select newsgroup @group with the GROUP command if it is not already
- * selected in @session.
+ * selected in @session, or article numbers need to be returned.
  *
  * Return value: NNTP result code.
  **/
-static gint news_select_group(NNTPSession *session, const gchar *group)
+static gint news_select_group(NNTPSession *session, const gchar *group,
+                             gint *num, gint *first, gint *last)
 {
        gint ok;
-       gint num, first, last;
-
-       if (session->group && g_strcasecmp(session->group, group) == 0)
-               return NN_SUCCESS;
+       gint num_, first_, last_;
+
+       if (!num || !first || !last) {
+               if (session->group && g_strcasecmp(session->group, group) == 0)
+                       return NN_SUCCESS;
+               num = &num_;
+               first = &first_;
+               last = &last_;
+       }
 
        g_free(session->group);
        session->group = NULL;
 
-       ok = nntp_group(session->nntp_sock, group, &num, &first, &last);
+       ok = nntp_group(session->nntp_sock, group, num, first, last);
        if (ok == NN_SUCCESS)
                session->group = g_strdup(group);
 
@@ -473,45 +710,41 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        GSList *llast = NULL;
        MsgInfo *msginfo;
 
-       if (rfirst) *rfirst = 0;
-       if (rlast)  *rlast  = 0;
+       if (rfirst) *rfirst = -1;
+       if (rlast)  *rlast  = -1;
 
        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);
 
-       g_free(session->group);
-       session->group = NULL;
-
-       ok = nntp_group(session->nntp_sock, item->path,
-                       &num, &first, &last);
+       ok = news_select_group(session, item->path, &num, &first, &last);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't set group: %s\n"), item->path);
+               log_warning("can't set group: %s\n", item->path);
                return NULL;
        }
-       session->group = g_strdup(item->path);
 
        /* calculate getting overview range */
        if (first > last) {
-               log_warning(_("invalid article range: %d - %d\n"),
+               log_warning("invalid article range: %d - %d\n",
                            first, last);
                return NULL;
        }
+
+       if (rfirst) *rfirst = first;
+       if (rlast)  *rlast  = last;
+
        if (cache_last < first)
                begin = first;
        else if (last < cache_last)
                begin = first;
        else if (last == cache_last) {
-               debug_print(_("no new articles.\n"));
+               debug_print("no new articles.\n");
                return NULL;
        } else
                begin = cache_last + 1;
        end = last;
 
-       if (rfirst) *rfirst = first;
-       if (rlast)  *rlast  = last;
-
        if (prefs_common.max_articles > 0 &&
            end - begin + 1 > prefs_common.max_articles)
                begin = end - prefs_common.max_articles + 1;
@@ -519,13 +752,13 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        log_message(_("getting xover %d - %d in %s...\n"),
                    begin, end, item->path);
        if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
-               log_warning(_("can't get xover\n"));
+               log_warning("can't get xover\n");
                return NULL;
        }
 
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
-                       log_warning(_("error occurred while getting xover.\n"));
+                       log_warning("error occurred while getting xover.\n");
                        return newlist;
                }
 
@@ -533,12 +766,13 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
 
                msginfo = news_parse_xover(buf);
                if (!msginfo) {
-                       log_warning(_("invalid xover line: %s\n"), buf);
+                       log_warning("invalid xover line: %s\n", buf);
                        continue;
                }
 
                msginfo->folder = item;
-               msginfo->flags = MSG_NEW|MSG_UNREAD|MSG_NEWS;
+               msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
+               msginfo->flags.tmp_flags = MSG_NEWS;
                msginfo->newsgroups = g_strdup(item->path);
 
                if (!newlist)
@@ -550,7 +784,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        }
 
        if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
-               log_warning(_("can't get xhdr\n"));
+               log_warning("can't get xhdr\n");
                return newlist;
        }
 
@@ -558,7 +792,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
 
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
-                       log_warning(_("error occurred while getting xhdr.\n"));
+                       log_warning("error occurred while getting xhdr.\n");
                        return newlist;
                }
 
@@ -575,7 +809,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        }
 
        if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
-               log_warning(_("can't get xhdr\n"));
+               log_warning("can't get xhdr\n");
                return newlist;
        }
 
@@ -583,7 +817,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
 
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
-                       log_warning(_("error occurred while getting xhdr.\n"));
+                       log_warning("error occurred while getting xhdr.\n");
                        return newlist;
                }
 
@@ -614,13 +848,12 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
 {
        MsgInfo *msginfo;
        gchar buf[NNTPBUFSIZE];
-       gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp;
+       gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp, *xref;
        gchar *p;
        gint num, size_int, line_int;
        gchar *xover_buf;
 
-       Xalloca(xover_buf, strlen(xover_str) + 1, return NULL);
-       strcpy(xover_buf, xover_str);
+       Xstrdup_a(xover_buf, xover_str, return NULL);
 
        PARSE_ONE_PARAM(subject, xover_buf);
        PARSE_ONE_PARAM(sender, subject);
@@ -629,8 +862,9 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
        PARSE_ONE_PARAM(ref, msgid);
        PARSE_ONE_PARAM(size, ref);
        PARSE_ONE_PARAM(line, size);
+       PARSE_ONE_PARAM(xref, line);
 
-       tmp = strchr(line, '\t');
+       tmp = strchr(xref, '\t');
        if (!tmp) tmp = strchr(line, '\r');
        if (!tmp) tmp = strchr(line, '\n');
        if (tmp) *tmp = '\0';
@@ -640,7 +874,7 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
        line_int = atoi(line);
 
        /* set MsgInfo */
-       msginfo = g_new0(MsgInfo, 1);
+       msginfo = procmsg_msginfo_new();
        msginfo->msgnum = num;
        msginfo->size = size_int;
 
@@ -668,6 +902,13 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
                        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;
 }
 
@@ -708,7 +949,7 @@ static GSList *news_delete_old_articles(GSList *alist, FolderItem *item,
 
        if (first < 2) return alist;
 
-       debug_print(_("Deleting cached articles 1 - %d ... "), first - 1);
+       debug_print("Deleting cached articles 1 - %d ...\n", first - 1);
 
        dir = folder_item_get_path(item);
        remove_numbered_files(dir, 1, first - 1);
@@ -737,13 +978,373 @@ static void news_delete_all_articles(FolderItem *item)
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->folder->type == F_NEWS);
 
-       debug_print(_("\tDeleting all cached articles... "));
+       debug_print("Deleting all cached articles...\n");
 
        dir = folder_item_get_path(item);
-       if (!is_dir_exist(dir))
-               make_dir_hier(dir);
        remove_all_numbered_files(dir);
        g_free(dir);
+}
+
+static void news_delete_expired_caches(GSList *alist, 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("Deleting expired cached articles...\n");
+
+       dir = folder_item_get_path(item);
+       remove_expired_files(dir, 24 * 7);
+       g_free(dir);
+}
+
+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 -1;
+       }
+
+       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 (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               log_warning(_("error occurred while getting xover.\n"));
+               return NULL;
+       }
+       
+       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 (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)");
+
+       return msginfo;
+}
+
+/*!
+ *\brief       Set/reset/update progressbar, max. 10 redraws/second
+ *
+ *\param       action What to do with the statusbar
+ *                     = 0 : Reset to zero
+ *                     < 0 : Init maximum to -(action)
+ *                     > 0 : Increase by (action)
+ */
+void news_doprogress(glong action) {
+       static glong curcount=0;
+       static glong maxval;
+       static MainWindow *mainwin=0;
+       static struct timeval tv_prev, tv_cur;
+       
+       if (!mainwin)
+               mainwin = mainwindow_get_mainwindow();
+       g_return_if_fail(mainwin);
+
+       if (action < 0)
+               maxval = -action;
+       else if (action == 0) {
+               curcount=0;
+               gtk_progress_bar_update(
+                       GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
+       } else {
+               curcount += action;
+               gettimeofday(&tv_cur, NULL);
+               if (!(tv_cur.tv_sec - tv_prev.tv_sec > 0 ||
+                       tv_cur.tv_usec - tv_prev.tv_usec > 100)
+                   || !maxval)
+                       return;
+
+               gtk_progress_bar_update(
+                       GTK_PROGRESS_BAR(mainwin->progressbar),
+                       (float)curcount/maxval);
+               while (gtk_events_pending()) gtk_main_iteration ();
+               gettimeofday(&tv_prev, NULL);
+       }
+}
+
+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;
+
+       g_return_val_if_fail(session != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+
+       inc_lock();
+       log_message(_("getting xover %d - %d in %s...\n"),
+                   begin, end, item->path);
+       if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
+               log_warning(_("can't get xover\n"));
+               goto unlock_leave;
+       }
+
+       news_doprogress(-3*(end-begin));
+       statusbar_print_all(_("Getting overview (%d articles)..."),end-begin);
+       for (;;) {
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+                       log_warning(_("error occurred while getting xover.\n"));
+                       goto unlock_leave;
+               }
+               news_doprogress(1);
+
+               if (buf[0] == '.' && buf[1] == '\r') break;
+
+               msginfo = news_parse_xover(buf);
+               if (!msginfo) {
+                       log_warning(_("invalid xover line: %s\n"), buf);
+                       continue;
+               }
+
+               msginfo->folder = item;
+               msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
+               msginfo->flags.tmp_flags = MSG_NEWS;
+               msginfo->newsgroups = g_strdup(item->path);
+
+               if (!newlist)
+                       llast = newlist = g_slist_append(newlist, msginfo);
+               else {
+                       llast = g_slist_append(llast, msginfo);
+                       llast = llast->next;
+               }
+       }
+
+       if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+                       goto unlock_leave;
+       }
+
+       llast = newlist;
+
+       statusbar_pop_all();
+       statusbar_print_all(_("Getting headers (%d articles)..."),end-begin);
+       for (;;) {
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+                       log_warning(_("error occurred while getting xhdr.\n"));
+                       goto unlock_leave;
+               }
+               news_doprogress(1);
+
+               if (buf[0] == '.' && buf[1] == '\r') break;
+               if (!llast) {
+                       g_warning("llast == NULL\n");
+                       continue;
+               }
+
+               msginfo = (MsgInfo *)llast->data;
+               msginfo->to = news_parse_xhdr(buf, msginfo);
+
+               llast = llast->next;
+       }
+
+       if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               goto unlock_leave;
+       }
+
+       llast = newlist;
+
+       statusbar_pop_all();
+       statusbar_print_all(_("Getting crossposted articles (%d messages)..."),end-begin);
+       for (;;) {
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+                       log_warning(_("error occurred while getting xhdr.\n"));
+                       goto unlock_leave;
+               }
+               news_doprogress(1);
+
+               if (buf[0] == '.' && buf[1] == '\r') break;
+               if (!llast) {
+                       g_warning("llast == NULL\n");
+                       continue;
+               }
+
+               msginfo = (MsgInfo *)llast->data;
+               msginfo->cc = news_parse_xhdr(buf, msginfo);
+
+               llast = llast->next;
+       }
+
+unlock_leave:
+       news_doprogress(0);
+       statusbar_pop_all();
+       inc_unlock();
+       return newlist;
+}
+
+gint news_fetch_msgnum_sort(gconstpointer a, gconstpointer b)
+{
+       return (GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b));
+}
+
+GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
+{
+       NNTPSession *session;
+       GSList *elem, *msginfo_list = NULL, *tmp_msgnum_list, *tmp_msginfo_list;
+       guint first, last, next;
+       
+       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);
+
+       tmp_msgnum_list = g_slist_copy(msgnum_list);
+       tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, news_fetch_msgnum_sort);
+
+       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)) {
+                       tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
+                       msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
+                       first = 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);
 
-       debug_print(_("done.\n"));
+       g_slist_free(tmp_msgnum_list);
+       
+       return msginfo_list;
 }