/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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 "imap.h"
#include "news.h"
#include "mh.h"
-#include "mbox_folder.h"
+#include "mailmbox_folder.h"
#include "utils.h"
#include "xml.h"
#include "codeconv.h"
#include "account.h"
#include "filtering.h"
#include "scoring.h"
-#include "prefs_folder_item.h"
#include "procheader.h"
#include "hooks.h"
#include "log.h"
+#include "folder_item_prefs.h"
/* Dependecies to be removed ?! */
#include "prefs_common.h"
#include "prefs_account.h"
-#include "prefs_folder_item.h"
static GList *folder_list = NULL;
static gboolean persist_prefs_free (gpointer key, gpointer val, gpointer data);
void folder_item_read_cache (FolderItem *item);
void folder_item_free_cache (FolderItem *item);
+gint folder_item_scan_full (FolderItem *item, gboolean filtering);
static GSList *classlist;
folder_register_class(mh_get_class());
folder_register_class(imap_get_class());
folder_register_class(news_get_class());
- folder_register_class(mbox_get_class());
+ folder_register_class(mailmbox_get_class());
}
GSList *folder_get_class_list(void)
/* Create root folder item */
item = folder_item_new(folder, name, NULL);
item->folder = folder;
- folder->node = g_node_new(item);
+ folder->node = item->node = g_node_new(item);
folder->data = NULL;
return folder;
item->threaded = TRUE;
item->ret_rcpt = FALSE;
item->opened = FALSE;
+ item->node = NULL;
item->parent = NULL;
item->folder = NULL;
item->account = NULL;
item->mark_queue = NULL;
item->data = NULL;
- item->prefs = prefs_folder_item_new();
+ item->prefs = folder_item_prefs_new();
return item;
}
void folder_item_append(FolderItem *parent, FolderItem *item)
{
- GNode *node;
-
g_return_if_fail(parent != NULL);
g_return_if_fail(parent->folder != NULL);
+ g_return_if_fail(parent->node != NULL);
g_return_if_fail(item != NULL);
- node = parent->folder->node;
- node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, parent);
- g_return_if_fail(node != NULL);
-
item->parent = parent;
item->folder = parent->folder;
- g_node_append_data(node, item);
+ item->node = g_node_append_data(parent->node, item);
+}
+
+static gboolean folder_item_remove_func(GNode *node, gpointer data)
+{
+ FolderItem *item = FOLDER_ITEM(node->data);
+ FolderUpdateData hookdata;
+
+ if (item->cache != NULL) {
+ msgcache_destroy(item->cache);
+ item->cache = NULL;
+ }
+
+ hookdata.folder = item->folder;
+ hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_REMOVE_FOLDERITEM;
+ hookdata.item = item;
+ hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
+ folder_item_destroy(item);
+
+ return FALSE;
}
void folder_item_remove(FolderItem *item)
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
+ g_return_if_fail(item->node != NULL);
- node = item->folder->node;
- node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
- g_return_if_fail(node != NULL);
+ node = item->node;
- /* TODO: free all FolderItem's first */
if (item->folder->node == node)
item->folder->node = NULL;
+
+ g_node_traverse(node, G_POST_ORDER, G_TRAVERSE_ALL, -1,
+ folder_item_remove_func, NULL);
g_node_destroy(node);
}
+void folder_item_remove_children(FolderItem *item)
+{
+ GNode *node, *next;
+
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(item->folder != NULL);
+ g_return_if_fail(item->node != NULL);
+
+ node = item->node->children;
+ while (node != NULL) {
+ next = node->next;
+ folder_item_remove(FOLDER_ITEM(node->data));
+ node = next;
+ }
+}
+
void folder_item_destroy(FolderItem *item)
{
+ Folder *folder;
+
g_return_if_fail(item != NULL);
- debug_print("Destroying folder item %s\n", item->path);
+ folder = item->folder;
+ if (folder) {
+ if (folder->inbox == item)
+ folder->inbox = NULL;
+ else if (folder->outbox == item)
+ folder->outbox = NULL;
+ else if (folder->draft == item)
+ folder->draft = NULL;
+ else if (folder->queue == item)
+ folder->queue = NULL;
+ else if (folder->trash == item)
+ folder->trash = NULL;
+ }
if (item->cache)
folder_item_free_cache(item);
+ if (item->prefs)
+ folder_item_prefs_free(item->prefs);
g_free(item->name);
g_free(item->path);
void folder_tree_destroy(Folder *folder)
{
+ GNode *node;
+
g_return_if_fail(folder != NULL);
- g_return_if_fail(folder->node != NULL);
-
- prefs_scoring_clear();
- prefs_filtering_clear();
- g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_tree_destroy_func, NULL);
- if (folder->node)
- g_node_destroy(folder->node);
+ node = folder->node;
+
+ prefs_scoring_clear_folder(folder);
+ prefs_filtering_clear_folder(folder);
- folder->inbox = NULL;
- folder->outbox = NULL;
- folder->draft = NULL;
- folder->queue = NULL;
- folder->trash = NULL;
- folder->node = NULL;
+ if (node != NULL) {
+ g_node_traverse(node, G_POST_ORDER, G_TRAVERSE_ALL, -1,
+ folder_tree_destroy_func, NULL);
+ g_node_destroy(node);
+ folder->node = NULL;
+ }
}
void folder_add(Folder *folder)
FolderItem *item = (FolderItem *)node->data;
folder_item_restore_persist_prefs(item, pptable);
+ folder_item_scan_full(item, FALSE);
return FALSE;
}
void folder_scan_tree(Folder *folder)
{
GHashTable *pptable;
+ FolderUpdateData hookdata;
if (!folder->klass->scan_tree)
return;
pptable = folder_persist_prefs_new(folder);
- folder_tree_destroy(folder);
+ /*
+ * should be changed and tree update should be done without
+ * destroying the tree first
+ */
+ folder_tree_destroy(folder);
folder->klass->scan_tree(folder);
+ hookdata.folder = folder;
+ hookdata.update_flags = FOLDER_TREE_CHANGED;
+ hookdata.item = NULL;
+ hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
folder_persist_prefs_free(pptable);
FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
{
FolderItem *new_item;
+ FolderUpdateData hookdata;
new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
- if (new_item)
+ if (new_item) {
new_item->cache = msgcache_new();
+ hookdata.folder = new_item->folder;
+ hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_NEW_FOLDERITEM;
+ hookdata.item = new_item;
+ hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+ }
+
return new_item;
}
count->total_msgs += item->total_msgs;
}
+struct TotalMsgStatus
+{
+ guint new;
+ guint unread;
+ guint total;
+ GString *str;
+};
+
+static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
+{
+ FolderItem *item;
+ struct TotalMsgStatus *status = (struct TotalMsgStatus *)data;
+ gchar *id;
+
+ g_return_val_if_fail(node->data != NULL, FALSE);
+
+ item = FOLDER_ITEM(node->data);
+
+ if (!item->path) return FALSE;
+
+ status->new += item->new_msgs;
+ status->unread += item->unread_msgs;
+ status->total += item->total_msgs;
+
+ if (status->str) {
+ id = folder_item_get_identifier(item);
+ g_string_sprintfa(status->str, "%5d %5d %5d %s\n",
+ item->new_msgs, item->unread_msgs,
+ item->total_msgs, id);
+ g_free(id);
+ }
+
+ return FALSE;
+ }
+
+static void folder_get_status_full_all(GString *str, guint *new, guint *unread,
+ guint *total)
+{
+ GList *list;
+ Folder *folder;
+ struct TotalMsgStatus status;
+
+ status.new = status.unread = status.total = 0;
+ status.str = str;
+
+ debug_print("Counting total number of messages...\n");
+
+ for (list = folder_list; list != NULL; list = list->next) {
+ folder = FOLDER(list->data);
+ if (folder->node)
+ g_node_traverse(folder->node, G_PRE_ORDER,
+ G_TRAVERSE_ALL, -1,
+ folder_get_status_full_all_func,
+ &status);
+ }
+
+ *new = status.new;
+ *unread = status.unread;
+ *total = status.total;
+}
+
+gchar *folder_get_status(GPtrArray *folders, gboolean full)
+{
+ guint new, unread, total;
+ GString *str;
+ gint i;
+ gchar *ret;
+
+ new = unread = total = 0;
+
+ str = g_string_new(NULL);
+
+ if (folders) {
+ for (i = 0; i < folders->len; i++) {
+ FolderItem *item;
+
+ item = g_ptr_array_index(folders, i);
+ new += item->new_msgs;
+ unread += item->unread_msgs;
+ total += item->total_msgs;
+
+ if (full) {
+ gchar *id;
+
+ id = folder_item_get_identifier(item);
+ g_string_sprintfa(str, "%5d %5d %5d %s\n",
+ item->new_msgs, item->unread_msgs,
+ item->total_msgs, id);
+ g_free(id);
+ }
+ }
+ } else {
+ folder_get_status_full_all(full ? str : NULL,
+ &new, &unread, &total);
+ }
+
+ if (full)
+ g_string_sprintfa(str, "%5d %5d %5d\n", new, unread, total);
+ else
+ g_string_sprintfa(str, "%d %d %d\n", new, unread, total);
+
+ ret = str->str;
+ g_string_free(str, FALSE);
+
+ return ret;
+}
+
void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadmarked_msgs, guint *total_msgs)
{
struct TotalMsgCount count;
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
- if ((FOLDER_TYPE(folder) == F_MH || FOLDER_TYPE(folder) == F_MBOX) &&
+ if ((FOLDER_TYPE(folder) == F_MH ||
+ FOLDER_TYPE(folder) == F_MBOX) &&
!path_cmp(LOCAL_FOLDER(folder)->rootpath, path))
return folder;
}
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
- if (folder->klass == klass && strcmp2(name, folder->name) == 0)
+ if (folder->klass == klass &&
+ strcmp2(name, folder->name) == 0)
return folder;
}
{
gchar *name = NULL;
+ g_return_val_if_fail(item != NULL, g_strdup(""));
+
switch (item->stype) {
case F_INBOX:
name = g_strdup(!strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
#undef CREATE_FOLDER_IF_NOT_EXIST
-gchar *folder_get_path(Folder *folder)
-{
- gchar *path;
-
- g_return_val_if_fail(folder != NULL, NULL);
-
- switch(FOLDER_TYPE(folder)) {
-
- case F_MH:
- path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
- break;
-
- case F_IMAP:
- g_return_val_if_fail(folder->account != NULL, NULL);
- path = g_strconcat(get_imap_cache_dir(),
- G_DIR_SEPARATOR_S,
- folder->account->recv_server,
- G_DIR_SEPARATOR_S,
- folder->account->userid,
- NULL);
- break;
-
- case F_NEWS:
- g_return_val_if_fail(folder->account != NULL, NULL);
- path = g_strconcat(get_news_cache_dir(),
- G_DIR_SEPARATOR_S,
- folder->account->nntp_server,
- NULL);
- break;
-
- default:
- path = NULL;
- break;
- }
-
- return path;
-}
-
gchar *folder_item_get_path(FolderItem *item)
{
- gchar *folder_path;
- gchar *path;
+ Folder *folder;
g_return_val_if_fail(item != NULL, NULL);
+ folder = item->folder;
+ g_return_val_if_fail(folder != NULL, NULL);
- if(FOLDER_TYPE(item->folder) != F_MBOX) {
- folder_path = folder_get_path(item->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);
- } else {
- gchar *itempath;
-
- itempath = mbox_get_virtual_path(item);
- if (itempath == NULL)
- return NULL;
- path = g_strconcat(get_mbox_cache_dir(),
- G_DIR_SEPARATOR_S, itempath, NULL);
- g_free(itempath);
- }
- return path;
+ return folder->klass->item_get_path(folder, item);
}
void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
gint folder_item_open(FolderItem *item)
{
- if(((FOLDER_TYPE(item->folder) == F_IMAP) && !item->no_select) || (FOLDER_TYPE(item->folder) == F_NEWS)) {
- folder_item_scan(item);
+ if((item->folder->klass->scan_required != NULL) && (item->folder->klass->scan_required(item->folder, item))) {
+ folder_item_scan_full(item, TRUE);
}
/* Processing */
return 0;
}
-void folder_item_close(FolderItem *item)
+gint folder_item_close(FolderItem *item)
{
GSList *mlist, *cur;
+ Folder *folder;
- g_return_if_fail(item != NULL);
+ g_return_val_if_fail(item != NULL, -1);
if (item->new_msgs) {
folder_item_update_freeze();
folder_item_write_cache(item);
folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
+
+ item->opened = FALSE;
+ folder = item->folder;
+
+ if (folder->klass->close == NULL)
+ return 0;
+
+ return folder->klass->close(folder, item);
}
-gint folder_item_scan(FolderItem *item)
+gint folder_item_scan_full(FolderItem *item, gboolean filtering)
{
Folder *folder;
GSList *folder_list = NULL, *cache_list = NULL;
GSList *newmsg_list = NULL;
guint newcnt = 0, unreadcnt = 0, totalcnt = 0, unreadmarkedcnt = 0;
guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
- gboolean update_flags = 0;
+ gboolean update_flags = 0, old_uids_valid = FALSE;
g_return_val_if_fail(item != NULL, -1);
if (item->path == NULL) return -1;
debug_print("Scanning folder %s for cache changes.\n", item->path);
/* Get list of messages for folder and cache */
- if (folder->klass->get_num_list(item->folder, item, &folder_list) < 0) {
+ if (folder->klass->get_num_list(item->folder, item, &folder_list, &old_uids_valid) < 0) {
debug_print("Error fetching list of message numbers\n");
return(-1);
}
- if (!folder->klass->check_msgnum_validity ||
- folder->klass->check_msgnum_validity(folder, item)) {
+ if (old_uids_valid) {
if (!item->cache)
folder_item_read_cache(item);
cache_list = msgcache_get_msg_list(item->cache);
g_slist_free(new_list);
}
+ folder_item_update_freeze();
if (newmsg_list != NULL) {
GSList *elem;
MsgInfo *msginfo = (MsgInfo *) elem->data;
msgcache_add_msg(item->cache, msginfo);
- if ((item->stype == F_INBOX) &&
+ if ((filtering == TRUE) &&
+ (item->stype == F_INBOX) &&
(item->folder->account != NULL) &&
(item->folder->account->filter_on_recv) &&
procmsg_msginfo_filter(msginfo))
update_flags |= F_ITEM_UPDATE_MSGCNT;
folder_item_update(item, update_flags);
+ folder_item_update_thaw();
return 0;
}
+gint folder_item_scan(FolderItem *item)
+{
+ return folder_item_scan_full(item, TRUE);
+}
+
+static gboolean folder_scan_all_items_func(GNode *node, gpointer data)
+{
+ FolderItem *item = node->data;
+
+ folder_item_scan(item);
+
+ return FALSE;
+}
+
+void folder_scan_all_items(Folder * folder)
+{
+ g_node_traverse(folder->node, G_PRE_ORDER,
+ G_TRAVERSE_ALL, -1, folder_scan_all_items_func, NULL);
+}
+
static void folder_item_scan_foreach_func(gpointer key, gpointer val,
gpointer data)
{
item->cache = msgcache_read_cache(item, cache_file);
if (!item->cache) {
item->cache = msgcache_new();
- folder_item_scan(item);
+ folder_item_scan_full(item, TRUE);
}
msgcache_read_mark(item->cache, mark_file);
g_free(cache_file);
void folder_item_write_cache(FolderItem *item)
{
gchar *cache_file, *mark_file;
- PrefsFolderItem *prefs;
+ FolderItemPrefs *prefs;
gint filemode = 0;
gchar *id;
MsgInfo *msginfo;
g_return_val_if_fail(item != NULL, NULL);
+ g_return_val_if_fail(msgid != NULL, NULL);
folder = item->folder;
if (!item->cache)
static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
{
+ MsgInfoUpdate msginfo_update;
+
if (!item->cache)
- folder_item_read_cache(item);
+ folder_item_read_cache(item);
if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
msginfo->folder->new_msgs--;
msginfo->folder->unreadmarked_msgs--;
msginfo->folder->total_msgs--;
+ msginfo_update.msginfo = msginfo;
+ msginfo_update.flags = MSGINFO_UPDATE_DELETED;
+ hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
+
msgcache_remove_msg(item->cache, msginfo->msgnum);
folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
}
gint folder_item_add_msg(FolderItem *dest, const gchar *file,
- gboolean remove_source)
+ MsgFlags *flags, gboolean remove_source)
{
- Folder *folder;
- gint num;
- MsgInfo *msginfo;
+ GSList file_list;
+ MsgFileInfo fileinfo;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(file != NULL, -1);
+
+ fileinfo.msginfo = NULL;
+ fileinfo.file = (gchar *)file;
+ fileinfo.flags = flags;
+ file_list.data = &fileinfo;
+ file_list.next = NULL;
- folder = dest->folder;
+ return folder_item_add_msgs(dest, &file_list, remove_source);
+}
- g_return_val_if_fail(folder->klass->add_msg != NULL, -1);
+gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
+ gboolean remove_source)
+{
+ Folder *folder;
+ gint ret, num, lastnum = -1;
+ GSList *file_cur;
+ GRelation *relation;
+ MsgFileInfo *fileinfo = NULL;
+ gboolean folderscan = FALSE;
- if (!dest->cache)
- folder_item_read_cache(dest);
+ g_return_val_if_fail(dest != NULL, -1);
+ g_return_val_if_fail(file_list != NULL, -1);
+ g_return_val_if_fail(dest->folder != NULL, -1);
- num = folder->klass->add_msg(folder, dest, file, FALSE);
+ folder = dest->folder;
- if (num > 0) {
- msginfo = folder->klass->get_msginfo(folder, dest, num);
+ relation = g_relation_new(2);
+ g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
- if (msginfo != NULL) {
- add_msginfo_to_cache(dest, msginfo, NULL);
- procmsg_msginfo_free(msginfo);
- folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+ if (folder->klass->add_msgs != NULL) {
+ ret = folder->klass->add_msgs(folder, dest, file_list, relation);
+ if (ret < 0) {
+ g_relation_destroy(relation);
+ return ret;
}
+ } else {
+ for (file_cur = file_list; file_cur != NULL; file_cur = g_slist_next(file_cur)) {
+ fileinfo = (MsgFileInfo *) file_cur->data;
- dest->last_num = num;
- } else if (num == 0) {
- folder_item_scan(dest);
- num = folder_item_get_msg_num_by_file(dest, file);
+ ret = folder->klass->add_msg(folder, dest, fileinfo->file, fileinfo->flags);
+ if (ret < 0) {
+ g_relation_destroy(relation);
+ return ret;
+ }
+ g_relation_insert(relation, fileinfo, GINT_TO_POINTER(ret));
+ }
}
- if (num >= 0 && remove_source) {
- if (unlink(file) < 0)
- FILE_OP_ERROR(file, "unlink");
+ for (file_cur = file_list; file_cur != NULL; file_cur = g_slist_next(file_cur)) {
+ GTuples *tuples;
+
+ fileinfo = (MsgFileInfo *) file_cur->data;
+ tuples = g_relation_select(relation, fileinfo, 0);
+ num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+ g_tuples_destroy(tuples);
+
+ if (num >= 0) {
+ MsgInfo *newmsginfo;
+
+ if (num == 0) {
+ if (!folderscan) {
+ folder_item_scan_full(dest, FALSE);
+ folderscan = TRUE;
+ }
+ num = folder_item_get_msg_num_by_file(dest, fileinfo->file);
+ }
+
+ if (num > lastnum)
+ lastnum = num;
+
+ if (num >= 0 && remove_source) {
+ if (unlink(fileinfo->file) < 0)
+ FILE_OP_ERROR(fileinfo->file, "unlink");
+ }
+
+ if (num == 0)
+ continue;
+
+ if (!folderscan &&
+ ((newmsginfo = folder->klass->get_msginfo(folder, dest, num)) != NULL)) {
+ add_msginfo_to_cache(dest, newmsginfo, NULL);
+ procmsg_msginfo_free(newmsginfo);
+ } else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
+ /* TODO: set default flags */
+ procmsg_msginfo_free(newmsginfo);
+ }
+ }
}
- return num;
+ g_relation_destroy(relation);
+
+ return lastnum;
}
/*
}
*/
-FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
+FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
{
GSList *mlist;
FolderItem *new_item;
/* move messages */
log_message(_("Moving %s to %s...\n"),
src->name, new_item->path);
- folder_item_move_msgs_with_dest(new_item, mlist);
+ folder_item_move_msgs(new_item, mlist);
/*copy prefs*/
- prefs_folder_item_copy_prefs(src, new_item);
+ folder_item_prefs_copy_prefs(src, new_item);
new_item->collapsed = src->collapsed;
new_item->thread_collapsed = src->thread_collapsed;
new_item->threaded = src->threaded;
FolderItem *tmp = dest->parent;
gchar * src_identifier, * dst_identifier;
gchar * phys_srcpath, * phys_dstpath;
- GNode *src_node;
while (tmp) {
if (tmp == src) {
return F_MOVE_FAILED;
}
- /* update rules */
- src_node = g_node_find(src->folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, src);
- if (src_node)
- g_node_destroy(src_node);
- else
- debug_print("can't remove node: it's null!\n");
- /* not to much worry if remove fails, move has been done */
-
g_free(src_identifier);
g_free(dst_identifier);
g_free(phys_srcpath);
return F_MOVE_OK;
}
-gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
-{
- GSList *list = NULL;
- gint ret;
-
- list = g_slist_append(list, msginfo);
- ret = folder_item_move_msgs_with_dest(dest, list);
- g_slist_free(list);
-
- return ret;
-}
-
-/*
-gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
-{
- Folder *folder;
- gint num;
-
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
-
- folder = dest->folder;
- if (dest->last_num < 0) folder->scan(folder, dest);
-
- num = folder->move_msgs_with_dest(folder, dest, msglist);
- if (num > 0) dest->last_num = num;
- else dest->op_count = 0;
-
- return num;
-}
-*/
-
-
-
-gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
+/**
+ * Copy a list of message to a new folder and remove
+ * source messages if wanted
+ */
+static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_source)
{
Folder *folder;
- FolderItem *item;
- GSList *newmsgnums = NULL;
- GSList *l, *l2;
+ GSList *l;
gint num, lastnum = -1;
gboolean folderscan = FALSE;
+ GRelation *relation;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msglist != NULL, -1);
folder = dest->folder;
g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
- g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+
+ relation = g_relation_new(2);
+ g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+ g_relation_index(relation, 1, g_direct_hash, g_direct_equal);
/*
* Copy messages to destination folder and
* store new message numbers in newmsgnums
*/
- item = NULL;
- for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
- MsgInfo * msginfo = (MsgInfo *) l->data;
-
- if (!item && msginfo->folder != NULL)
- item = msginfo->folder;
+ if (folder->klass->copy_msgs != NULL) {
+ if (folder->klass->copy_msgs(folder, dest, msglist, relation) < 0) {
+ g_relation_destroy(relation);
+ return -1;
+ }
+ } else {
+ for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
+ MsgInfo * msginfo = (MsgInfo *) l->data;
- num = folder->klass->copy_msg(folder, dest, msginfo);
- newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
+ num = folder->klass->copy_msg(folder, dest, msginfo);
+ g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+ }
}
/* Read cache for dest folder */
* Fetch new MsgInfos for new messages in dest folder,
* add them to the msgcache and update folder message counts
*/
- l2 = newmsgnums;
+ if (g_relation_count(relation, GINT_TO_POINTER(0), 1) > 0) {
+ folder_item_scan_full(dest, FALSE);
+ folderscan = TRUE;
+ }
+
for (l = msglist; l != NULL; l = g_slist_next(l)) {
MsgInfo *msginfo = (MsgInfo *) l->data;
+ GTuples *tuples;
- num = GPOINTER_TO_INT(l2->data);
- l2 = g_slist_next(l2);
+ tuples = g_relation_select(relation, msginfo, 0);
+ num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+ g_tuples_destroy(tuples);
if (num >= 0) {
MsgInfo *newmsginfo;
- if (num == 0) {
- gchar *file;
-
- if (!folderscan) {
- folder_item_scan(dest);
- folderscan = TRUE;
+ if (folderscan) {
+ if (msginfo->msgid != NULL) {
+ newmsginfo = folder_item_get_msginfo_by_msgid(dest, msginfo->msgid);
+ if (newmsginfo != NULL) {
+ copy_msginfo_flags(msginfo, newmsginfo);
+ num = newmsginfo->msgnum;
+ procmsg_msginfo_free(newmsginfo);
+ }
+ }
+ } else {
+ newmsginfo = folder->klass->get_msginfo(folder, dest, num);
+ if (newmsginfo != NULL) {
+ add_msginfo_to_cache(dest, newmsginfo, msginfo);
+ procmsg_msginfo_free(newmsginfo);
}
- file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
- num = folder_item_get_msg_num_by_file(dest, file);
- g_free(file);
}
if (num > lastnum)
lastnum = num;
-
- if (num == 0)
- continue;
-
- if (!folderscan &&
- ((newmsginfo = folder->klass->get_msginfo(folder, dest, num)) != NULL)) {
- add_msginfo_to_cache(dest, newmsginfo, msginfo);
- procmsg_msginfo_free(newmsginfo);
- } else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
- copy_msginfo_flags(msginfo, newmsginfo);
- procmsg_msginfo_free(newmsginfo);
- }
}
}
- /*
- * Remove source messages from their folders if
- * copying was successfull and update folder
- * message counts
- */
- l2 = newmsgnums;
- for (l = msglist; l != NULL; l = g_slist_next(l)) {
- MsgInfo *msginfo = (MsgInfo *) l->data;
-
- num = GPOINTER_TO_INT(l2->data);
- l2 = g_slist_next(l2);
-
- if (num >= 0) {
- item->folder->klass->remove_msg(item->folder,
- msginfo->folder,
- msginfo->msgnum);
- remove_msginfo_from_cache(item, msginfo);
+ if (remove_source) {
+ /*
+ * Remove source messages from their folders if
+ * copying was successfull and update folder
+ * message counts
+ */
+ for (l = msglist; l != NULL; l = g_slist_next(l)) {
+ MsgInfo *msginfo = (MsgInfo *) l->data;
+ FolderItem *item = msginfo->folder;
+ GTuples *tuples;
+
+ tuples = g_relation_select(relation, msginfo, 0);
+ num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+ g_tuples_destroy(tuples);
+
+ if ((num >= 0) && (item->folder->klass->remove_msg != NULL)) {
+ item->folder->klass->remove_msg(item->folder,
+ msginfo->folder,
+ msginfo->msgnum);
+ remove_msginfo_from_cache(item, msginfo);
+ }
}
}
-
if (folder->klass->finished_copy)
- folder->klass->finished_copy(folder, dest);
+ folder->klass->finished_copy(folder, dest);
- g_slist_free(newmsgnums);
+ g_relation_destroy(relation);
return lastnum;
}
-/*
-gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
+/**
+ * Move a message to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msginfo The message
+ */
+gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
{
- Folder *folder;
- gint num;
+ GSList list;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msginfo != NULL, -1);
- folder = dest->folder;
- if (dest->last_num < 0) folder->scan(folder, dest);
-
- num = folder->copy_msg(folder, dest, msginfo);
- if (num > 0) dest->last_num = num;
+ list.data = msginfo;
+ list.next = NULL;
- return num;
+ return do_copy_msgs(dest, &list, TRUE);
}
-*/
-gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
+/**
+ * Move a list of messages to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msglist List of messages
+ */
+gint folder_item_move_msgs(FolderItem *dest, GSList *msglist)
{
- GSList *list = NULL;
- gint ret;
+ g_return_val_if_fail(dest != NULL, -1);
+ g_return_val_if_fail(msglist != NULL, -1);
- list = g_slist_append(list, msginfo);
- ret = folder_item_copy_msgs_with_dest(dest, list);
- g_slist_free(list);
-
- return ret;
+ return do_copy_msgs(dest, msglist, TRUE);
}
-/*
-gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
+/**
+ * Copy a message to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msginfo The message
+ */
+gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
{
- Folder *folder;
- gint num;
+ GSList list;
g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
-
- folder = dest->folder;
- if (dest->last_num < 0) folder->scan(folder, dest);
-
- num = folder->copy_msgs_with_dest(folder, dest, msglist);
- if (num > 0) dest->last_num = num;
- else dest->op_count = 0;
-
- return num;
+ g_return_val_if_fail(msginfo != NULL, -1);
+
+ list.data = msginfo;
+ list.next = NULL;
+
+ return do_copy_msgs(dest, &list, FALSE);
}
-*/
-gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
+/**
+ * Copy a list of messages to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msglist List of messages
+ */
+gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)
{
- Folder *folder;
- gint num, lastnum = -1;
- GSList *newmsgnums = NULL;
- GSList *l, *l2;
- gboolean folderscan = FALSE;
-
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msglist != NULL, -1);
- folder = dest->folder;
-
- g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
-
- /*
- * Copy messages to destination folder and
- * store new message numbers in newmsgnums
- */
- for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
- MsgInfo * msginfo = (MsgInfo *) l->data;
-
- num = folder->klass->copy_msg(folder, dest, msginfo);
- newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
- }
-
- /* Read cache for dest folder */
- if (!dest->cache) folder_item_read_cache(dest);
-
- /*
- * Fetch new MsgInfos for new messages in dest folder,
- * add them to the msgcache and update folder message counts
- */
- l2 = newmsgnums;
- for (l = msglist; l != NULL; l = g_slist_next(l)) {
- MsgInfo *msginfo = (MsgInfo *) l->data;
-
- num = GPOINTER_TO_INT(l2->data);
- l2 = g_slist_next(l2);
-
- if (num >= 0) {
- MsgInfo *newmsginfo;
-
- if (num == 0) {
- gchar *file;
-
- if (!folderscan) {
- folder_item_scan(dest);
- folderscan = TRUE;
- }
- file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
- num = folder_item_get_msg_num_by_file(dest, file);
- g_free(file);
- }
-
- if (num > lastnum)
- lastnum = num;
-
- if (num == 0)
- continue;
-
- if (!folderscan &&
- ((newmsginfo = folder->klass->get_msginfo(folder, dest, num)) != NULL)) {
- newmsginfo = folder->klass->get_msginfo(folder, dest, num);
- add_msginfo_to_cache(dest, newmsginfo, msginfo);
- procmsg_msginfo_free(newmsginfo);
- } else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
- copy_msginfo_flags(msginfo, newmsginfo);
- procmsg_msginfo_free(newmsginfo);
- }
- }
- }
-
- if (folder->klass->finished_copy)
- folder->klass->finished_copy(folder, dest);
-
- g_slist_free(newmsgnums);
- return lastnum;
+ return do_copy_msgs(dest, msglist, FALSE);
}
gint folder_item_remove_msg(FolderItem *item, gint num)
item->ret_rcpt = ret_rcpt;
item->sort_key = sort_key;
item->sort_type = sort_type;
+ item->node = node;
item->parent = FOLDER_ITEM(node->parent->data);
item->folder = folder;
switch (stype) {
}
item->account = account;
item->apply_sub = apply_sub;
- prefs_folder_item_read_config(item);
+ folder_item_prefs_read_config(item);
node->data = item;
xml_free_node(xmlnode);
static gboolean folder_read_folder_func(GNode *node, gpointer data)
{
Folder *folder;
+ FolderItem *item;
XMLNode *xmlnode;
GList *list;
FolderClass *class = NULL;
folder->account = account;
if (account != NULL)
account->folder = REMOTE_FOLDER(folder);
- node->data = folder->node->data;
+ item = FOLDER_ITEM(folder->node->data);
+ node->data = item;
+ item->node = node;
g_node_destroy(folder->node);
folder->node = node;
folder_add(folder);
- FOLDER_ITEM(node->data)->collapsed = collapsed;
- FOLDER_ITEM(node->data)->thread_collapsed = thread_collapsed;
- FOLDER_ITEM(node->data)->threaded = threaded;
- FOLDER_ITEM(node->data)->account = account;
- FOLDER_ITEM(node->data)->apply_sub = apply_sub;
- FOLDER_ITEM(node->data)->ret_rcpt = ret_rcpt;
+ item->collapsed = collapsed;
+ item->thread_collapsed = thread_collapsed;
+ item->threaded = threaded;
+ item->account = account;
+ item->apply_sub = apply_sub;
+ item->ret_rcpt = ret_rcpt;
g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
folder_build_tree, folder);
fprintf(fp, "<folder type=\"%s\"", folder->klass->idstr);
if (folder->name)
PUT_ESCAPE_STR(fp, "name", folder->name);
- if (FOLDER_TYPE(folder) == F_MH || FOLDER_TYPE(folder) == F_MBOX)
+ if (FOLDER_TYPE(folder) == F_MH ||
+ FOLDER_TYPE(folder) == F_MBOX ||
+ FOLDER_TYPE(folder) == F_MAILDIR)
PUT_ESCAPE_STR(fp, "path",
LOCAL_FOLDER(folder)->rootpath);
if (item->collapsed && node->children)
/* folder_persist_prefs_new() - return hash table with persistent
* settings (and folder name as key).
- * (note that in claws other options are in the PREFS_FOLDER_ITEM_RC
+ * (note that in claws other options are in the folder_item_prefs_RC
* file, so those don't need to be included in PersistPref yet)
*/
GHashTable *folder_persist_prefs_new(Folder *folder)
/* CLAWS: since not all folder properties have been migrated to
* folderlist.xml, we need to call the old stuff first before
* setting things that apply both to Main and Claws. */
- prefs_folder_item_read_config(item);
+ folder_item_prefs_read_config(item);
item->collapsed = pp->collapsed;
item->thread_collapsed = pp->thread_collapsed;
projects / claws.git / blobdiff