#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;
-void folder_system_init()
+void folder_system_init(void)
{
folder_register_class(mh_get_class());
folder_register_class(imap_get_class());
folder_register_class(mbox_get_class());
}
-GSList *folder_get_class_list()
+GSList *folder_get_class_list(void)
{
return classlist;
}
-void folder_register_class(FolderClass *class)
+void folder_register_class(FolderClass *klass)
{
- debug_print("registering folder class %s\n", class->idstr);
- classlist = g_slist_append(classlist, class);
+ debug_print("registering folder class %s\n", klass->idstr);
+ classlist = g_slist_append(classlist, klass);
}
-Folder *folder_new(FolderClass *class, const gchar *name, const gchar *path)
+Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
{
Folder *folder = NULL;
FolderItem *item;
- g_return_val_if_fail(class != NULL, NULL);
+ g_return_val_if_fail(klass != NULL, NULL);
name = name ? name : path;
- folder = class->new(name, path);
+ folder = klass->new_folder(name, path);
/* Create root folder item */
item = folder_item_new(folder, name, NULL);
void folder_destroy(Folder *folder)
{
g_return_if_fail(folder != NULL);
- g_return_if_fail(folder->class->destroy != NULL);
+ g_return_if_fail(folder->klass->destroy_folder != NULL);
folder_list = g_list_remove(folder_list, folder);
folder_tree_destroy(folder);
+
+ folder->klass->destroy_folder(folder);
+
g_free(folder->name);
g_free(folder);
-
- folder->class->destroy(folder);
}
void folder_local_folder_destroy(LocalFolder *lfolder)
{
FolderItem *item = NULL;
- if (folder->class->item_new) {
- item = folder->class->item_new(folder);
+ if (folder->klass->item_new) {
+ item = folder->klass->item_new(folder);
} else {
item = g_new0(FolderItem, 1);
}
item->name = g_strdup(name);
item->path = g_strdup(path);
item->mtime = 0;
- item->new = 0;
- item->unread = 0;
- item->unreadmarked = 0;
- item->total = 0;
+ item->new_msgs = 0;
+ item->unread_msgs = 0;
+ item->unreadmarked_msgs = 0;
+ item->total_msgs = 0;
item->last_num = -1;
item->cache = NULL;
item->no_sub = FALSE;
item->mark_queue = NULL;
item->data = NULL;
- item->prefs = prefs_folder_item_new();
+ item->prefs = folder_item_prefs_new();
return item;
}
g_free(item->path);
if (item->folder != NULL) {
- if(item->folder->class->item_destroy) {
- item->folder->class->item_destroy(item->folder, item);
+ if(item->folder->klass->item_destroy) {
+ item->folder->klass->item_destroy(item->folder, item);
} else {
g_free(item);
}
g_return_if_fail(folder != NULL);
g_return_if_fail(folder->node != NULL);
- prefs_scoring_clear();
- prefs_filtering_clear();
+ prefs_scoring_clear_folder(folder);
+ prefs_filtering_clear_folder(folder);
g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_tree_destroy_func, NULL);
if (folder->node)
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->class->scan_tree)
+ if (!folder->klass->scan_tree)
return;
pptable = folder_persist_prefs_new(folder);
+
+ /*
+ * should be changed and tree update should be done without
+ * destroying the tree first
+ */
folder_tree_destroy(folder);
+ folder->klass->scan_tree(folder);
- folder->class->scan_tree(folder);
+ hookdata.folder = folder;
+ hookdata.update_flags = FOLDER_TREE_CHANGED;
+ 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 *new_item;
- new_item = parent->folder->class->create_folder(parent->folder, parent, name);
+ new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
if (new_item)
new_item->cache = msgcache_new();
struct TotalMsgCount
{
- guint new;
- guint unread;
- guint unreadmarked;
- guint total;
+ guint new_msgs;
+ guint unread_msgs;
+ guint unreadmarked_msgs;
+ guint total_msgs;
};
struct FuncToAllFoldersData
{
struct TotalMsgCount *count = (struct TotalMsgCount *)data;
- count->new += item->new;
- count->unread += item->unread;
- count->unreadmarked += item->unreadmarked;
- count->total += item->total;
+ count->new_msgs += item->new_msgs;
+ count->unread_msgs += item->unread_msgs;
+ count->unreadmarked_msgs += item->unreadmarked_msgs;
+ count->total_msgs += item->total_msgs;
}
-void folder_count_total_msgs(guint *new, guint *unread, guint *unreadmarked, guint *total)
+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;
- count.new = count.unread = count.unreadmarked = count.total = 0;
+ count.new_msgs = count.unread_msgs = count.unreadmarked_msgs = count.total_msgs = 0;
debug_print("Counting total number of messages...\n");
folder_func_to_all_folders(folder_count_total_msgs_func, &count);
- *new = count.new;
- *unread = count.unread;
- *unreadmarked = count.unreadmarked;
- *total = count.total;
+ *new_msgs = count.new_msgs;
+ *unread_msgs = count.unread_msgs;
+ *unreadmarked_msgs = count.unreadmarked_msgs;
+ *total_msgs = count.total_msgs;
}
Folder *folder_find_from_path(const gchar *path)
return NULL;
}
-Folder *folder_find_from_name(const gchar *name, FolderClass *class)
+Folder *folder_find_from_name(const gchar *name, FolderClass *klass)
{
GList *list;
Folder *folder;
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
- if (folder->class == class && strcmp2(name, folder->name) == 0)
+ if (folder->klass == klass && strcmp2(name, folder->name) == 0)
return folder;
}
g_return_val_if_fail(folder != NULL, NULL);
- type_str = folder->class->idstr;
+ type_str = folder->klass->idstr;
return g_strconcat("#", type_str, "/", folder->name, NULL);
}
* the folder knows the ui string and how to abbrev
*/
if (!item->parent) {
- name = g_strconcat(item->name, " (", item->folder->class->uistr, ")", NULL);
+ name = g_strconcat(item->name, " (", item->folder->klass->uistr, ")", NULL);
} else {
if (FOLDER_CLASS(item->folder) == news_get_class() &&
item->path && !strcmp2(item->name, item->path))
folder->queue && folder->trash)
continue;
- if (folder->class->create_tree(folder) < 0) {
+ if (folder->klass->create_tree(folder) < 0) {
g_warning("%s: can't create the folder tree.\n",
LOCAL_FOLDER(folder)->rootpath);
continue;
#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);
+ 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) {
+ if (item->new_msgs) {
+ folder_item_update_freeze();
mlist = folder_item_get_msg_list(item);
for (cur = mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo;
procmsg_msginfo_free(msginfo);
}
g_slist_free(mlist);
+ folder_item_update_thaw();
}
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;
folder = item->folder;
g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->class->get_num_list != NULL, -1);
+ g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
debug_print("Scanning folder %s for cache changes.\n", item->path);
/* Get list of messages for folder and cache */
- if (folder->class->get_num_list(item->folder, item, &folder_list) < 0) {
+ if (folder->klass->get_num_list(item->folder, item, &folder_list) < 0) {
debug_print("Error fetching list of message numbers\n");
return(-1);
}
- if (!folder->class->check_msgnum_validity ||
- folder->class->check_msgnum_validity(folder, item)) {
+ if (!folder->klass->check_msgnum_validity ||
+ folder->klass->check_msgnum_validity(folder, item)) {
if (!item->cache)
folder_item_read_cache(item);
cache_list = msgcache_get_msg_list(item->cache);
MsgInfo *msginfo;
msginfo = msgcache_get_msg(item->cache, folder_cur_num);
- if (folder->class->is_msg_changed && folder->class->is_msg_changed(folder, item, msginfo)) {
+ if (folder->klass->is_msg_changed && folder->klass->is_msg_changed(folder, item, msginfo)) {
msgcache_remove_msg(item->cache, msginfo->msgnum);
new_list = g_slist_prepend(new_list, GINT_TO_POINTER(msginfo->msgnum));
procmsg_msginfo_free(msginfo);
g_slist_free(folder_list);
if (new_list != NULL) {
- if (folder->class->get_msginfos) {
- newmsg_list = folder->class->get_msginfos(folder, item, new_list);
- } else if (folder->class->get_msginfo) {
+ if (folder->klass->get_msginfos) {
+ newmsg_list = folder->klass->get_msginfos(folder, item, new_list);
+ } else if (folder->klass->get_msginfo) {
GSList *elem;
for (elem = new_list; elem != NULL; elem = g_slist_next(elem)) {
guint num;
num = GPOINTER_TO_INT(elem->data);
- msginfo = folder->class->get_msginfo(folder, item, num);
+ msginfo = folder->klass->get_msginfo(folder, item, num);
if (msginfo != NULL) {
newmsg_list = g_slist_prepend(newmsg_list, msginfo);
debug_print("Added newly found message %d to cache.\n", num);
g_slist_free(new_list);
}
+ folder_item_update_freeze();
if (newmsg_list != NULL) {
GSList *elem;
- for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem))
- msgcache_add_msg(item->cache, elem->data);
+ for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
+ MsgInfo *msginfo = (MsgInfo *) elem->data;
+
+ msgcache_add_msg(item->cache, msginfo);
+ if ((filtering == TRUE) &&
+ (item->stype == F_INBOX) &&
+ (item->folder->account != NULL) &&
+ (item->folder->account->filter_on_recv) &&
+ procmsg_msginfo_filter(msginfo))
+ procmsg_msginfo_free(msginfo);
+ else
+ exists_list = g_slist_prepend(exists_list, msginfo);
+ }
+ g_slist_free(newmsg_list);
update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
-
- exists_list = g_slist_concat(exists_list, newmsg_list);
}
for (elem = exists_list; elem != NULL; elem = g_slist_next(elem)) {
}
g_slist_free(exists_list);
- item->new = newcnt;
- item->unread = unreadcnt;
- item->total = totalcnt;
- item->unreadmarked = unreadmarkedcnt;
+ item->new_msgs = newcnt;
+ item->unread_msgs = unreadcnt;
+ item->total_msgs = totalcnt;
+ item->unreadmarked_msgs = unreadmarkedcnt;
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 = NULL;
}
-void folder_clean_cache_memory()
+void folder_clean_cache_memory(void)
{
gint memusage = 0;
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;
if ((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
return msginfo;
- g_return_val_if_fail(folder->class->get_msginfo, NULL);
- if ((msginfo = folder->class->get_msginfo(folder, item, num)) != NULL) {
+ g_return_val_if_fail(folder->klass->get_msginfo, NULL);
+ if ((msginfo = folder->klass->get_msginfo(folder, item, num)) != NULL) {
msgcache_add_msg(item->cache, msginfo);
return msginfo;
}
folder = item->folder;
- g_return_val_if_fail(folder->class->fetch_msg != NULL, NULL);
+ g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
- return folder->class->fetch_msg(folder, item, num);
+ return folder->klass->fetch_msg(folder, item, num);
}
static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
{
/* update folder stats */
if (MSG_IS_NEW(newmsginfo->flags))
- item->new++;
+ item->new_msgs++;
if (MSG_IS_UNREAD(newmsginfo->flags))
- item->unread++;
+ item->unread_msgs++;
if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
- item->unreadmarked++;
- item->total++;
+ item->unreadmarked_msgs++;
+ item->total_msgs++;
copy_msginfo_flags(flagsource, newmsginfo);
static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
{
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--;
+ msginfo->folder->new_msgs--;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- msginfo->folder->unread--;
+ msginfo->folder->unread_msgs--;
if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
- msginfo->folder->unreadmarked--;
- msginfo->folder->total--;
+ msginfo->folder->unreadmarked_msgs--;
+ msginfo->folder->total_msgs--;
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.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->class->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->class->add_msg(folder, dest, file, FALSE);
+ folder = dest->folder;
- if (num > 0) {
- msginfo = folder->class->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);
+ 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;
}
/*
folder_item_move_msgs_with_dest(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;
new_id = folder_item_get_identifier(new_item);
debug_print("updating rules : %s => %s\n", old_id, new_id);
- src->folder->class->remove_folder(src->folder, src);
+ src->folder->klass->remove_folder(src->folder, src);
folder_write_list();
if (old_id != NULL && new_id != NULL)
}
*/
-
-
+/**
+ * Copy a list of messages to a new folder.
+ *
+ * \param dest Destination folder
+ * \param msglist List of messages
+ */
gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
{
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->class->copy_msg != NULL, -1);
- g_return_val_if_fail(folder->class->remove_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+
+ relation = g_relation_new(2);
+ g_relation_index(relation, 0, 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->class->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;
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;
gchar *file;
if (!folderscan) {
- folder_item_scan(dest);
+ folder_item_scan_full(dest, FALSE);
folderscan = TRUE;
}
file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
continue;
if (!folderscan &&
- ((newmsginfo = folder->class->get_msginfo(folder, dest, num)) != NULL)) {
- newmsginfo = folder->class->get_msginfo(folder, dest, num);
+ ((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) {
* 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;
+ FolderItem *item = msginfo->folder;
+ GTuples *tuples;
- num = GPOINTER_TO_INT(l2->data);
- l2 = g_slist_next(l2);
-
- if (num >= 0) {
- item->folder->class->remove_msg(item->folder,
+ 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);
- if (folder->class->finished_copy)
- folder->class->finished_copy(folder, dest);
-
- g_slist_free(newmsgnums);
+ g_relation_destroy(relation);
return lastnum;
}
gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
{
- GSList *list = NULL;
- gint ret;
+ GSList msglist;
- list = g_slist_append(list, msginfo);
- ret = folder_item_copy_msgs_with_dest(dest, list);
- g_slist_free(list);
+ g_return_val_if_fail(dest != NULL, -1);
+ g_return_val_if_fail(msginfo != NULL, -1);
+
+ msglist.data = msginfo;
+ msglist.next = NULL;
- return ret;
+ return folder_item_copy_msgs_with_dest(dest, &msglist);
}
/*
{
Folder *folder;
gint num, lastnum = -1;
- GSList *newmsgnums = NULL;
- GSList *l, *l2;
+ GSList *l;
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->class->copy_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
- /*
+ relation = g_relation_new(2);
+ g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+
+ /*
* 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;
+ 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->class->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;
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;
gchar *file;
if (!folderscan) {
- folder_item_scan(dest);
+ folder_item_scan_full(dest, FALSE);
folderscan = TRUE;
}
file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
continue;
if (!folderscan &&
- ((newmsginfo = folder->class->get_msginfo(folder, dest, num)) != NULL)) {
- newmsginfo = folder->class->get_msginfo(folder, dest, num);
+ ((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) {
}
}
- if (folder->class->finished_copy)
- folder->class->finished_copy(folder, dest);
+ if (folder->klass->finished_copy)
+ folder->klass->finished_copy(folder, dest);
+
+ g_relation_destroy(relation);
- g_slist_free(newmsgnums);
return lastnum;
}
MsgInfo *msginfo;
g_return_val_if_fail(item != NULL, -1);
-
folder = item->folder;
+ g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+
if (!item->cache) folder_item_read_cache(item);
- ret = folder->class->remove_msg(folder, item, num);
+ ret = folder->klass->remove_msg(folder, item, num);
msginfo = msgcache_get_msg(item->cache, num);
if (msginfo != NULL) {
remove_msginfo_from_cache(item, msginfo);
procmsg_msginfo_free(msginfo);
}
- item->total--;
folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
return ret;
if (!item->cache) folder_item_read_cache(item);
- if (folder->class->remove_msgs) {
- ret = folder->class->remove_msgs(folder, item, msglist);
- if (ret == 0)
- folder_item_scan(item);
- return ret;
- }
-
while (msglist != NULL) {
MsgInfo *msginfo = (MsgInfo *)msglist->data;
folder = item->folder;
- g_return_val_if_fail(folder->class->remove_all_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->remove_all_msg != NULL, -1);
- result = folder->class->remove_all_msg(folder, item);
+ result = folder->klass->remove_all_msg(folder, item);
if (result == 0) {
- if (folder->class->finished_remove)
- folder->class->finished_remove(folder, item);
+ if (folder->klass->finished_remove)
+ folder->klass->finished_remove(folder, item);
folder_item_free_cache(item);
item->cache = msgcache_new();
- item->new = 0;
- item->unread = 0;
- item->unreadmarked = 0;
- item->total = 0;
+ item->new_msgs = 0;
+ item->unread_msgs = 0;
+ item->unreadmarked_msgs = 0;
+ item->total_msgs = 0;
folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
}
g_return_if_fail(item != NULL);
g_return_if_fail(msginfo != NULL);
- if (item->folder->class->change_flags != NULL) {
- item->folder->class->change_flags(item->folder, item, msginfo, newflags);
+ if (item->folder->klass->change_flags != NULL) {
+ item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
} else {
msginfo->flags.perm_flags = newflags;
}
folder = item->folder;
- g_return_val_if_fail(folder->class->is_msg_changed != NULL, -1);
+ g_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
- return folder->class->is_msg_changed(folder, item, msginfo);
+ return folder->klass->is_msg_changed(folder, item, msginfo);
}
gchar *folder_item_get_cache_file(FolderItem *item)
item = folder_item_new(folder, name, path);
item->stype = stype;
item->mtime = mtime;
- item->new = new;
- item->unread = unread;
- item->unreadmarked = unreadmarked;
- item->total = total;
+ item->new_msgs = new;
+ item->unread_msgs = unread;
+ item->unreadmarked_msgs = unreadmarked;
+ item->total_msgs = total;
item->no_sub = no_sub;
item->no_select = no_select;
item->collapsed = collapsed;
}
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);
if (depth == 1) {
Folder *folder = item->folder;
- fprintf(fp, "<folder type=\"%s\"", folder->class->idstr);
+ 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)
fprintf(fp,
" mtime=\"%lu\" new=\"%d\" unread=\"%d\" unreadmarked=\"%d\" total=\"%d\"",
- item->mtime, item->new, item->unread, item->unreadmarked, item->total);
+ item->mtime, item->new_msgs, item->unread_msgs, item->unreadmarked_msgs, item->total_msgs);
if (item->account)
fprintf(fp, " account_id=\"%d\"",
}
}
-void folder_update_op_count() {
+void folder_update_op_count(void)
+{
GList *cur;
Folder *folder;
if (!is_dir_exist(tmpname)) {
debug_print("*TMP* creating %s\n", tmpname);
- processing_folder_item = processing_folder->class->create_folder(processing_folder,
+ processing_folder_item = processing_folder->klass->create_folder(processing_folder,
processing_folder->node->data,
PROCESSING_FOLDER_ITEM);
} else {
debug_print("*TMP* already created\n");
- processing_folder_item = folder_item_new(processing_folder, ".processing", ".processing");
+ processing_folder_item = folder_item_new(processing_folder, PROCESSING_FOLDER_ITEM, PROCESSING_FOLDER_ITEM);
g_assert(processing_folder_item);
folder_item_append(processing_folder->node->data, processing_folder_item);
}
/* 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;
}
}
-void folder_item_update_freeze()
+void folder_item_update_freeze(void)
{
folder_item_update_freeze_cnt++;
}
}
}
-void folder_item_update_thaw()
+void folder_item_update_thaw(void)
{
if (folder_item_update_freeze_cnt > 0)
folder_item_update_freeze_cnt--;