#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
+typedef struct _NewsFolder NewsFolder;
+
+#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,
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);
-FolderClass news_class =
+static FolderClass news_class =
{
F_NEWS,
"news",
news_folder_destroy,
NULL,
NULL,
+ NULL,
+ NULL,
/* FolderItem functions */
NULL,
NULL,
NULL,
NULL,
+ news_item_get_path,
NULL,
- news_get_num_list,
NULL,
NULL,
NULL,
+ news_get_num_list,
+ NULL,
+ NULL,
NULL,
+ news_scan_required,
/* Message functions */
news_get_msginfo,
NULL,
NULL,
NULL,
- news_remove_msg,
- NULL,
NULL,
NULL,
NULL,
};
-FolderClass *news_get_class()
+FolderClass *news_get_class(void)
{
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;
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);
+ dir = news_folder_get_path(folder);
if (is_dir_exist(dir))
remove_dir_recursive(dir);
g_free(dir);
#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_new0(NNTPSession, 1);
- session_init(SESSION(session));
- SESSION(session)->type = SESSION_NEWS;
- SESSION(session)->server = g_strdup(server);
- SESSION(session)->sock = NULL;
- SESSION(session)->data = NULL;
-
- SESSION(session)->destroy = news_session_destroy;
-
- session->nntp_sock = nntp_sock;
- 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;
-
- 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);
#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_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);
}
- 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",
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;
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)
{
return NULL;
}
- if (nntp_list(session->nntp_sock) != NN_SUCCESS) {
+ if (nntp_list(session) != NN_SUCCESS) {
g_free(filename);
return NULL;
}
- if (recv_write_to_file
- (session->nntp_sock->sock, filename) < 0) {
+ if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
log_warning("can't retrieve newsgroup list\n");
session_destroy(SESSION(session));
REMOTE_FOLDER(folder)->session = NULL;
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");
return -1;
{
gchar *msgid;
- if (nntp_get_article(session->nntp_sock, cmd, num, &msgid)
+ if (nntp_get_article(session, cmd, num, &msgid)
!= NN_SUCCESS)
return -1;
debug_print("Message-Id = %s, num = %d\n", msgid, num);
g_free(msgid);
- if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
+ if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
log_warning("can't retrieve article %d\n", num);
return -1;
}
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;
-}
-
static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
{
return news_get_article_cmd(session, "ARTICLE", num, filename);
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);
{
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 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;
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);
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);
return nummsgs;
log_message(_("getting xover %d in %s...\n"),
num, item->path);
- if (nntp_xover(session->nntp_sock, num, num) != NN_SUCCESS) {
+ if (nntp_xover(session, num, num) != NN_SUCCESS) {
log_warning(_("can't get xover\n"));
return NULL;
}
msginfo->flags.tmp_flags = MSG_NEWS;
msginfo->newsgroups = g_strdup(item->path);
- if (nntp_xhdr(session->nntp_sock, "to", num, num) != NN_SUCCESS) {
+ if (nntp_xhdr(session, "to", num, num) != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
return msginfo;
}
READ_TO_LISTEND("xhdr (to)");
- if (nntp_xhdr(session->nntp_sock, "cc", num, num) != NN_SUCCESS) {
+ if (nntp_xhdr(session, "cc", num, num) != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
return msginfo;
}
log_message(_("getting xover %d - %d in %s...\n"),
begin, end, item->path);
- if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
+ if (nntp_xover(session, begin, end) != NN_SUCCESS) {
log_warning(_("can't get xover\n"));
return NULL;
}
}
}
- if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
+ if (nntp_xhdr(session, "to", begin, end) != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
return newlist;
}
llast = llast->next;
}
- if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
+ if (nntp_xhdr(session, "cc", begin, end) != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
return newlist;
}
return newlist;
}
-gint news_fetch_msgnum_sort(gconstpointer a, gconstpointer b)
-{
- return (GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b));
-}
-
GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
{
NNTPSession *session;
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);
return msginfo_list;
}
+
+gboolean news_scan_required(Folder *folder, FolderItem *item)
+{
+ return TRUE;
+}
projects / claws.git / blobdiff