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);
+gint news_get_num_list (Folder *folder,
+ FolderItem *item,
+ GSList **list);
MsgInfo *news_fetch_msginfo (Folder *folder,
FolderItem *item,
gint num);
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;
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)
if (!session) {
alist = procmsg_read_cache(item, FALSE);
- item->last_num = procmsg_get_last_num_in_cache(alist);
+ item->last_num = procmsg_get_last_num_in_msg_list(alist);
} else if (use_cache) {
GSList *newlist;
gint cache_last;
alist = procmsg_read_cache(item, FALSE);
- cache_last = procmsg_get_last_num_in_cache(alist);
+ cache_last = procmsg_get_last_num_in_msg_list(alist);
newlist = news_get_uncached_articles
(session, item, cache_last, &first, &last);
- alist = news_delete_old_articles(alist, item, first);
+ 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;
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;
}
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();
else {
if (min < first)
min = first;
- else if (first < min) {
- num -= min - first;
- first = min;
- }
if (last < max)
max = last;
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);
+
+ statusbar_pop_all();
+
+ 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"));
return -1;
}
- fclose(fp);
-
- statusbar_pop_all();
-
return 0;
}
static gint news_remove_msg(Folder *folder, FolderItem *item, gint num)
{
- MsgInfo * msginfo;
- gchar * filename;
- MsgFlags msgflags = { 0, 0 };
+ gchar * dir;
gint r;
- filename = folder_item_fetch_msg(item, num);
- if (filename == NULL)
- return -1;
-
- msginfo = procheader_parse_file(filename, msgflags, FALSE, FALSE);
- if (msginfo == NULL)
- return -1;
-
- r = news_cancel_article(folder, msginfo);
-
- procmsg_msginfo_free(msginfo);
+ 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;
}
GSList *llast = NULL;
MsgInfo *msginfo;
- if (rfirst) *rfirst = 0;
- if (rlast) *rlast = 0;
+ if (rfirst) *rfirst = -1;
+ if (rlast) *rlast = -1;
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
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"));
+ debug_print("no new articles.\n");
return NULL;
} else
begin = cache_last + 1;
end = last;
- if (rfirst) *rfirst = first;
- if (rlast) *rlast = last;
-
if (prefs_common.max_articles > 0 &&
end - begin + 1 > prefs_common.max_articles)
begin = end - prefs_common.max_articles + 1;
if (first < 2) return alist;
- debug_print(_("Deleting cached articles 1 - %d ... "), first - 1);
+ debug_print("Deleting cached articles 1 - %d ...\n", first - 1);
dir = folder_item_get_path(item);
remove_numbered_files(dir, 1, first - 1);
cur = next;
}
- debug_print(_("done.\n"));
return alist;
}
g_return_if_fail(item->folder != NULL);
g_return_if_fail(item->folder->type == F_NEWS);
- debug_print(_("\tDeleting all cached articles... "));
+ 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;
- debug_print(_("done.\n"));
+ 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)
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) \
projects / claws.git / blobdiff