/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <time.h>
-#include "intl.h"
#include "news.h"
+#include "news_gtk.h"
#include "nntp.h"
#include "socket.h"
#include "recv.h"
#include "inputdialog.h"
#include "log.h"
#include "progressindicator.h"
+#include "remotefolder.h"
+#include "alertpanel.h"
+#include "inc.h"
+
#if USE_OPENSSL
# include "ssl.h"
#endif
#define NNTPS_PORT 563
#endif
+typedef struct _NewsFolder NewsFolder;
+
+#define NEWS_FOLDER(obj) ((NewsFolder *)obj)
+
+struct _NewsFolder
+{
+ RemoteFolder rfolder;
+
+ gboolean use_auth;
+ gboolean lock_count;
+};
+
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);
+
+
#if USE_OPENSSL
static Session *news_session_new (const gchar *server,
gushort port,
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,
FolderItem *item,
- GSList **list);
+ GSList **list,
+ gboolean *old_uids_valid);
MsgInfo *news_get_msginfo (Folder *folder,
FolderItem *item,
gint num);
GSList *news_get_msginfos (Folder *folder,
FolderItem *item,
GSList *msgnum_list);
+gboolean news_scan_required (Folder *folder,
+ FolderItem *item);
gint news_post_stream (Folder *folder,
FILE *fp);
+static gchar *news_folder_get_path (Folder *folder);
+gchar *news_item_get_path (Folder *folder,
+ FolderItem *item);
+static void news_synchronise (FolderItem *item);
+static int news_remove_msg (Folder *folder,
+ FolderItem *item,
+ gint msgnum);
+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";
+
+ /* 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.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.remove_msg = news_remove_msg;
+ };
+
+ return &news_class;
+}
+
+static int news_remove_msg (Folder *folder,
+ FolderItem *item,
+ gint msgnum)
+{
+ gchar *path, *filename;
-Folder *news_folder_new(const gchar *name, const gchar *path)
+ g_return_val_if_fail(folder != NULL, -1);
+ g_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);
+ g_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->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);
+ dir = news_folder_get_path(folder);
if (is_dir_exist(dir))
remove_dir_recursive(dir);
g_free(dir);
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
#endif
{
gchar buf[NNTPBUFSIZE];
- NNTPSession *session;
- NNTPSockInfo *nntp_sock;
+ Session *session;
g_return_val_if_fail(server != NULL, NULL);
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);
+ session = nntp_session_new(server, port, buf, userid, passwd, ssl_type);
#else
- if (userid && passwd)
- nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
- else
- nntp_sock = nntp_open(server, port, buf);
+ session = nntp_session_new(server, port, buf, userid, passwd);
#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)->last_access_time = time(NULL);
- SESSION(session)->data = NULL;
-
- SESSION(session)->destroy = news_session_destroy;
-
- session->group = NULL;
-
- return SESSION(session);
-}
-
-void news_session_destroy(Session *session)
-{
- nntp_close(NNTP_SESSION(session)->nntp_sock);
- NNTP_SESSION(session)->nntp_sock = NULL;
- session->sock = NULL;
-
- g_free(NNTP_SESSION(session)->group);
+ return session;
}
static Session *news_session_new_for_folder(Folder *folder)
session = news_session_new(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 Sylpheed-Claws. \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);
#endif
if ((session != NULL) && ac->use_nntp_auth && ac->use_nntp_auth_onconnect)
- nntp_forceauth(NNTP_SESSION(session)->nntp_sock, buf, userid, passwd);
+ nntp_forceauth(NNTP_SESSION(session), buf, userid, passwd);
g_free(passwd);
return session;
}
-NNTPSession *news_session_get(Folder *folder)
+static NNTPSession *news_session_get(Folder *folder)
{
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_CLASS(folder) == &news_class, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
+ if (prefs_common.work_offline &&
+ !inc_offline_should_override(
+ _("Sylpheed-Claws 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);
+ if (time(NULL) - rfolder->session->last_access_time <
+ SESSION_TIMEOUT_INTERVAL) {
return NNTP_SESSION(rfolder->session);
}
- if (nntp_mode(NNTP_SESSION(rfolder->session)->nntp_sock, FALSE)
+ if (nntp_mode(NNTP_SESSION(rfolder->session), FALSE)
!= NN_SUCCESS) {
- log_warning("NNTP connection to %s:%d has been"
- " disconnected. Reconnecting...\n",
+ log_warning(_("NNTP connection to %s:%d has been"
+ " disconnected. Reconnecting...\n"),
folder->account->nntp_server,
folder->account->set_nntpport ?
folder->account->nntpport : NNTP_PORT);
}
if (rfolder->session)
- rfolder->session->last_access_time = time(NULL);
+ session_set_access_time(rfolder->session);
+
return NNTP_SESSION(rfolder->session);
}
-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;
ok = news_select_group(session, item->path, NULL, NULL, NULL);
if (ok != NN_SUCCESS) {
- g_warning("can't select group %s\n", item->path);
+ if (ok == NN_SOCKET) {
+ 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),
num, filename);
- if (ok < 0) {
+ if (ok != NN_SUCCESS) {
g_warning("can't read article %d\n", num);
- session_destroy(SESSION(session));
- REMOTE_FOLDER(folder)->session = NULL;
+ if (ok == NN_SOCKET) {
+ 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)
gchar buf[NNTPBUFSIZE];
g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(folder->type == F_NEWS, NULL);
+ g_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) {
+ if ((fp = g_fopen(filename, "rb")) == NULL) {
NNTPSession *session;
+ gint ok;
session = news_session_get(folder);
if (!session) {
return NULL;
}
- if (nntp_list(session->nntp_sock) != NN_SUCCESS) {
+ ok = nntp_list(session);
+ if (ok != NN_SUCCESS) {
+ if (ok == NN_SOCKET) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
+ }
g_free(filename);
return NULL;
}
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, "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->type == F_NEWS);
+ g_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 ok;
g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->type == F_NEWS, -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) {
+ if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
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(FOLDER_CLASS(folder) == &news_class, -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);
+ ok = nntp_post(session, fp);
if (ok != NN_SUCCESS) {
- log_warning("can't post article.\n");
+ log_warning(_("can't post article.\n"));
+ if (ok == NN_SOCKET) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
+ }
return -1;
}
gint num, gchar *filename)
{
gchar *msgid;
+ gint ok;
- if (nntp_get_article(session->nntp_sock, cmd, num, &msgid)
- != NN_SUCCESS)
- return -1;
+ ok = nntp_get_article(session, cmd, num, &msgid);
+ if (ok != NN_SUCCESS)
+ return ok;
- debug_print("Message-Id = %s, num = %d\n", msgid, num);
+ debug_print("Message-ID = %s, num = %d\n", msgid, num);
g_free(msgid);
- if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
- log_warning("can't retrieve article %d\n", num);
- return -1;
+ ok = recv_write_to_file(SESSION(session)->sock, filename);
+ if (ok < 0) {
+ log_warning(_("can't retrieve article %d\n"), num);
+ if (ok == -2)
+ return NN_SOCKET;
+ else
+ return NN_IOERR;
}
- return 0;
-}
-
-static gint news_remove_msg(Folder *folder, FolderItem *item, gint num)
-{
- 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;
+ return NN_SUCCESS;
}
static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
gint num_, first_, last_;
if (!num || !first || !last) {
- if (session->group && g_strcasecmp(session->group, group) == 0)
+ if (session->group && g_ascii_strcasecmp(session->group, group) == 0)
return NN_SUCCESS;
num = &num_;
first = &first_;
g_free(session->group);
session->group = NULL;
- ok = nntp_group(session->nntp_sock, group, num, first, last);
+ ok = nntp_group(session, group, num, first, last);
if (ok == NN_SUCCESS)
session->group = g_strdup(group);
+ else
+ log_warning(_("can't select group: %s\n"), group);
return ok;
}
static MsgInfo *news_parse_xover(const gchar *xover_str)
{
MsgInfo *msginfo;
- gchar buf[NNTPBUFSIZE];
- gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp, *xref;
+ gchar *subject, *sender, *size, *line, *date, *msgid, *ref, *tmp;
gchar *p;
gint num, size_int, line_int;
gchar *xover_buf;
PARSE_ONE_PARAM(ref, msgid);
PARSE_ONE_PARAM(size, ref);
PARSE_ONE_PARAM(line, size);
- PARSE_ONE_PARAM(xref, line);
-
- tmp = strchr(xref, '\t');
+ /*
+ * PARSE_ONE_PARAM(xref, line);
+ *
+ * if we parse extra headers we should first examine the
+ * LIST OVERVIEW.FMT response from the server. See
+ * RFC2980 for details
+ */
+
+ tmp = strchr(line, '\t');
if (!tmp) tmp = strchr(line, '\r');
if (!tmp) tmp = strchr(line, '\n');
if (tmp) *tmp = '\0';
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->from = conv_unmime_header(sender, NULL);
+ msginfo->fromname = procheader_get_fromname(msginfo->from);
+
+ msginfo->subject = conv_unmime_header(subject, NULL);
+
+ remove_return(msginfo->from);
+ remove_return(msginfo->fromname);
+ remove_return(msginfo->subject);
+
+ if (msgid) {
+ extract_parenthesis(msgid, '<', '>');
+ remove_space(msgid);
+ if (*msgid != '\0')
+ msginfo->msgid = g_strdup(msgid);
+ }
+
+ /* 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 (ref && strlen(ref)) {
+ gchar **ref_tokens = g_strsplit(ref, " ", -1);
+ guint i = 0;
+
+ while (ref_tokens[i]) {
+ gchar *cur_ref = ref_tokens[i];
+ msginfo->references = references_list_append(msginfo->references,
+ cur_ref);
+ i++;
+ }
+ g_strfreev(ref_tokens);
+
+ eliminate_parenthesis(ref, '(', ')');
+ if ((p = strrchr(ref, '<')) != NULL) {
+ extract_parenthesis(p, '<', '>');
+ remove_space(p);
+ if (*p != '\0')
+ msginfo->inreplyto = g_strdup(p);
+ }
+ }
return 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;
}
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;
+
+ g_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;
+}
+
+gchar *news_item_get_path(Folder *folder, FolderItem *item)
+{
+ gchar *folder_path, *path;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
+ folder_path = news_folder_get_path(folder);
+
+ g_return_val_if_fail(folder_path != NULL, NULL);
+ if (folder_path[0] == G_DIR_SEPARATOR) {
+ 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);
+
+ return path;
+}
+
+gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list, gboolean *old_uids_valid)
{
NNTPSession *session;
gint i, ok, num, first, last, nummsgs = 0;
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);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
session = news_session_get(folder);
g_return_val_if_fail(session != NULL, -1);
+ *old_uids_valid = TRUE;
+
+ news_folder_lock(NEWS_FOLDER(item->folder));
+
ok = news_select_group(session, item->path, &num, &first, &last);
if (ok != NN_SUCCESS) {
log_warning(_("can't set group: %s\n"), item->path);
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return -1;
}
- if(last < first) {
+ dir = news_folder_get_path(folder);
+ if (num <= 0)
+ remove_all_numbered_files(dir);
+ else 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++;
+ 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;
}
} \
}
+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)
{
NNTPSession *session;
MsgInfo *msginfo = NULL;
gchar buf[NNTPBUFSIZE];
+ gint ok;
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);
+ 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) {
+ ok = nntp_xover(session, num, num);
+
+ news_folder_lock(NEWS_FOLDER(item->folder));
+
+ if (ok != NN_SUCCESS) {
log_warning(_("can't get xover\n"));
+ if (ok == NN_SOCKET) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return NULL;
}
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xover.\n"));
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return NULL;
}
READ_TO_LISTEND("xover");
- if(!msginfo)
+ if(!msginfo) {
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return NULL;
-
+ }
+
msginfo->folder = item;
- msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
- msginfo->flags.tmp_flags = MSG_NEWS;
+
+ news_set_msg_flags(item, msginfo);
+ msginfo->flags.tmp_flags |= MSG_NEWS;
msginfo->newsgroups = g_strdup(item->path);
- if (nntp_xhdr(session->nntp_sock, "to", num, num) != NN_SUCCESS) {
+ ok = nntp_xhdr(session, "to", num, num);
+ if (ok != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
+ if (ok == NN_SOCKET) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return msginfo;
}
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xhdr.\n"));
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return msginfo;
}
READ_TO_LISTEND("xhdr (to)");
- if (nntp_xhdr(session->nntp_sock, "cc", num, num) != NN_SUCCESS) {
+ ok = nntp_xhdr(session, "cc", num, num);
+ if (ok != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
+ if (ok == NN_SOCKET) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return msginfo;
}
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xhdr.\n"));
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return msginfo;
}
msginfo->cc = news_parse_xhdr(buf, msginfo);
READ_TO_LISTEND("xhdr (cc)");
-
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return msginfo;
}
GSList *newlist = NULL;
GSList *llast = NULL;
MsgInfo *msginfo;
- guint count = 0, lines = (end - begin + 2) * 3;
+ guint count = 0, lines = (end - begin) + 2;
+ gint ok;
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
log_message(_("getting xover %d - %d in %s...\n"),
begin, end, item->path);
- if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
+ ok = nntp_xover(session, begin, end);
+ if (ok != NN_SUCCESS) {
log_warning(_("can't get xover\n"));
+ if (ok == NN_SOCKET) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
return NULL;
}
+ news_folder_lock(NEWS_FOLDER(item->folder));
+
for (;;) {
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xover.\n"));
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return newlist;
}
count++;
}
msginfo->folder = item;
- msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
- msginfo->flags.tmp_flags = MSG_NEWS;
+ news_set_msg_flags(item, msginfo);
+ msginfo->flags.tmp_flags |= MSG_NEWS;
msginfo->newsgroups = g_strdup(item->path);
if (!newlist)
}
}
- if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
+ ok = nntp_xhdr(session, "to", begin, end);
+ if (ok != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
+ if (ok == NN_SOCKET) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return newlist;
}
for (;;) {
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xhdr.\n"));
+ news_folder_unlock(NEWS_FOLDER(item->folder));
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) {
llast = llast->next;
}
- if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
+ ok = nntp_xhdr(session, "cc", begin, end);
+ if (ok != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
+ if (ok == NN_SOCKET) {
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(item->folder)->session = NULL;
+ }
+ news_folder_unlock(NEWS_FOLDER(item->folder));
return newlist;
}
for (;;) {
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xhdr.\n"));
+ news_folder_unlock(NEWS_FOLDER(item->folder));
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) {
llast = llast->next;
}
+ news_folder_unlock(NEWS_FOLDER(item->folder));
- return newlist;
-}
+ session_set_access_time(SESSION(session));
-gint news_fetch_msgnum_sort(gconstpointer a, gconstpointer b)
-{
- return (GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b));
+ return newlist;
}
GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
guint tofetch, fetched;
g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(folder->type == F_NEWS, NULL);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
g_return_val_if_fail(msgnum_list != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
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);
+ tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, g_int_compare);
progressindicator_start(PROGRESS_TYPE_NETWORK);
tofetch = g_slist_length(tmp_msgnum_list);
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)) {
}
last = next;
}
+
+ 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);
return msginfo_list;
}
+
+gboolean news_scan_required(Folder *folder, FolderItem *item)
+{
+ return TRUE;
+}
+
+void news_synchronise(FolderItem *item)
+{
+ news_gtk_synchronise(item);
+}
+
+static gint news_remove_folder(Folder *folder, FolderItem *item)
+{
+ gchar *path;
+
+ g_return_val_if_fail(folder != NULL, -1);
+ g_return_val_if_fail(item != NULL, -1);
+ g_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;
+}
projects / claws.git / blobdiff