/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
+#ifdef HAVE_LIBETPAN
+
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <dirent.h>
#include <unistd.h>
#include <time.h>
+#include <libetpan/libetpan.h>
-#include "intl.h"
+#include "nntp-thread.h"
#include "news.h"
-#include "nntp.h"
+#include "news_gtk.h"
#include "socket.h"
#include "recv.h"
#include "procmsg.h"
#include "inputdialog.h"
#include "log.h"
#include "progressindicator.h"
-#if USE_OPENSSL
+#include "remotefolder.h"
+#include "alertpanel.h"
+#include "inc.h"
+#ifdef USE_GNUTLS
# include "ssl.h"
#endif
#define NNTP_PORT 119
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
#define NNTPS_PORT 563
#endif
-static void news_folder_init (Folder *folder,
- const gchar *name,
- const gchar *path);
+typedef struct _NewsFolder NewsFolder;
+typedef struct _NewsSession NewsSession;
+
+#define NEWS_FOLDER(obj) ((NewsFolder *)obj)
+#define NEWS_SESSION(obj) ((NewsSession *)obj)
+
+struct _NewsFolder
+{
+ RemoteFolder rfolder;
-#if USE_OPENSSL
-static Session *news_session_new (const gchar *server,
+ gboolean use_auth;
+ gboolean lock_count;
+ guint refcnt;
+};
+
+struct _NewsSession
+{
+ Session session;
+ Folder *folder;
+ gchar *group;
+};
+
+static void news_folder_init(Folder *folder, const gchar *name,
+ const gchar *path);
+
+static Folder *news_folder_new (const gchar *name,
+ const gchar *folder);
+static void news_folder_destroy (Folder *folder);
+
+static gchar *news_fetch_msg (Folder *folder,
+ FolderItem *item,
+ gint num);
+static void news_remove_cached_msg (Folder *folder,
+ FolderItem *item,
+ MsgInfo *msginfo);
+#ifdef USE_GNUTLS
+static Session *news_session_new (Folder *folder,
+ const gchar *server,
gushort port,
const gchar *userid,
const gchar *passwd,
SSLType ssl_type);
#else
-static Session *news_session_new (const gchar *server,
+static Session *news_session_new (Folder *folder,
+ const gchar *server,
gushort port,
const gchar *userid,
const gchar *passwd);
#endif
-static gint news_get_article_cmd (NNTPSession *session,
- const gchar *cmd,
- gint num,
- gchar *filename);
-static gint news_get_article (NNTPSession *session,
+static gint news_get_article (Folder *folder,
gint num,
gchar *filename);
-static gint news_select_group (NNTPSession *session,
+static gint news_select_group (Folder *folder,
const gchar *group,
gint *num,
gint *first,
gint *last);
-static MsgInfo *news_parse_xover (const gchar *xover_str);
-static gchar *news_parse_xhdr (const gchar *xhdr_str,
- MsgInfo *msginfo);
-static gint news_remove_msg (Folder *folder,
- FolderItem *item,
- gint num);
-gint news_get_num_list (Folder *folder,
+static MsgInfo *news_parse_xover (struct newsnntp_xover_resp_item *item);
+static gint news_get_num_list (Folder *folder,
FolderItem *item,
- GSList **list);
-MsgInfo *news_get_msginfo (Folder *folder,
+ GSList **list,
+ gboolean *old_uids_valid);
+static MsgInfo *news_get_msginfo (Folder *folder,
FolderItem *item,
gint num);
-GSList *news_get_msginfos (Folder *folder,
+static GSList *news_get_msginfos (Folder *folder,
FolderItem *item,
GSList *msgnum_list);
+static gboolean news_scan_required (Folder *folder,
+ FolderItem *item);
+
+static gchar *news_folder_get_path (Folder *folder);
+static gchar *news_item_get_path (Folder *folder,
+ FolderItem *item);
+static void news_synchronise (FolderItem *item, gint days);
+static int news_remove_msg (Folder *folder,
+ FolderItem *item,
+ gint msgnum);
+static gint news_rename_folder (Folder *folder,
+ FolderItem *item,
+ const gchar *name);
+static gint news_remove_folder (Folder *folder,
+ FolderItem *item);
+static FolderClass news_class;
+
+FolderClass *news_get_class(void)
+{
+ if (news_class.idstr == NULL) {
+ news_class.type = F_NEWS;
+ news_class.idstr = "news";
+ news_class.uistr = "News";
+ news_class.supports_server_search = FALSE;
+
+ /* Folder functions */
+ news_class.new_folder = news_folder_new;
+ news_class.destroy_folder = news_folder_destroy;
+
+ /* FolderItem functions */
+ news_class.item_get_path = news_item_get_path;
+ news_class.get_num_list = news_get_num_list;
+ news_class.scan_required = news_scan_required;
+ news_class.rename_folder = news_rename_folder;
+ news_class.remove_folder = news_remove_folder;
+
+ /* Message functions */
+ news_class.get_msginfo = news_get_msginfo;
+ news_class.get_msginfos = news_get_msginfos;
+ news_class.fetch_msg = news_fetch_msg;
+ news_class.synchronise = news_synchronise;
+ news_class.search_msgs = folder_item_search_msgs_local;
+ news_class.remove_msg = news_remove_msg;
+ news_class.remove_cached_msg = news_remove_cached_msg;
+ };
-gint news_post_stream (Folder *folder,
- FILE *fp);
+ return &news_class;
+}
-FolderClass news_class =
+guint nntp_folder_get_refcnt(Folder *folder)
{
- F_NEWS,
- "news",
- "News",
-
- /* Folder functions */
- news_folder_new,
- news_folder_destroy,
- NULL,
- NULL,
-
- /* FolderItem functions */
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- news_get_num_list,
- NULL,
- NULL,
- NULL,
- NULL,
-
- /* Message functions */
- news_get_msginfo,
- news_get_msginfos,
- news_fetch_msg,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- news_remove_msg,
- NULL,
- NULL,
- NULL,
- NULL,
-};
+ return ((NewsFolder *)folder)->refcnt;
+}
-FolderClass *news_get_class()
+void nntp_folder_ref(Folder *folder)
{
- return &news_class;
+ ((NewsFolder *)folder)->refcnt++;
}
-Folder *news_folder_new(const gchar *name, const gchar *path)
+void nntp_folder_unref(Folder *folder)
+{
+ if (((NewsFolder *)folder)->refcnt > 0)
+ ((NewsFolder *)folder)->refcnt--;
+}
+
+static int news_remove_msg (Folder *folder,
+ FolderItem *item,
+ gint msgnum)
+{
+ gchar *path, *filename;
+
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+
+ path = folder_item_get_path(item);
+ if (!is_dir_exist(path))
+ make_dir_hier(path);
+
+ filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msgnum), NULL);
+ g_free(path);
+ claws_unlink(filename);
+ g_free(filename);
+ return 0;
+}
+
+static void news_folder_lock(NewsFolder *folder)
+{
+ folder->lock_count++;
+}
+
+static void news_folder_unlock(NewsFolder *folder)
+{
+ if (folder->lock_count > 0)
+ folder->lock_count--;
+}
+
+int news_folder_locked(Folder *folder)
+{
+ if (folder == NULL)
+ return 0;
+
+ return NEWS_FOLDER(folder)->lock_count;
+}
+
+static Folder *news_folder_new(const gchar *name, const gchar *path)
{
Folder *folder;
folder = (Folder *)g_new0(NewsFolder, 1);
- folder->class = &news_class;
+ folder->klass = &news_class;
news_folder_init(folder, name, path);
return folder;
}
-void news_folder_destroy(Folder *folder)
+static void news_folder_destroy(Folder *folder)
{
gchar *dir;
- dir = folder_get_path(folder);
+ while (nntp_folder_get_refcnt(folder) > 0)
+ gtk_main_iteration();
+
+ dir = news_folder_get_path(folder);
if (is_dir_exist(dir))
remove_dir_recursive(dir);
g_free(dir);
+ nntp_done(folder);
folder_remote_folder_destroy(REMOTE_FOLDER(folder));
}
folder_remote_folder_init(folder, name, path);
}
-#if USE_OPENSSL
-static Session *news_session_new(const gchar *server, gushort port,
+static void news_session_destroy(Session *session)
+{
+ NewsSession *news_session = NEWS_SESSION(session);
+
+ cm_return_if_fail(session != NULL);
+
+ if (news_session->group)
+ g_free(news_session->group);
+}
+
+static gboolean nntp_ping(gpointer data)
+{
+ Session *session = (Session *)data;
+ NewsSession *news_session = NEWS_SESSION(session);
+ int r;
+ struct tm lt;
+
+ if (session->state != SESSION_READY || news_folder_locked(news_session->folder))
+ return FALSE;
+
+ if ((r = nntp_threaded_date(news_session->folder, <)) != NEWSNNTP_NO_ERROR) {
+ if (r != NEWSNNTP_ERROR_COMMAND_NOT_SUPPORTED &&
+ r != NEWSNNTP_ERROR_COMMAND_NOT_UNDERSTOOD) {
+ log_warning(LOG_PROTOCOL, _("NNTP connection to %s:%d has been"
+ " disconnected.\n"),
+ news_session->folder->account->nntp_server,
+ news_session->folder->account->set_nntpport ?
+ news_session->folder->account->nntpport : NNTP_PORT);
+ REMOTE_FOLDER(news_session->folder)->session = NULL;
+ session_destroy(session);
+ return FALSE;
+ }
+ }
+ session_set_access_time(session);
+ return TRUE;
+}
+
+
+#ifdef USE_GNUTLS
+static Session *news_session_new(Folder *folder, 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,
+static Session *news_session_new(Folder *folder, const gchar *server, gushort port,
const gchar *userid, const gchar *passwd)
#endif
{
- gchar buf[NNTPBUFSIZE];
- NNTPSession *session;
- NNTPSockInfo *nntp_sock;
+ NewsSession *session;
+ int r = 0;
+ cm_return_val_if_fail(server != NULL, NULL);
- g_return_val_if_fail(server != NULL, NULL);
+ log_message(LOG_PROTOCOL, _("Account '%s': Connecting to NNTP server: %s:%d...\n"),
+ folder->account->account_name, server, port);
- log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
+ session = g_new0(NewsSession, 1);
+ session_init(SESSION(session), folder->account, FALSE);
+ SESSION(session)->type = SESSION_NEWS;
+ SESSION(session)->server = g_strdup(server);
+ SESSION(session)->port = port;
+ SESSION(session)->sock = NULL;
+ SESSION(session)->destroy = news_session_destroy;
+
+ nntp_init(folder);
-#if USE_OPENSSL
- if (userid && passwd)
- nntp_sock = nntp_open_auth(server, port, buf, userid, passwd,
- ssl_type);
+#ifdef USE_GNUTLS
+ if (ssl_type != SSL_NONE)
+ r = nntp_threaded_connect_ssl(folder, server, port);
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)
+ r = nntp_threaded_connect(folder, server, port);
+
+ if (r != NEWSNNTP_NO_ERROR) {
+ log_error(LOG_PROTOCOL, _("Error logging in to %s:%d ...\n"), server, port);
+ session_destroy(SESSION(session));
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)->last_access_time = time(NULL);
- SESSION(session)->data = NULL;
-
- SESSION(session)->destroy = news_session_destroy;
-
- session->group = NULL;
+ session->folder = folder;
+ session_register_ping(SESSION(session), nntp_ping);
return SESSION(session);
}
-void news_session_destroy(Session *session)
-{
- nntp_close(NNTP_SESSION(session)->nntp_sock);
- NNTP_SESSION(session)->nntp_sock = NULL;
- session->sock = NULL;
-
- g_free(NNTP_SESSION(session)->group);
-}
-
static Session *news_session_new_for_folder(Folder *folder)
{
Session *session;
const gchar *userid = NULL;
gchar *passwd = NULL;
gushort port;
- gchar buf[NNTPBUFSIZE];
+ int r;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(folder->account != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder->account != NULL, NULL);
ac = folder->account;
if (ac->use_nntp_auth && ac->userid && ac->userid[0]) {
if (ac->passwd && ac->passwd[0])
passwd = g_strdup(ac->passwd);
else
- passwd = input_dialog_query_password(ac->nntp_server,
- userid);
+ passwd = input_dialog_query_password_keep(ac->nntp_server,
+ userid,
+ &(ac->session_passwd));
}
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
port = ac->set_nntpport ? ac->nntpport
: ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
- session = news_session_new(ac->nntp_server, port, userid, passwd,
+ session = news_session_new(folder, ac->nntp_server, port, userid, passwd,
ac->ssl_nntp);
#else
+ if (ac->ssl_nntp != SSL_NONE) {
+ if (alertpanel_full(_("Insecure connection"),
+ _("This connection is configured to be secured "
+ "using SSL, but SSL is not available in this "
+ "build of Claws Mail. \n\n"
+ "Do you want to continue connecting to this "
+ "server? The communication would not be "
+ "secure."),
+ GTK_STOCK_CANCEL, _("Con_tinue connecting"),
+ NULL, FALSE, NULL, ALERT_WARNING,
+ G_ALERTDEFAULT) != G_ALERTALTERNATE)
+ return NULL;
+ }
port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
- session = news_session_new(ac->nntp_server, port, userid, passwd);
+ session = news_session_new(folder, 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);
+ if (session != NULL)
+ r = nntp_threaded_mode_reader(folder);
+ else
+ r = NEWSNNTP_ERROR_CONNECTION_REFUSED;
+
+ if (r != NEWSNNTP_NO_ERROR) {
+ if (r == NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_USERNAME) {
+ /*
+ FIX ME when libetpan implements 480 to indicate authorization
+ is required to use this capability. Libetpan treats a 480 as a
+ 381 which is clearly wrong.
+ RFC 4643 section 2.
+ Response code 480
+ Generic response
+ Meaning: command unavailable until the client
+ has authenticated itself.
+ */
+ /* if the server does not advertise the capability MODE-READER,
+ we normally should not send MODE READER. However this can't
+ hurt: a transit-only server returns 502 and closes the cnx.
+ Ref.: http://tools.ietf.org/html/rfc3977#section-5.3
+ */
+ log_error(LOG_PROTOCOL, _("Libetpan does not support return code 480 "
+ "so for now we choose to continue\n"));
+ }
+ else if (r == NEWSNNTP_ERROR_UNEXPECTED_RESPONSE) {
+ /* if the server does not advertise the capability MODE-READER,
+ we normally should not send MODE READER. However this can't
+ hurt: a transit-only server returns 502 and closes the cnx.
+ Ref.: http://tools.ietf.org/html/rfc3977#section-5.3
+ */
+ log_error(LOG_PROTOCOL, _("Mode reader failed, continuing nevertheless\n"));
+ }
+ else {
+ /* An error state bail out */
+ log_error(LOG_PROTOCOL, _("Error creating session with %s:%d\n"), ac->nntp_server, port);
+ session_destroy(SESSION(session));
+ g_free(passwd);
+ if (ac->session_passwd) {
+ g_free(ac->session_passwd);
+ ac->session_passwd = NULL;
+ }
+ return NULL;
+ }
+ }
+
+ if ((session != NULL) && ac->use_nntp_auth) { /* FIXME: && ac->use_nntp_auth_onconnect */
+ if (nntp_threaded_login(folder, userid, passwd) !=
+ NEWSNNTP_NO_ERROR) {
+ log_error(LOG_PROTOCOL, _("Error authenticating to %s:%d ...\n"), ac->nntp_server, port);
+ session_destroy(SESSION(session));
+ g_free(passwd);
+ if (ac->session_passwd) {
+ g_free(ac->session_passwd);
+ ac->session_passwd = NULL;
+ }
+ return NULL;
+ }
+ }
g_free(passwd);
return session;
}
-NNTPSession *news_session_get(Folder *folder)
+static NewsSession *news_session_get(Folder *folder)
{
RemoteFolder *rfolder = REMOTE_FOLDER(folder);
-
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
- g_return_val_if_fail(folder->account != NULL, NULL);
+
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
+ cm_return_val_if_fail(folder->account != NULL, NULL);
+
+ if (prefs_common.work_offline &&
+ !inc_offline_should_override(FALSE,
+ _("Claws Mail needs network access in order "
+ "to access the News server."))) {
+ return NULL;
+ }
if (!rfolder->session) {
rfolder->session = news_session_new_for_folder(folder);
- return NNTP_SESSION(rfolder->session);
- }
-
- if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
- rfolder->session->last_access_time = time(NULL);
- return NNTP_SESSION(rfolder->session);
+ return NEWS_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",
- folder->account->nntp_server,
- folder->account->set_nntpport ?
- folder->account->nntpport : NNTP_PORT);
+ /* Handle port change (also ssl/nossl change) without needing to
+ * restart application. */
+ if (rfolder->session->port != folder->account->nntpport) {
session_destroy(rfolder->session);
rfolder->session = news_session_new_for_folder(folder);
+ goto newsession;
}
+
+ if (time(NULL) - rfolder->session->last_access_time <
+ SESSION_TIMEOUT_INTERVAL) {
+ return NEWS_SESSION(rfolder->session);
+ }
+
+ if (!nntp_ping(rfolder->session))
+ rfolder->session = news_session_new_for_folder(folder);
+newsession:
if (rfolder->session)
- rfolder->session->last_access_time = time(NULL);
- return NNTP_SESSION(rfolder->session);
+ session_set_access_time(rfolder->session);
+
+ return NEWS_SESSION(rfolder->session);
+}
+
+static void news_remove_cached_msg(Folder *folder, FolderItem *item, MsgInfo *msginfo)
+{
+ gchar *path, *filename;
+
+ path = folder_item_get_path(item);
+
+ if (!is_dir_exist(path)) {
+ g_free(path);
+ return;
+ }
+
+ filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msginfo->msgnum), NULL);
+ g_free(path);
+
+ if (is_file_exist(filename)) {
+ claws_unlink(filename);
+ }
+ g_free(filename);
}
-gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
+static gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
{
gchar *path, *filename;
- NNTPSession *session;
+ NewsSession *session;
gint ok;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
path = folder_item_get_path(item);
if (!is_dir_exist(path))
return NULL;
}
- ok = news_select_group(session, item->path, NULL, NULL, NULL);
- if (ok != NN_SUCCESS) {
- g_warning("can't select group %s\n", item->path);
+ ok = news_select_group(folder, item->path, NULL, NULL, NULL);
+ if (ok != NEWSNNTP_NO_ERROR) {
+ if (ok == NEWSNNTP_ERROR_STREAM) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
+ }
g_free(filename);
return NULL;
}
debug_print("getting article %d...\n", num);
- ok = news_get_article(NNTP_SESSION(REMOTE_FOLDER(folder)->session),
+ ok = news_get_article(folder,
num, filename);
- if (ok < 0) {
+ if (ok != NEWSNNTP_NO_ERROR) {
g_warning("can't read article %d\n", num);
- session_destroy(SESSION(session));
- REMOTE_FOLDER(folder)->session = NULL;
+ if (ok == NEWSNNTP_ERROR_STREAM) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
+ }
g_free(filename);
return NULL;
}
-
+ GTK_EVENTS_FLUSH();
return filename;
}
-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)
{
static gint news_group_info_compare(NewsGroupInfo *ginfo1,
NewsGroupInfo *ginfo2)
{
- return g_strcasecmp(ginfo1->name, ginfo2->name);
+ return g_ascii_strcasecmp(ginfo1->name, ginfo2->name);
}
GSList *news_get_group_list(Folder *folder)
FILE *fp;
GSList *list = NULL;
GSList *last = NULL;
- gchar buf[NNTPBUFSIZE];
+ gchar buf[BUFFSIZE];
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
if (!is_dir_exist(path))
filename = g_strconcat(path, G_DIR_SEPARATOR_S, NEWSGROUP_LIST, NULL);
g_free(path);
- if ((fp = fopen(filename, "rb")) == NULL) {
- NNTPSession *session;
-
+ if ((fp = g_fopen(filename, "rb")) == NULL) {
+ NewsSession *session;
+ gint ok;
+ clist *grouplist = NULL;
+ clistiter *cur;
+ fp = g_fopen(filename, "wb");
+
+ if (!fp) {
+ g_free(filename);
+ return NULL;
+ }
session = news_session_get(folder);
if (!session) {
+ fclose(fp);
g_free(filename);
return NULL;
}
- if (nntp_list(session->nntp_sock) != NN_SUCCESS) {
+ ok = nntp_threaded_list(folder, &grouplist);
+
+ if (ok != NEWSNNTP_NO_ERROR) {
+ if (ok == NEWSNNTP_ERROR_STREAM) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
+ }
+ fclose(fp);
g_free(filename);
return NULL;
}
- if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
- log_warning("can't retrieve newsgroup list\n");
+
+ if (grouplist) {
+ for (cur = clist_begin(grouplist); cur; cur = clist_next(cur)) {
+ struct newsnntp_group_info *info = (struct newsnntp_group_info *)
+ clist_content(cur);
+ if (fprintf(fp, "%s %d %d %c\n",
+ info->grp_name,
+ info->grp_last,
+ info->grp_first,
+ info->grp_type) < 0) {
+ log_error(LOG_PROTOCOL, ("Can't write newsgroup list\n"));
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
+ fclose(fp);
+ g_free(filename);
+ newsnntp_list_free(grouplist);
+ return NULL;
+ }
+ }
+ newsnntp_list_free(grouplist);
+ }
+ if (fclose(fp) == EOF) {
+ log_error(LOG_PROTOCOL, ("Can't write newsgroup list\n"));
session_destroy(SESSION(session));
REMOTE_FOLDER(folder)->session = NULL;
g_free(filename);
return NULL;
}
- if ((fp = fopen(filename, "rb")) == NULL) {
+ if ((fp = g_fopen(filename, "rb")) == NULL) {
FILE_OP_ERROR(filename, "fopen");
g_free(filename);
return NULL;
{
gchar *path, *filename;
- g_return_if_fail(folder != NULL);
- g_return_if_fail(FOLDER_CLASS(folder) == &news_class);
+ cm_return_if_fail(folder != NULL);
+ cm_return_if_fail(FOLDER_CLASS(folder) == &news_class);
path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
filename = g_strconcat(path, G_DIR_SEPARATOR_S, NEWSGROUP_LIST, NULL);
gint news_post(Folder *folder, const gchar *file)
{
- FILE *fp;
gint ok;
+ char *contents = file_read_to_str_no_recode(file);
+ NewsSession *session;
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
- g_return_val_if_fail(file != NULL, -1);
-
- 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_CLASS(folder) == &news_class, -1);
- g_return_val_if_fail(fp != NULL, -1);
-
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
+ cm_return_val_if_fail(contents != 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");
+ if (!session) {
+ g_free(contents);
return -1;
}
+
+ ok = nntp_threaded_post(folder, contents, strlen(contents));
- return 0;
-}
-
-static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
- gint num, gchar *filename)
-{
- gchar *msgid;
-
- if (nntp_get_article(session->nntp_sock, cmd, num, &msgid)
- != NN_SUCCESS)
- return -1;
-
- debug_print("Message-Id = %s, num = %d\n", msgid, num);
- g_free(msgid);
+ g_free(contents);
- if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
- log_warning("can't retrieve article %d\n", num);
- return -1;
+ if (ok == NEWSNNTP_ERROR_STREAM) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
}
- return 0;
+ return (ok == NEWSNNTP_NO_ERROR ? 0 : -1);
}
-static gint news_remove_msg(Folder *folder, FolderItem *item, gint num)
+static gint news_get_article(Folder *folder, gint num, gchar *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);
-
+ size_t len;
+ char *result = NULL;
+ int r;
+
+ r = nntp_threaded_article(folder, num, &result, &len);
+
+ if (r == NEWSNNTP_NO_ERROR) {
+ if (str_write_to_file(result, filename) < 0)
+ return -1;
+ g_free(result);
+ }
+
return r;
}
-static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
-{
- return news_get_article_cmd(session, "ARTICLE", num, filename);
-}
-
/**
* news_select_group:
* @session: Active NNTP session.
*
* Return value: NNTP result code.
**/
-static gint news_select_group(NNTPSession *session, const gchar *group,
+static gint news_select_group(Folder *folder, const gchar *group,
gint *num, gint *first, gint *last)
{
gint ok;
gint num_, first_, last_;
+ struct newsnntp_group_info *info = NULL;
+ NewsSession *session = NEWS_SESSION(news_session_get(folder));
+ cm_return_val_if_fail(session != NULL, -1);
+
if (!num || !first || !last) {
- if (session->group && g_strcasecmp(session->group, group) == 0)
- return NN_SUCCESS;
+ if (session->group && g_ascii_strcasecmp(session->group, group) == 0)
+ return NEWSNNTP_NO_ERROR;
num = &num_;
first = &first_;
last = &last_;
g_free(session->group);
session->group = NULL;
- ok = nntp_group(session->nntp_sock, group, num, first, last);
- if (ok == NN_SUCCESS)
+ ok = nntp_threaded_group(folder, group, &info);
+
+ if (ok == NEWSNNTP_NO_ERROR && info) {
session->group = g_strdup(group);
-
+ *num = info->grp_first;
+ *first = info->grp_first;
+ *last = info->grp_last;
+ newsnntp_group_free(info);
+ } else {
+ log_warning(LOG_PROTOCOL, _("couldn't select group: %s\n"), group);
+ }
return ok;
}
-#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)
+static MsgInfo *news_parse_xover(struct newsnntp_xover_resp_item *item)
{
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;
-
- 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);
- 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--;
- }
+ msginfo->msgnum = item->ovr_article;
+ msginfo->size = item->ovr_size;
+
+ msginfo->date = g_strdup(item->ovr_date);
+ msginfo->date_t = procheader_date_parse(NULL, item->ovr_date, 0);
+
+ msginfo->from = conv_unmime_header(item->ovr_author, NULL, TRUE);
+ msginfo->fromname = procheader_get_fromname(msginfo->from);
+
+ msginfo->subject = conv_unmime_header(item->ovr_subject, NULL, TRUE);
+
+ remove_return(msginfo->from);
+ remove_return(msginfo->fromname);
+ remove_return(msginfo->subject);
+
+ if (item->ovr_message_id) {
+ gchar *tmp = g_strdup(item->ovr_message_id);
+ extract_parenthesis(tmp, '<', '>');
+ remove_space(tmp);
+ if (*tmp != '\0')
+ msginfo->msgid = g_strdup(tmp);
+ g_free(tmp);
+ }
+
+ /* FIXME: this is a quick fix; references' meaning was changed
+ * into having the actual list of references in the References: header.
+ * We need a GSList here, so msginfo_free() and msginfo_copy() can do
+ * their things properly. */
+ if (item->ovr_references && *(item->ovr_references)) {
+ gchar **ref_tokens = g_strsplit(item->ovr_references, " ", -1);
+ guint i = 0;
+ char *tmp;
+ char *p;
+ while (ref_tokens[i]) {
+ gchar *cur_ref = ref_tokens[i];
+ msginfo->references = references_list_append(msginfo->references,
+ cur_ref);
+ i++;
+ }
+ g_strfreev(ref_tokens);
+
+ tmp = g_strdup(item->ovr_references);
+ eliminate_parenthesis(tmp, '(', ')');
+ if ((p = strrchr(tmp, '<')) != NULL) {
+ extract_parenthesis(p, '<', '>');
+ remove_space(p);
+ if (*p != '\0')
+ msginfo->inreplyto = g_strdup(p);
+ }
+ g_free(tmp);
+ }
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);
+ tmp = g_strdup_printf("%s%ccancel%p", get_tmp_dir(),
+ G_DIR_SEPARATOR, msginfo);
if (tmp == NULL)
return -1;
- if ((tmpfp = fopen(tmp, "wb")) == NULL) {
+ if ((tmpfp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
return -1;
}
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");
+ if (fprintf(tmpfp, "From: %s\r\n"
+ "Newsgroups: %s\r\n"
+ "Subject: cmsg cancel <%s>\r\n"
+ "Control: cancel <%s>\r\n"
+ "Approved: %s\r\n"
+ "X-Cancelled-by: %s\r\n"
+ "Date: %s\r\n"
+ "\r\n"
+ "removed with Claws Mail\r\n",
+ msginfo->from,
+ msginfo->newsgroups,
+ msginfo->msgid,
+ msginfo->msgid,
+ msginfo->from,
+ msginfo->from,
+ buf) < 0) {
+ FILE_OP_ERROR(tmp, "fprintf");
+ fclose(tmpfp);
+ claws_unlink(tmp);
+ g_free(tmp);
+ return -1;
+ }
- fclose(tmpfp);
+ if (fclose(tmpfp) == EOF) {
+ FILE_OP_ERROR(tmp, "fclose");
+ claws_unlink(tmp);
+ g_free(tmp);
+ return -1;
+ }
news_post(folder, tmp);
remove(tmp);
return 0;
}
-gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
+static gchar *news_folder_get_path(Folder *folder)
+{
+ gchar *folder_path;
+
+ cm_return_val_if_fail(folder->account != NULL, NULL);
+
+ folder_path = g_strconcat(get_news_cache_dir(),
+ G_DIR_SEPARATOR_S,
+ folder->account->nntp_server,
+ NULL);
+ return folder_path;
+}
+
+static gchar *news_item_get_path(Folder *folder, FolderItem *item)
{
- NNTPSession *session;
+ gchar *folder_path, *path;
+
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ folder_path = news_folder_get_path(folder);
+
+ cm_return_val_if_fail(folder_path != NULL, NULL);
+ if (g_path_is_absolute(folder_path)) {
+ if (item->path)
+ path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+ item->path, NULL);
+ else
+ path = g_strdup(folder_path);
+ } else {
+ if (item->path)
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+ folder_path, G_DIR_SEPARATOR_S,
+ item->path, NULL);
+ else
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+ folder_path, NULL);
+ }
+ g_free(folder_path);
+#ifdef G_OS_WIN32
+ while (strchr(path, '/'))
+ *strchr(path, '/') = '\\';
+#endif
+ return path;
+}
+
+static gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list, gboolean *old_uids_valid)
+{
+ NewsSession *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(FOLDER_CLASS(folder) == &news_class, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->folder != NULL, -1);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
session = news_session_get(folder);
- g_return_val_if_fail(session != NULL, -1);
+ cm_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);
+ *old_uids_valid = TRUE;
+
+ news_folder_lock(NEWS_FOLDER(item->folder));
+
+ ok = news_select_group(folder, item->path, &num, &first, &last);
+ if (ok != NEWSNNTP_NO_ERROR) {
+ log_warning(LOG_PROTOCOL, _("couldn't set group: %s\n"), item->path);
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return -1;
}
- if(last < first) {
- log_warning(_("invalid article range: %d - %d\n"),
+ dir = news_folder_get_path(folder);
+ if (num <= 0)
+ remove_all_numbered_files(dir);
+ else if (last < first)
+ log_warning(LOG_PROTOCOL, _("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++;
+ else {
+ for (i = first; i <= last; i++) {
+ *msgnum_list = g_slist_prepend(*msgnum_list,
+ GINT_TO_POINTER(i));
+ nummsgs++;
+ }
+ debug_print("removing old messages from %d to %d in %s\n",
+ first, last, dir);
+ remove_numbered_files(dir, 1, first - 1);
}
-
- 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);
-
+ news_folder_unlock(NEWS_FOLDER(item->folder));
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; \
- } \
+static void news_set_msg_flags(FolderItem *item, MsgInfo *msginfo)
+{
+ msginfo->flags.tmp_flags = 0;
+ if (item->folder->account->mark_crosspost_read && msginfo->msgid) {
+ if (item->folder->newsart &&
+ g_hash_table_lookup(item->folder->newsart, msginfo->msgid) != NULL) {
+ msginfo->flags.perm_flags = MSG_COLORLABEL_TO_FLAGS(item->folder->account->crosspost_col);
+
+ } else {
+ if (!item->folder->newsart)
+ item->folder->newsart = g_hash_table_new(g_str_hash, g_str_equal);
+ g_hash_table_insert(item->folder->newsart,
+ g_strdup(msginfo->msgid), GINT_TO_POINTER(1));
+ msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
+ }
+ } else {
+ msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
}
+}
-MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
+static void news_get_extra_fields(NewsSession *session, FolderItem *item, GSList *msglist)
{
- 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(FOLDER_CLASS(item->folder) == &news_class, 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;
- }
+ gint ok;
+ GSList *cur;
+ clist *hdrlist = NULL;
+ clistiter *hdr;
+ gint first = -1, last = -1;
+ GHashTable *hash_table;
- msginfo = news_parse_xover(buf);
- if (!msginfo) {
- log_warning(_("invalid xover line: %s\n"), buf);
- }
+ cm_return_if_fail(session != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(FOLDER_CLASS(item->folder) == &news_class);
- READ_TO_LISTEND("xover");
+ news_folder_lock(NEWS_FOLDER(item->folder));
- if(!msginfo)
- return NULL;
+ hash_table = g_hash_table_new(g_direct_hash, g_direct_equal);
- 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;
+ for (cur = msglist; cur; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ if (first == -1 || msginfo->msgnum < first)
+ first = msginfo->msgnum;
+ if (last == -1 || msginfo->msgnum > last)
+ last = msginfo->msgnum;
+ g_hash_table_insert(hash_table,
+ GINT_TO_POINTER(msginfo->msgnum), msginfo);
}
- if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
- log_warning(_("error occurred while getting xhdr.\n"));
- return msginfo;
- }
+/* Newsgroups */
+ ok = nntp_threaded_xhdr(item->folder, "newsgroups", first, last, &hdrlist);
- msginfo->to = news_parse_xhdr(buf, msginfo);
+ if (ok != NEWSNNTP_NO_ERROR) {
+ log_warning(LOG_PROTOCOL, _("couldn't get xhdr\n"));
+ if (ok == NEWSNNTP_ERROR_STREAM) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
+ return;
+ }
- READ_TO_LISTEND("xhdr (to)");
+ for (hdr = clist_begin(hdrlist); hdr; hdr = clist_next(hdr)) {
+ struct newsnntp_xhdr_resp_item *hdrval = clist_content(hdr);
+ msginfo = g_hash_table_lookup(hash_table, GINT_TO_POINTER(hdrval->hdr_article));
+ if (msginfo) {
+ if (msginfo->newsgroups)
+ g_free(msginfo->newsgroups);
+ msginfo->newsgroups = g_strdup(hdrval->hdr_value);
+ }
+ }
+ newsnntp_xhdr_free(hdrlist);
+
+/* To */
+ ok = nntp_threaded_xhdr(item->folder, "to", first, last, &hdrlist);
- if (nntp_xhdr(session->nntp_sock, "cc", num, num) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
- return msginfo;
+ if (ok != NEWSNNTP_NO_ERROR) {
+ log_warning(LOG_PROTOCOL, _("couldn't get xhdr\n"));
+ if (ok == NEWSNNTP_ERROR_STREAM) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
+ return;
}
- if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
- log_warning(_("error occurred while getting xhdr.\n"));
- return msginfo;
+ for (hdr = clist_begin(hdrlist); hdr; hdr = clist_next(hdr)) {
+ struct newsnntp_xhdr_resp_item *hdrval = clist_content(hdr);
+ msginfo = g_hash_table_lookup(hash_table, GINT_TO_POINTER(hdrval->hdr_article));
+ if (msginfo) {
+ if (msginfo->to)
+ g_free(msginfo->to);
+ msginfo->to = g_strdup(hdrval->hdr_value);
+ }
}
+ newsnntp_xhdr_free(hdrlist);
+
+/* Cc */
+ ok = nntp_threaded_xhdr(item->folder, "cc", first, last, &hdrlist);
- msginfo->cc = news_parse_xhdr(buf, msginfo);
+ if (ok != NEWSNNTP_NO_ERROR) {
+ log_warning(LOG_PROTOCOL, _("couldn't get xhdr\n"));
+ if (ok == NEWSNNTP_ERROR_STREAM) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
+ return;
+ }
- READ_TO_LISTEND("xhdr (cc)");
+ for (hdr = clist_begin(hdrlist); hdr; hdr = clist_next(hdr)) {
+ struct newsnntp_xhdr_resp_item *hdrval = clist_content(hdr);
+ msginfo = g_hash_table_lookup(hash_table, GINT_TO_POINTER(hdrval->hdr_article));
+ if (msginfo) {
+ if (msginfo->cc)
+ g_free(msginfo->cc);
+ msginfo->cc = g_strdup(hdrval->hdr_value);
+ }
+ }
+ newsnntp_xhdr_free(hdrlist);
+
- return msginfo;
+ g_hash_table_destroy(hash_table);
+ news_folder_unlock(NEWS_FOLDER(item->folder));
}
-static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *item, guint begin, guint end)
+static GSList *news_get_msginfos_for_range(NewsSession *session, FolderItem *item, guint begin, guint end)
{
- gchar buf[NNTPBUFSIZE];
GSList *newlist = NULL;
GSList *llast = NULL;
MsgInfo *msginfo;
- guint count = 0, lines = (end - begin + 2) * 3;
-
- g_return_val_if_fail(session != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ gint ok;
+ clist *msglist = NULL;
+ clistiter *cur;
+ cm_return_val_if_fail(session != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
- log_message(_("getting xover %d - %d in %s...\n"),
+ log_message(LOG_PROTOCOL, _("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"));
+
+ news_folder_lock(NEWS_FOLDER(item->folder));
+
+ ok = news_select_group(item->folder, item->path, NULL, NULL, NULL);
+ if (ok != NEWSNNTP_NO_ERROR) {
+ log_warning(LOG_PROTOCOL, _("couldn't set group: %s\n"), item->path);
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return NULL;
}
- for (;;) {
- if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
- 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)) * session->fetch_total_percentage);
-
- 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;
+ ok = nntp_threaded_xover(item->folder, begin, end, NULL, &msglist);
+
+ if (ok != NEWSNNTP_NO_ERROR) {
+ log_warning(LOG_PROTOCOL, _("couldn't get xover\n"));
+ if (ok == NEWSNNTP_ERROR_STREAM) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
}
+ news_folder_unlock(NEWS_FOLDER(item->folder));
+ return NULL;
}
- if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
- return newlist;
- }
-
- llast = newlist;
-
- for (;;) {
- if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
- 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)) * session->fetch_total_percentage);
-
- if (buf[0] == '.' && buf[1] == '\r') break;
- if (!llast) {
- g_warning("llast == NULL\n");
- continue;
+ if (msglist) {
+ for (cur = clist_begin(msglist); cur; cur = clist_next(cur)) {
+ struct newsnntp_xover_resp_item *ritem = (struct newsnntp_xover_resp_item *)clist_content(cur);
+ msginfo = news_parse_xover(ritem);
+
+ if (!msginfo) {
+ log_warning(LOG_PROTOCOL, _("invalid xover line\n"));
+ continue;
+ }
+
+ msginfo->folder = item;
+ news_set_msg_flags(item, msginfo);
+ msginfo->flags.tmp_flags |= MSG_NEWS;
+
+ if (!newlist)
+ llast = newlist = g_slist_append(newlist, msginfo);
+ else {
+ llast = g_slist_append(llast, msginfo);
+ llast = llast->next;
+ }
}
-
- msginfo = (MsgInfo *)llast->data;
- msginfo->to = news_parse_xhdr(buf, msginfo);
-
- llast = llast->next;
+ newsnntp_xover_resp_list_free(msglist);
}
- if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
- return newlist;
- }
-
- llast = newlist;
-
- for (;;) {
- if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
- 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)) * session->fetch_total_percentage);
-
- if (buf[0] == '.' && buf[1] == '\r') break;
- if (!llast) {
- g_warning("llast == NULL\n");
- continue;
- }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
- msginfo = (MsgInfo *)llast->data;
- msginfo->cc = news_parse_xhdr(buf, msginfo);
-
- llast = llast->next;
- }
+ session_set_access_time(SESSION(session));
+ news_get_extra_fields(session, item, newlist);
+
return newlist;
}
-gint news_fetch_msgnum_sort(gconstpointer a, gconstpointer b)
+static MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
{
- return (GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b));
+ GSList *msglist = NULL;
+ NewsSession *session;
+ MsgInfo *msginfo = NULL;
+
+ session = news_session_get(folder);
+ cm_return_val_if_fail(session != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item->folder != NULL, NULL);
+ cm_return_val_if_fail(FOLDER_CLASS(item->folder) == &news_class, NULL);
+
+ msglist = news_get_msginfos_for_range(session, item, num, num);
+
+ if (msglist)
+ msginfo = msglist->data;
+
+ g_slist_free(msglist);
+
+ return msginfo;
}
-GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
+static GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
{
- NNTPSession *session;
+ NewsSession *session;
GSList *elem, *msginfo_list = NULL, *tmp_msgnum_list, *tmp_msginfo_list;
guint first, last, next;
- guint tofetch, fetched;
+/* guint tofetch, fetched;
+*/
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
- g_return_val_if_fail(msgnum_list != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
+ cm_return_val_if_fail(msgnum_list != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
session = news_session_get(folder);
- g_return_val_if_fail(session != NULL, NULL);
+ cm_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);
+ tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, g_int_compare);
progressindicator_start(PROGRESS_TYPE_NETWORK);
- tofetch = g_slist_length(tmp_msgnum_list);
+/* tofetch = g_slist_length(tmp_msgnum_list);
fetched = 0;
+*/
first = GPOINTER_TO_INT(tmp_msgnum_list->data);
last = first;
+
+ news_folder_lock(NEWS_FOLDER(item->folder));
+
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);
+/* session->fetch_base_percentage = ((gfloat) fetched) / ((gfloat) tofetch);
session->fetch_total_percentage = ((gfloat) (last - first + 1)) / ((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;
+/* fetched = last - first + 1;
+*/
first = next;
}
last = next;
}
- session->fetch_base_percentage = ((gfloat) fetched) / ((gfloat) tofetch);
+
+ news_folder_unlock(NEWS_FOLDER(item->folder));
+
+/* session->fetch_base_percentage = ((gfloat) fetched) / ((gfloat) tofetch);
session->fetch_total_percentage = ((gfloat) (last - first + 1)) / ((gfloat) tofetch);
+*/
tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
return msginfo_list;
}
+
+static gboolean news_scan_required(Folder *folder, FolderItem *item)
+{
+ return TRUE;
+}
+
+void news_synchronise(FolderItem *item, gint days)
+{
+ news_gtk_synchronise(item, days);
+}
+
+static gint news_rename_folder(Folder *folder, FolderItem *item,
+ const gchar *name)
+{
+ gchar *path;
+
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->path != NULL, -1);
+ cm_return_val_if_fail(name != NULL, -1);
+
+ path = folder_item_get_path(item);
+ if (!is_dir_exist(path))
+ make_dir_hier(path);
+
+ g_free(item->name);
+ item->name = g_strdup(name);
+
+ return 0;
+}
+
+static gint news_remove_folder(Folder *folder, FolderItem *item)
+{
+ gchar *path;
+
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->path != NULL, -1);
+
+ path = folder_item_get_path(item);
+ if (remove_dir_recursive(path) < 0) {
+ g_warning("can't remove directory `%s'\n", path);
+ g_free(path);
+ return -1;
+ }
+
+ g_free(path);
+ folder_item_remove(item);
+ return 0;
+}
+
+void nntp_disconnect_all(gboolean have_connectivity)
+{
+ GList *list;
+ gboolean short_timeout;
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ GError *error;
+#endif
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ error = NULL;
+ short_timeout = !networkmanager_is_online(&error);
+ if(error) {
+ short_timeout = TRUE;
+ g_error_free(error);
+ }
+#else
+ short_timeout = TRUE;
+#endif
+
+ if(short_timeout)
+ nntp_main_set_timeout(1);
+
+ for (list = account_get_list(); list != NULL; list = list->next) {
+ PrefsAccount *account = list->data;
+ if (account->protocol == A_NNTP) {
+ RemoteFolder *folder = (RemoteFolder *)account->folder;
+ if (folder && folder->session) {
+ NewsSession *session = (NewsSession *)folder->session;
+ if (have_connectivity)
+ nntp_threaded_disconnect(FOLDER(folder));
+ SESSION(session)->state = SESSION_DISCONNECTED;
+ SESSION(session)->sock = NULL;
+ session_destroy(SESSION(session));
+ folder->session = NULL;
+ }
+ }
+ }
+
+ if(short_timeout)
+ nntp_main_set_timeout(prefs_common.io_timeout_secs);
+}
+
+#else
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include "folder.h"
+#include "alertpanel.h"
+
+static FolderClass news_class;
+
+static void warn_etpan(void)
+{
+ static gboolean missing_news_warning = TRUE;
+ if (missing_news_warning) {
+ missing_news_warning = FALSE;
+ alertpanel_error(
+ _("You have one or more News accounts "
+ "defined. However this version of "
+ "Claws Mail has been built without "
+ "News support; your News account(s) are "
+ "disabled.\n\n"
+ "You probably need to "
+ "install libetpan and recompile "
+ "Claws Mail."));
+ }
+}
+static Folder *news_folder_new(const gchar *name, const gchar *path)
+{
+ warn_etpan();
+ return NULL;
+}
+void news_group_list_free(GSList *group_list)
+{
+ warn_etpan();
+}
+void news_remove_group_list_cache(Folder *folder)
+{
+ warn_etpan();
+}
+int news_folder_locked(Folder *folder)
+{
+ warn_etpan();
+ return 0;
+}
+gint news_post(Folder *folder, const gchar *file)
+{
+ warn_etpan();
+ return -1;
+}
+
+gint news_cancel_article(Folder * folder, MsgInfo * msginfo)
+{
+ warn_etpan();
+ return -1;
+}
+
+GSList *news_get_group_list(Folder *folder)
+{
+ warn_etpan();
+ return NULL;
+}
+
+
+FolderClass *news_get_class(void)
+{
+ if (news_class.idstr == NULL) {
+ news_class.type = F_NEWS;
+ news_class.idstr = "news";
+ news_class.uistr = "News";
+
+ /* Folder functions */
+ news_class.new_folder = news_folder_new;
+ };
+
+ return &news_class;
+}
+
+void nntp_disconnect_all(gboolean have_connectivity)
+{
+}
+
+#endif
projects / claws.git / blobdiff