#include "prefs_account.h"
#include "inputdialog.h"
#include "alertpanel.h"
-#if USE_SSL
+#include "log.h"
+#include "mainwindow.h"
+#include "inc.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,
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;
return folder;
}
-void news_folder_destroy(NewsFolder *folder)
+void news_folder_destroy(Folder *folder)
{
+ gchar *dir;
+
+ dir = folder_get_path(folder);
+ if (is_dir_exist(dir))
+ remove_dir_recursive(dir);
+ g_free(dir);
+
folder_remote_folder_destroy(REMOTE_FOLDER(folder));
}
/*
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->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);
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(NNTPSession *session)
+void news_session_destroy(Session *session)
{
- nntp_close(session->nntp_sock);
- session->nntp_sock = NULL;
- SESSION(session)->sock = NULL;
+ nntp_close(NNTP_SESSION(session)->nntp_sock);
+ NNTP_SESSION(session)->nntp_sock = NULL;
+ session->sock = NULL;
- g_free(session->group);
+ g_free(NNTP_SESSION(session)->group);
}
static Session *news_session_new_for_folder(Folder *folder)
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 (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);
}
procmsg_set_flags(alist, item);
- statusbar_pop_all();
-
return alist;
}
g_free(path);
if (is_file_exist(filename)) {
- debug_print(_("article %d has been already cached.\n"), num);
+ debug_print("article %d has been already cached.\n", num);
return 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);
+ 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);
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);
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 NULL;
}
/* calculate getting overview range */
if (first > last) {
- log_warning(_("invalid article range: %d - %d\n"),
+ log_warning("invalid article range: %d - %d\n",
first, last);
return NULL;
}
else if (last < cache_last)
begin = first;
else if (last == cache_last) {
- debug_print(_("no new articles.\n"));
+ debug_print("no new articles.\n");
return NULL;
} else
begin = cache_last + 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"));
+ 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"));
+ log_warning("error occurred while getting xover.\n");
return newlist;
}
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->nntp_sock, "to", begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
+ log_warning("can't get xhdr\n");
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;
}
}
if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
- log_warning(_("can't get xhdr\n"));
+ log_warning("can't get xhdr\n");
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;
}
}
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)
+/*!
+ *\brief Set/reset/update progressbar, max. 10 redraws/second
+ *
+ *\param action What to do with the statusbar
+ * = 0 : Reset to zero
+ * < 0 : Init maximum to -(action)
+ * > 0 : Increase by (action)
+ */
+void news_doprogress(glong action) {
+ static glong curcount=0;
+ static glong maxval;
+ static MainWindow *mainwin=0;
+ static struct timeval tv_prev, tv_cur;
+
+ if (!mainwin)
+ mainwin = mainwindow_get_mainwindow();
+ g_return_if_fail(mainwin);
+
+ if (action < 0)
+ maxval = -action;
+ else if (action == 0) {
+ curcount=0;
+ gtk_progress_bar_update(
+ GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
+ } else {
+ curcount += action;
+ gettimeofday(&tv_cur, NULL);
+ if (!(tv_cur.tv_sec - tv_prev.tv_sec > 0 ||
+ tv_cur.tv_usec - tv_prev.tv_usec > 100)
+ || !maxval)
+ return;
+
+ gtk_progress_bar_update(
+ GTK_PROGRESS_BAR(mainwin->progressbar),
+ (float)curcount/maxval);
+ while (gtk_events_pending()) gtk_main_iteration ();
+ gettimeofday(&tv_prev, NULL);
+ }
+}
+
+static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *item, guint begin, guint end)
{
gchar buf[NNTPBUFSIZE];
GSList *newlist = NULL;
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
+ inc_lock();
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;
+ goto unlock_leave;
}
+ news_doprogress(-3*(end-begin));
+ statusbar_print_all(_("Getting overview (%d articles)..."),end-begin);
for (;;) {
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xover.\n"));
- return newlist;
+ goto unlock_leave;
}
+ news_doprogress(1);
if (buf[0] == '.' && buf[1] == '\r') break;
if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
- return newlist;
+ goto unlock_leave;
}
llast = newlist;
+ statusbar_pop_all();
+ statusbar_print_all(_("Getting headers (%d articles)..."),end-begin);
for (;;) {
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xhdr.\n"));
- return newlist;
+ goto unlock_leave;
}
+ news_doprogress(1);
if (buf[0] == '.' && buf[1] == '\r') break;
if (!llast) {
if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
- return newlist;
+ goto unlock_leave;
}
llast = newlist;
+ statusbar_pop_all();
+ statusbar_print_all(_("Getting crossposted articles (%d messages)..."),end-begin);
for (;;) {
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xhdr.\n"));
- return newlist;
+ goto unlock_leave;
}
+ news_doprogress(1);
if (buf[0] == '.' && buf[1] == '\r') break;
if (!llast) {
llast = llast->next;
}
+unlock_leave:
+ news_doprogress(0);
+ statusbar_pop_all();
+ inc_unlock();
return newlist;
}
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;
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);
+ tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
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);
projects / claws.git / blobdiff