#include "prefs_account.h"
#include "inputdialog.h"
#include "alertpanel.h"
-#if USE_SSL
+#include "log.h"
+#include "progressindicator.h"
+#if USE_OPENSSL
# include "ssl.h"
#endif
#define NNTP_PORT 119
-#if USE_SSL
+#if USE_OPENSSL
#define NNTPS_PORT 563
#endif
const gchar *name,
const gchar *path);
-#if USE_SSL
+#if USE_OPENSSL
static Session *news_session_new (const gchar *server,
gushort port,
const gchar *userid,
gint *num,
gint *first,
gint *last);
-static GSList *news_get_uncached_articles(NNTPSession *session,
- FolderItem *item,
- gint cache_last,
- gint *rfirst,
- gint *rlast);
static MsgInfo *news_parse_xover (const gchar *xover_str);
static gchar *news_parse_xhdr (const gchar *xhdr_str,
MsgInfo *msginfo);
-static GSList *news_delete_old_articles (GSList *alist,
- FolderItem *item,
- gint first);
-static void news_delete_all_articles (FolderItem *item);
-static void news_delete_expired_caches (GSList *alist,
- FolderItem *item);
-
static gint news_remove_msg (Folder *folder,
FolderItem *item,
gint num);
-GSList *news_get_num_list (Folder *folder,
- FolderItem *item);
-MsgInfo *news_fetch_msginfo (Folder *folder,
+gint news_get_num_list (Folder *folder,
+ FolderItem *item,
+ GSList **list);
+MsgInfo *news_get_msginfo (Folder *folder,
FolderItem *item,
gint num);
-GSList *news_fetch_msginfos (Folder *folder,
+GSList *news_get_msginfos (Folder *folder,
FolderItem *item,
GSList *msgnum_list);
+gint news_post_stream (Folder *folder,
+ FILE *fp);
+
Folder *news_folder_new(const gchar *name, const gchar *path)
{
Folder *folder;
folder->destroy = news_folder_destroy;
folder->remove_msg = news_remove_msg;
folder->get_num_list = news_get_num_list;
- folder->fetch_msginfo = news_fetch_msginfo;
- folder->fetch_msginfos = news_fetch_msginfos;
+ folder->get_msginfo = news_get_msginfo;
+ folder->get_msginfos = news_get_msginfos;
}
-#if USE_SSL
+#if USE_OPENSSL
static Session *news_session_new(const gchar *server, gushort port,
const gchar *userid, const gchar *passwd,
SSLType ssl_type)
log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
-#if USE_SSL
+#if USE_OPENSSL
if (userid && passwd)
nntp_sock = nntp_open_auth(server, port, buf, userid, passwd,
ssl_type);
const gchar *userid = NULL;
gchar *passwd = NULL;
gushort port;
+ gchar buf[NNTPBUFSIZE];
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
userid);
}
-#if USE_SSL
+#if USE_OPENSSL
port = ac->set_nntpport ? ac->nntpport
: ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
session = news_session_new(ac->nntp_server, port, userid, passwd,
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);
g_free(passwd);
if (!rfolder->session) {
rfolder->session = news_session_new_for_folder(folder);
- statusbar_pop_all();
return NNTP_SESSION(rfolder->session);
}
if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
return NNTP_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"),
+ 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);
- statusbar_pop_all();
return NNTP_SESSION(rfolder->session);
}
-GSList *news_get_article_list(Folder *folder, FolderItem *item,
- gboolean use_cache)
-{
- GSList *alist;
- NNTPSession *session;
-
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(folder->type == F_NEWS, NULL);
-
- session = news_session_get(folder);
-
- if (!session) {
- alist = procmsg_read_cache(item, FALSE);
- item->last_num = procmsg_get_last_num_in_msg_list(alist);
- } else if (use_cache) {
- GSList *newlist;
- gint cache_last;
- gint first, last;
-
- alist = procmsg_read_cache(item, FALSE);
-
- cache_last = procmsg_get_last_num_in_msg_list(alist);
- newlist = news_get_uncached_articles
- (session, item, cache_last, &first, &last);
- if (first == 0 && last == 0) {
- news_delete_all_articles(item);
- procmsg_msg_list_free(alist);
- alist = NULL;
- } else {
- alist = news_delete_old_articles(alist, item, first);
- news_delete_expired_caches(alist, item);
- }
-
- alist = g_slist_concat(alist, newlist);
-
- item->last_num = last;
- } else {
- gint last;
-
- alist = news_get_uncached_articles
- (session, item, 0, NULL, &last);
- news_delete_all_articles(item);
- item->last_num = last;
- }
-
- procmsg_set_flags(alist, item);
-
- statusbar_pop_all();
-
- return alist;
-}
-
gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
{
gchar *path, *filename;
}
ok = news_select_group(session, item->path, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != NN_SUCCESS) {
- g_warning(_("can't select group %s\n"), item->path);
+ g_warning("can't select group %s\n", item->path);
g_free(filename);
return NULL;
}
debug_print("getting article %d...\n", num);
ok = news_get_article(NNTP_SESSION(REMOTE_FOLDER(folder)->session),
num, filename);
- statusbar_pop_all();
if (ok < 0) {
- g_warning(_("can't read article %d\n"), num);
+ g_warning("can't read article %d\n", num);
+ session_destroy(SESSION(session));
+ REMOTE_FOLDER(folder)->session = NULL;
g_free(filename);
return NULL;
}
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;
}
else {
if (min < first)
min = first;
- else if (first < min) {
- num -= min - first;
- first = min;
- }
if (last < max)
max = last;
if (nntp_list(session->nntp_sock) != NN_SUCCESS) {
g_free(filename);
- statusbar_pop_all();
return NULL;
}
- statusbar_pop_all();
if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
- log_warning(_("can't retrieve newsgroup list\n"));
+ log_warning("can't retrieve newsgroup list\n");
session_destroy(SESSION(session));
REMOTE_FOLDER(folder)->session = NULL;
g_free(filename);
list = g_slist_sort(list, (GCompareFunc)news_group_info_compare);
- statusbar_pop_all();
-
return list;
}
gint news_post(Folder *folder, const gchar *file)
{
- NNTPSession *session;
FILE *fp;
gint ok;
g_return_val_if_fail(folder->type == F_NEWS, -1);
g_return_val_if_fail(file != NULL, -1);
- session = news_session_get(folder);
- if (!session) return -1;
-
if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
+ ok = news_post_stream(folder, fp);
+
+ fclose(fp);
+
+ return ok;
+}
+
+gint news_post_stream(Folder *folder, FILE *fp)
+{
+ NNTPSession *session;
+ gint ok;
+
+ g_return_val_if_fail(folder != NULL, -1);
+ g_return_val_if_fail(folder->type == F_NEWS, -1);
+ g_return_val_if_fail(fp != NULL, -1);
+
+ session = news_session_get(folder);
+ if (!session) return -1;
+
ok = nntp_post(session->nntp_sock, fp);
if (ok != NN_SUCCESS) {
- log_warning(_("can't post article.\n"));
+ log_warning("can't post article.\n");
return -1;
}
- fclose(fp);
-
- statusbar_pop_all();
-
return 0;
}
g_free(msgid);
if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
- log_warning(_("can't retrieve article %d\n"), num);
+ log_warning("can't retrieve article %d\n", num);
return -1;
}
gint r;
dir = folder_item_get_path(item);
- printf("removing %d in %s\n",num,dir);
+ debug_print("news_remove_msg: removing msg %d in %s\n",num,dir);
r = remove_numbered_files(dir, num, num);
g_free(dir);
return ok;
}
-static GSList *news_get_uncached_articles(NNTPSession *session,
- FolderItem *item, gint cache_last,
- gint *rfirst, gint *rlast)
-{
- gint ok;
- gint num = 0, first = 0, last = 0, begin = 0, end = 0;
- gchar buf[NNTPBUFSIZE];
- GSList *newlist = NULL;
- GSList *llast = NULL;
- MsgInfo *msginfo;
-
- if (rfirst) *rfirst = -1;
- if (rlast) *rlast = -1;
-
- g_return_val_if_fail(session != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->folder != NULL, NULL);
- g_return_val_if_fail(item->folder->type == F_NEWS, NULL);
-
- 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 NULL;
- }
-
- /* calculate getting overview range */
- if (first > last) {
- log_warning(_("invalid article range: %d - %d\n"),
- first, last);
- return NULL;
- }
-
- if (rfirst) *rfirst = first;
- if (rlast) *rlast = last;
-
- if (cache_last < first)
- begin = first;
- else if (last < cache_last)
- begin = first;
- else if (last == cache_last) {
- debug_print("no new articles.\n");
- return NULL;
- } else
- begin = cache_last + 1;
- end = last;
-
- if (prefs_common.max_articles > 0 &&
- end - begin + 1 > prefs_common.max_articles)
- begin = end - prefs_common.max_articles + 1;
-
- log_message(_("getting xover %d - %d in %s...\n"),
- begin, end, item->path);
- if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xover\n"));
- return NULL;
- }
-
- for (;;) {
- if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
- log_warning(_("error occurred while getting xover.\n"));
- return newlist;
- }
-
- if (buf[0] == '.' && buf[1] == '\r') break;
-
- msginfo = news_parse_xover(buf);
- if (!msginfo) {
- log_warning(_("invalid xover line: %s\n"), buf);
- continue;
- }
-
- msginfo->folder = item;
- msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
- msginfo->flags.tmp_flags = MSG_NEWS;
- msginfo->newsgroups = g_strdup(item->path);
-
- if (!newlist)
- llast = newlist = g_slist_append(newlist, msginfo);
- else {
- llast = g_slist_append(llast, msginfo);
- llast = llast->next;
- }
- }
-
- if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
- 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;
- }
-
- if (buf[0] == '.' && buf[1] == '\r') break;
- if (!llast) {
- g_warning("llast == NULL\n");
- continue;
- }
-
- msginfo = (MsgInfo *)llast->data;
- msginfo->to = news_parse_xhdr(buf, msginfo);
-
- llast = llast->next;
- }
-
- if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
- 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;
- }
-
- if (buf[0] == '.' && buf[1] == '\r') break;
- if (!llast) {
- g_warning("llast == NULL\n");
- continue;
- }
-
- msginfo = (MsgInfo *)llast->data;
- msginfo->cc = news_parse_xhdr(buf, msginfo);
-
- llast = llast->next;
- }
-
- return newlist;
-}
-
#define PARSE_ONE_PARAM(p, srcp) \
{ \
p = strchr(srcp, '\t'); \
return g_strdup(p);
}
-static GSList *news_delete_old_articles(GSList *alist, FolderItem *item,
- gint first)
-{
- GSList *cur, *next;
- MsgInfo *msginfo;
- gchar *dir;
-
- g_return_val_if_fail(item != NULL, alist);
- g_return_val_if_fail(item->folder != NULL, alist);
- g_return_val_if_fail(item->folder->type == F_NEWS, alist);
-
- if (first < 2) return alist;
-
- debug_print("Deleting cached articles 1 - %d ...\n", first - 1);
-
- dir = folder_item_get_path(item);
- remove_numbered_files(dir, 1, first - 1);
- g_free(dir);
-
- for (cur = alist; cur != NULL; ) {
- next = cur->next;
-
- msginfo = (MsgInfo *)cur->data;
- if (msginfo && msginfo->msgnum < first) {
- procmsg_msginfo_free(msginfo);
- alist = g_slist_remove(alist, msginfo);
- }
-
- cur = next;
- }
-
- return alist;
-}
-
-static void news_delete_all_articles(FolderItem *item)
-{
- gchar *dir;
-
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->type == F_NEWS);
-
- debug_print("Deleting all cached articles...\n");
-
- dir = folder_item_get_path(item);
- remove_all_numbered_files(dir);
- g_free(dir);
-}
-
-static void news_delete_expired_caches(GSList *alist, FolderItem *item)
-{
- gchar *dir;
-
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->type == F_NEWS);
-
- debug_print("Deleting expired cached articles...\n");
-
- dir = folder_item_get_path(item);
- remove_expired_files(dir, 24 * 7);
- g_free(dir);
-}
-
gint news_cancel_article(Folder * folder, MsgInfo * msginfo)
{
gchar * tmp;
}
if (change_file_mode_rw(tmpfp, tmp) < 0) {
FILE_OP_ERROR(tmp, "chmod");
- g_warning(_("can't change file mode\n"));
+ g_warning("can't change file mode\n");
}
fprintf(tmpfp, "From: %s\r\n", msginfo->from);
return 0;
}
-GSList *news_get_num_list(Folder *folder, FolderItem *item)
+gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
{
NNTPSession *session;
- gint i, ok, num, first, last;
- GSList *msgnum_list = NULL;
+ gint i, ok, num, first, last, nummsgs = 0;
+ gchar *dir;
+
+ g_return_val_if_fail(item != NULL, -1);
+ g_return_val_if_fail(item->folder != NULL, -1);
+ g_return_val_if_fail(item->folder->type == F_NEWS, -1);
session = news_session_get(folder);
- g_return_val_if_fail(session != NULL, 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(session != NULL, -1);
ok = news_select_group(session, item->path, &num, &first, &last);
if (ok != NN_SUCCESS) {
log_warning(_("can't set group: %s\n"), item->path);
- return NULL;
+ return -1;
}
if(last < first) {
log_warning(_("invalid article range: %d - %d\n"),
first, last);
- return NULL;
+ return 0;
}
for(i = first; i <= last; i++) {
- msgnum_list = g_slist_prepend(msgnum_list, GINT_TO_POINTER(i));
+ *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(i));
+ nummsgs++;
}
- return msgnum_list;
+ 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) \
} \
}
-MsgInfo *news_fetch_msginfo(Folder *folder, FolderItem *item, gint num)
+MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
{
NNTPSession *session;
MsgInfo *msginfo = NULL;
return msginfo;
}
-static GSList *news_fetch_msginfo_from_to(NNTPSession *session, FolderItem *item, guint begin, guint end)
+static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *item, guint begin, guint end)
{
gchar buf[NNTPBUFSIZE];
GSList *newlist = NULL;
GSList *llast = NULL;
MsgInfo *msginfo;
+ guint count = 0, lines = (end - begin + 2) * 3;
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
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));
if (buf[0] == '.' && buf[1] == '\r') break;
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));
if (buf[0] == '.' && buf[1] == '\r') break;
if (!llast) {
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));
if (buf[0] == '.' && buf[1] == '\r') break;
if (!llast) {
return (GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b));
}
-GSList *news_fetch_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
+GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
{
NNTPSession *session;
GSList *elem, *msginfo_list = NULL, *tmp_msgnum_list, *tmp_msginfo_list;
guint first, last, next;
+ guint tofetch, fetched;
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(folder->type == F_NEWS, NULL);
tmp_msgnum_list = g_slist_copy(msgnum_list);
tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, news_fetch_msgnum_sort);
+ progressindicator_start(PROGRESS_TYPE_NETWORK);
+ tofetch = g_slist_length(tmp_msgnum_list);
+ fetched = 0;
+
first = GPOINTER_TO_INT(tmp_msgnum_list->data);
last = first;
for(elem = g_slist_next(tmp_msgnum_list); elem != NULL; elem = g_slist_next(elem)) {
next = GPOINTER_TO_INT(elem->data);
if(next != (last + 1)) {
- tmp_msginfo_list = news_fetch_msginfo_from_to(session, item, first, last);
+ session->fetch_base_percentage = (gfloat) fetched / (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;
first = next;
}
last = next;
}
- tmp_msginfo_list = news_fetch_msginfo_from_to(session, item, first, last);
+ tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
g_slist_free(tmp_msgnum_list);
+ progressindicator_stop(PROGRESS_TYPE_NETWORK);
+
return msginfo_list;
}
projects / claws.git / blobdiff