/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
#include "procheader.h"
#include "folder.h"
#include "session.h"
-#include "statusbar.h"
#include "codeconv.h"
#include "utils.h"
#include "prefs_common.h"
#include "inputdialog.h"
#include "log.h"
#include "progressindicator.h"
+#include "remotefolder.h"
+#include "alertpanel.h"
#if USE_OPENSSL
# include "ssl.h"
#endif
#define NNTPS_PORT 563
#endif
-static Folder *news_folder_new(const gchar * name, const gchar * folder);
-static void news_folder_destroy(Folder * folder);
+typedef struct _NewsFolder NewsFolder;
-static gchar *news_fetch_msg(Folder * folder, FolderItem * item, gint num);
+#define NEWS_FOLDER(obj) ((NewsFolder *)obj)
+
+struct _NewsFolder
+{
+ RemoteFolder rfolder;
+
+ gboolean use_auth;
+};
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,
MsgInfo *msginfo);
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);
gchar *news_item_get_path (Folder *folder,
FolderItem *item);
-FolderClass news_class =
-{
- F_NEWS,
- "news",
- "News",
-
- /* Folder functions */
- news_folder_new,
- news_folder_destroy,
- NULL,
- NULL,
-
- /* FolderItem functions */
- NULL,
- NULL,
- news_item_get_path,
- 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,
- NULL,
- NULL,
- NULL,
-};
+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;
+
+ /* Message functions */
+ news_class.get_msginfo = news_get_msginfo;
+ news_class.get_msginfos = news_get_msginfos;
+ news_class.fetch_msg = news_fetch_msg;
+ };
+
return &news_class;
}
-Folder *news_folder_new(const gchar *name, const gchar *path)
+static Folder *news_folder_new(const gchar *name, const gchar *path)
{
Folder *folder;
return folder;
}
-void news_folder_destroy(Folder *folder)
+static void news_folder_destroy(Folder *folder)
{
gchar *dir;
g_return_val_if_fail(server != NULL, NULL);
- log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
+ log_message("creating NNTP connection to %s:%d ...\n", server, port);
#if USE_OPENSSL
session = nntp_session_new(server, port, buf, userid, passwd, ssl_type);
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_CLASS(folder) == &news_class, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
+ if (prefs_common.work_offline)
+ return NULL;
+
if (!rfolder->session) {
rfolder->session = news_session_new_for_folder(folder);
return NNTP_SESSION(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;
}
if ((fp = fopen(filename, "rb")) == NULL) {
NNTPSession *session;
+ gint ok;
session = news_session_get(folder);
if (!session) {
return NULL;
}
- if (nntp_list(session) != 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;
}
ok = nntp_post(session, fp);
if (ok != NN_SUCCESS) {
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, 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);
g_free(msgid);
- if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
+ ok = recv_write_to_file(SESSION(session)->sock, filename);
+ if (ok < 0) {
log_warning("can't retrieve article %d\n", num);
- return -1;
+ if (ok == -2)
+ return NN_SOCKET;
+ else
+ return NN_IOERR;
}
- return 0;
+ return NN_SUCCESS;
}
static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
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;
}
{
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->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;
}
return path;
}
-gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
+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;
session = news_session_get(folder);
g_return_val_if_fail(session != NULL, -1);
+ *old_uids_valid = TRUE;
+
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 -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("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);
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); \
+ log_warning("error occurred while getting %s.\n", hdr); \
return msginfo; \
} \
}
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->folder != NULL, NULL);
g_return_val_if_fail(FOLDER_CLASS(item->folder) == &news_class, NULL);
- log_message(_("getting xover %d in %s...\n"),
+ log_message("getting xover %d in %s...\n",
num, item->path);
- if (nntp_xover(session, num, num) != NN_SUCCESS) {
- log_warning(_("can't get xover\n"));
+ ok = nntp_xover(session, num, num);
+ 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;
}
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 NULL;
}
msginfo = news_parse_xover(buf);
if (!msginfo) {
- log_warning(_("invalid xover line: %s\n"), buf);
+ log_warning("invalid xover line: %s\n", buf);
}
READ_TO_LISTEND("xover");
msginfo->flags.tmp_flags = MSG_NEWS;
msginfo->newsgroups = g_strdup(item->path);
- if (nntp_xhdr(session, "to", num, num) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
+ 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;
+ }
return msginfo;
}
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 msginfo;
}
READ_TO_LISTEND("xhdr (to)");
- if (nntp_xhdr(session, "cc", num, num) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
+ 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;
+ }
return msginfo;
}
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 msginfo;
}
GSList *llast = NULL;
MsgInfo *msginfo;
guint count = 0, lines = (end - begin + 2) * 3;
+ 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"),
+ log_message("getting xover %d - %d in %s...\n",
begin, end, item->path);
- if (nntp_xover(session, begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xover\n"));
+ 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;
}
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;
}
count++;
msginfo = news_parse_xover(buf);
if (!msginfo) {
- log_warning(_("invalid xover line: %s\n"), buf);
+ log_warning("invalid xover line: %s\n", buf);
continue;
}
}
}
- if (nntp_xhdr(session, "to", begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
+ 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;
+ }
return newlist;
}
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;
}
count++;
llast = llast->next;
}
- if (nntp_xhdr(session, "cc", begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
+ 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;
+ }
return newlist;
}
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;
}
count++;
return msginfo_list;
}
+
+gboolean news_scan_required(Folder *folder, FolderItem *item)
+{
+ return TRUE;
+}
projects / claws.git / blobdiff