#include "utils.h"
#include "xml.h"
#include "codeconv.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
#include "account.h"
#include "filtering.h"
#include "scoring.h"
#include "prefs_folder_item.h"
#include "procheader.h"
-#include "statusbar.h"
+#include "hooks.h"
+#include "log.h"
/* Dependecies to be removed ?! */
#include "prefs_common.h"
void folder_item_read_cache (FolderItem *item);
void folder_item_free_cache (FolderItem *item);
-Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
+static GSList *classlist;
+
+void folder_system_init()
+{
+ folder_register_class(mh_get_class());
+ folder_register_class(imap_get_class());
+ folder_register_class(news_get_class());
+ folder_register_class(mbox_get_class());
+}
+
+GSList *folder_get_class_list()
+{
+ return classlist;
+}
+
+void folder_register_class(FolderClass *klass)
+{
+ debug_print("registering folder class %s\n", klass->idstr);
+ classlist = g_slist_append(classlist, klass);
+}
+
+Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
{
Folder *folder = NULL;
FolderItem *item;
+ g_return_val_if_fail(klass != NULL, NULL);
+
name = name ? name : path;
- switch (type) {
- case F_MBOX:
- folder = mbox_folder_new(name, path);
- break;
- case F_MH:
- folder = mh_folder_new(name, path);
- break;
- case F_IMAP:
- folder = imap_folder_new(name, path);
- break;
- case F_NEWS:
- folder = news_folder_new(name, path);
- break;
- default:
- return NULL;
- }
+ folder = klass->new_folder(name, path);
/* Create root folder item */
item = folder_item_new(folder, name, NULL);
folder->draft = NULL;
folder->queue = NULL;
folder->trash = NULL;
-
- /* Init Folder functions */
- folder->item_new = NULL;
- folder->item_destroy = NULL;
- folder->fetch_msg = NULL;
- folder->fetch_msginfo = NULL;
- folder->fetch_msginfos = NULL;
- folder->get_num_list = NULL;
- folder->ui_func = NULL;
- folder->ui_func_data = NULL;
- folder->change_flags = NULL;
- folder->check_msgnum_validity = NULL;
}
void folder_local_folder_init(Folder *folder, const gchar *name,
void folder_destroy(Folder *folder)
{
g_return_if_fail(folder != NULL);
- g_return_if_fail(folder->destroy != NULL);
-
- folder->destroy(folder);
+ 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);
}
session_destroy(rfolder->session);
}
-#if 0
-Folder *mbox_folder_new(const gchar *name, const gchar *path)
-{
- /* not yet implemented */
- return NULL;
-}
-
-Folder *maildir_folder_new(const gchar *name, const gchar *path)
-{
- /* not yet implemented */
- return NULL;
-}
-#endif
-
FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
{
FolderItem *item = NULL;
- if (folder->item_new) {
- item = folder->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->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->no_select = FALSE;
item->collapsed = FALSE;
+ item->thread_collapsed = FALSE;
item->threaded = TRUE;
item->ret_rcpt = FALSE;
item->opened = FALSE;
g_free(item->path);
if (item->folder != NULL) {
- if(item->folder->item_destroy) {
- item->folder->item_destroy(item->folder, item);
+ if(item->folder->klass->item_destroy) {
+ item->folder->klass->item_destroy(item->folder, item);
} else {
g_free(item);
}
for (i = 0, cur = folder_list; cur != NULL; cur = cur->next, i++) {
cur_folder = FOLDER(cur->data);
- if (folder->type == F_MH) {
- if (cur_folder->type != F_MH) break;
- } else if (folder->type == F_MBOX) {
- if (cur_folder->type != F_MH &&
- cur_folder->type != F_MBOX) break;
- } else if (folder->type == F_IMAP) {
- if (cur_folder->type != F_MH &&
- cur_folder->type != F_MBOX &&
- cur_folder->type != F_IMAP) break;
- } else if (folder->type == F_NEWS) {
- if (cur_folder->type != F_MH &&
- cur_folder->type != F_MBOX &&
- cur_folder->type != F_IMAP &&
- cur_folder->type != F_NEWS) break;
+ if (FOLDER_TYPE(folder) == F_MH) {
+ if (FOLDER_TYPE(cur_folder) != F_MH) break;
+ } else if (FOLDER_TYPE(folder) == F_MBOX) {
+ if (FOLDER_TYPE(cur_folder) != F_MH &&
+ FOLDER_TYPE(cur_folder) != F_MBOX) break;
+ } else if (FOLDER_TYPE(folder) == F_IMAP) {
+ if (FOLDER_TYPE(cur_folder) != F_MH &&
+ FOLDER_TYPE(cur_folder) != F_MBOX &&
+ FOLDER_TYPE(cur_folder) != F_IMAP) break;
+ } else if (FOLDER_TYPE(folder) == F_NEWS) {
+ if (FOLDER_TYPE(cur_folder) != F_MH &&
+ FOLDER_TYPE(cur_folder) != F_MBOX &&
+ FOLDER_TYPE(cur_folder) != F_IMAP &&
+ FOLDER_TYPE(cur_folder) != F_NEWS) break;
}
}
fputs("</folderlist>\n", pfile->fp);
- if (prefs_write_close(pfile) < 0)
+ if (prefs_file_close(pfile) < 0)
g_warning("failed to write folder list.\n");
}
{
GHashTable *pptable;
- if (!folder->scan_tree)
+ if (!folder->klass->scan_tree)
return;
pptable = folder_persist_prefs_new(folder);
folder_tree_destroy(folder);
- folder->scan_tree(folder);
+ folder->klass->scan_tree(folder);
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->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 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->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 *total)
+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.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;
- *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)
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
- if ((folder->type == F_MH || folder->type == F_MBOX) &&
+ if ((FOLDER_TYPE(folder) == F_MH || FOLDER_TYPE(folder) == F_MBOX) &&
!path_cmp(LOCAL_FOLDER(folder)->rootpath, path))
return folder;
}
return NULL;
}
-Folder *folder_find_from_name(const gchar *name, FolderType type)
+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->type == type && strcmp2(name, folder->name) == 0)
+ if (folder->klass == klass && strcmp2(name, folder->name) == 0)
return folder;
}
return d[1];
}
-static const struct {
- gchar *str;
- FolderType type;
-} type_str_table[] = {
- {"#mh" , F_MH},
- {"#mbox" , F_MBOX},
- {"#maildir", F_MAILDIR},
- {"#imap" , F_IMAP},
- {"#news" , F_NEWS}
-};
-
-static gchar *folder_get_type_string(FolderType type)
+FolderClass *folder_get_class_from_string(const gchar *str)
{
- gint i;
+ GSList *classlist;
- for (i = 0; i < sizeof(type_str_table) / sizeof(type_str_table[0]);
- i++) {
- if (type_str_table[i].type == type)
- return type_str_table[i].str;
+ classlist = folder_get_class_list();
+ for (; classlist != NULL; classlist = g_slist_next(classlist)) {
+ FolderClass *class = (FolderClass *) classlist->data;
+ if (g_strcasecmp(class->idstr, str) == 0)
+ return class;
}
return NULL;
}
-static FolderType folder_get_type_from_string(const gchar *str)
-{
- gint i;
-
- for (i = 0; i < sizeof(type_str_table) / sizeof(type_str_table[0]);
- i++) {
- if (g_strcasecmp(type_str_table[i].str, str) == 0)
- return type_str_table[i].type;
- }
-
- return F_UNKNOWN;
-}
-
gchar *folder_get_identifier(Folder *folder)
{
gchar *type_str;
g_return_val_if_fail(folder != NULL, NULL);
- type_str = folder_get_type_string(folder->type);
- return g_strconcat(type_str, "/", folder->name, NULL);
+ type_str = folder->klass->idstr;
+ return g_strconcat("#", type_str, "/", folder->name, NULL);
}
gchar *folder_item_get_identifier(FolderItem *item)
gchar *p;
gchar *name;
gchar *path;
- FolderType type;
+ FolderClass *class;
g_return_val_if_fail(identifier != NULL, NULL);
return folder_find_item_from_path(identifier);
*p = '\0';
p++;
- type = folder_get_type_from_string(str);
- if (type == F_UNKNOWN)
+ class = folder_get_class_from_string(&str[1]);
+ if (class == NULL)
return folder_find_item_from_path(identifier);
name = p;
*p = '\0';
p++;
- folder = folder_find_from_name(name, type);
+ folder = folder_find_from_name(name, class);
if (!folder)
return folder_find_item_from_path(identifier);
return d[1];
}
+/**
+ * Get a displayable name for a FolderItem
+ *
+ * \param item FolderItem for that a name should be created
+ * \return Displayable name for item, returned string has to
+ * be freed
+ */
+gchar *folder_item_get_name(FolderItem *item)
+{
+ gchar *name = NULL;
+
+ switch (item->stype) {
+ case F_INBOX:
+ name = g_strdup(!strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
+ item->name);
+ break;
+ case F_OUTBOX:
+ name = g_strdup(!strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
+ item->name);
+ break;
+ case F_QUEUE:
+ name = g_strdup(!strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
+ item->name);
+ break;
+ case F_TRASH:
+ name = g_strdup(!strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+ item->name);
+ break;
+ case F_DRAFT:
+ name = g_strdup(!strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+ item->name);
+ break;
+ default:
+ break;
+ }
+
+ if (name == NULL) {
+ /*
+ * should probably be done by a virtual function,
+ * the folder knows the ui string and how to abbrev
+ */
+ if (!item->parent) {
+ 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))
+ name = get_abbrev_newsgroup_name
+ (item->path,
+ prefs_common.ng_abbrev_len);
+ else
+ name = g_strdup(item->name);
+ }
+ }
+
+ if (name == NULL)
+ name = g_strdup("");
+
+ return name;
+}
+
Folder *folder_get_default_folder(void)
{
return folder_list ? FOLDER(folder_list->data) : NULL;
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
- if (folder->type != F_MH) continue;
+ if (FOLDER_TYPE(folder) != F_MH) continue;
rootitem = FOLDER_ITEM(folder->node->data);
g_return_if_fail(rootitem != NULL);
folder->queue && folder->trash)
continue;
- if (folder->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;
flags->perm_flags = 0;
}
flags->tmp_flags = MSG_CACHED;
- if (dest->folder->type == F_MH) {
+ if (FOLDER_TYPE(dest->folder) == F_MH) {
if (dest->stype == F_QUEUE) {
MSG_SET_TMP_FLAGS(*flags, MSG_QUEUED);
} else if (dest->stype == F_DRAFT) {
MSG_SET_TMP_FLAGS(*flags, MSG_DRAFT);
}
- } else if (dest->folder->type == F_IMAP) {
- MSG_SET_TMP_FLAGS(*flags, MSG_IMAP);
- } else if (dest->folder->type == F_NEWS) {
- MSG_SET_TMP_FLAGS(*flags, MSG_NEWS);
}
}
gint folder_item_open(FolderItem *item)
{
- if(((item->folder->type == F_IMAP) && !item->no_select) || (item->folder->type == F_NEWS)) {
+ if(((FOLDER_TYPE(item->folder) == F_IMAP) && !item->no_select) || (FOLDER_TYPE(item->folder) == F_NEWS)) {
folder_item_scan(item);
}
GSList *mlist, *cur;
g_return_if_fail(item != NULL);
-
- mlist = folder_item_get_msg_list(item);
-
- for (cur = mlist ; cur != NULL ; cur = cur->next) {
- MsgInfo * msginfo;
- msginfo = (MsgInfo *) cur->data;
- if (MSG_IS_NEW(msginfo->flags))
- procmsg_msginfo_unset_flags(msginfo, MSG_NEW, 0);
- procmsg_msginfo_free(msginfo);
- }
-
- folder_update_item(item, FALSE);
+ if (item->new_msgs) {
+ mlist = folder_item_get_msg_list(item);
+ for (cur = mlist ; cur != NULL ; cur = cur->next) {
+ MsgInfo * msginfo;
- g_slist_free(mlist);
+ msginfo = (MsgInfo *) cur->data;
+ if (MSG_IS_NEW(msginfo->flags))
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW, 0);
+ procmsg_msginfo_free(msginfo);
+ }
+ g_slist_free(mlist);
+ }
+
+ folder_item_write_cache(item);
+
+ folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
}
gint folder_item_scan(FolderItem *item)
{
Folder *folder;
- GSList *folder_list = NULL, *cache_list = NULL, *folder_list_cur, *cache_list_cur, *new_list = NULL;
- guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
+ GSList *folder_list = NULL, *cache_list = NULL;
+ GSList *folder_list_cur, *cache_list_cur, *new_list = NULL;
+ GSList *exists_list = NULL, *elem;
+ 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 contentchange = FALSE;
+ gboolean update_flags = 0;
g_return_val_if_fail(item != NULL, -1);
if (item->path == NULL) return -1;
folder = item->folder;
g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->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->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->check_msgnum_validity ||
- folder->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);
if (folder_cur_num < cache_cur_num) {
gboolean add = FALSE;
- switch(folder->type) {
+ switch(FOLDER_TYPE(folder)) {
case F_NEWS:
if (folder_cur_num < cache_max_num)
break;
- if (prefs_common.max_articles == 0) {
+ if (folder->account->max_articles == 0) {
add = TRUE;
}
- if (folder_max_num <= prefs_common.max_articles) {
+ if (folder_max_num <= folder->account->max_articles) {
add = TRUE;
- } else if (folder_cur_num > (folder_max_num - prefs_common.max_articles)) {
+ } else if (folder_cur_num > (folder_max_num - folder->account->max_articles)) {
add = TRUE;
}
break;
else
folder_cur_num = G_MAXINT;
- contentchange = TRUE;
-
continue;
}
else
cache_cur_num = G_MAXINT;
- contentchange = TRUE;
+ update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
continue;
}
MsgInfo *msginfo;
msginfo = msgcache_get_msg(item->cache, folder_cur_num);
- if (folder->is_msg_changed && folder->is_msg_changed(folder, item, msginfo)) {
- MsgInfo *newmsginfo;
-
+ 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);
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, item, folder_cur_num))) {
- msgcache_add_msg(item->cache, newmsginfo);
- if (MSG_IS_NEW(newmsginfo->flags) && !MSG_IS_IGNORE_THREAD(newmsginfo->flags))
- newcnt++;
- if (MSG_IS_UNREAD(newmsginfo->flags) && !MSG_IS_IGNORE_THREAD(newmsginfo->flags))
- unreadcnt++;
- procmsg_msginfo_free(newmsginfo);
- }
-
- debug_print("Updated msginfo for message %d.\n", folder_cur_num);
- } else {
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- newcnt++;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- unreadcnt++;
- }
- totalcnt++;
- procmsg_msginfo_free(msginfo);
+ debug_print("Remembering message %d to update...\n", folder_cur_num);
+ } else
+ exists_list = g_slist_prepend(exists_list, msginfo);
/* Move to next folder and cache number */
cache_list_cur = cache_list_cur->next;
else
folder_cur_num = G_MAXINT;
- contentchange = TRUE;
-
continue;
}
}
-
- for(cache_list_cur = cache_list; cache_list_cur != NULL; cache_list_cur = g_slist_next(cache_list_cur)) {
+
+ for(cache_list_cur = cache_list; cache_list_cur != NULL; cache_list_cur = g_slist_next(cache_list_cur))
procmsg_msginfo_free((MsgInfo *) cache_list_cur->data);
- }
g_slist_free(cache_list);
g_slist_free(folder_list);
- if (folder->fetch_msginfos) {
- GSList *elem;
- GSList *newmsg_list;
- MsgInfo *msginfo;
-
- if (new_list) {
- newmsg_list = folder->fetch_msginfos(folder, item, new_list);
- for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
- msginfo = (MsgInfo *) elem->data;
- msgcache_add_msg(item->cache, msginfo);
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- newcnt++;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- unreadcnt++;
- totalcnt++;
- procmsg_msginfo_free(msginfo);
+ if (new_list != NULL) {
+ 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)) {
+ MsgInfo *msginfo;
+ guint num;
+
+ num = GPOINTER_TO_INT(elem->data);
+ 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(newmsg_list);
}
- } else if (folder->fetch_msginfo) {
+ g_slist_free(new_list);
+ }
+
+ if (newmsg_list != NULL) {
GSList *elem;
-
- for (elem = new_list; elem != NULL; elem = g_slist_next(elem)) {
- MsgInfo *msginfo;
- guint num;
-
- num = GPOINTER_TO_INT(elem->data);
- msginfo = folder->fetch_msginfo(folder, item, num);
- if (msginfo != NULL) {
- msgcache_add_msg(item->cache, msginfo);
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- newcnt++;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- unreadcnt++;
- totalcnt++;
+
+ for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
+ MsgInfo *msginfo = (MsgInfo *) elem->data;
+
+ msgcache_add_msg(item->cache, msginfo);
+ if ((item->stype == F_INBOX) &&
+ (item->folder->account != NULL) &&
+ (item->folder->account->filter_on_recv) &&
+ procmsg_msginfo_filter(msginfo))
procmsg_msginfo_free(msginfo);
- debug_print("Added newly found message %d to cache.\n", num);
- }
+ else
+ exists_list = g_slist_prepend(exists_list, msginfo);
}
+ g_slist_free(newmsg_list);
+
+ update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
}
- item->new = newcnt;
- item->unread = unreadcnt;
- item->total = totalcnt;
-
- g_slist_free(new_list);
+ for (elem = exists_list; elem != NULL; elem = g_slist_next(elem)) {
+ MsgInfo *msginfo;
- folder_update_item(item, contentchange);
+ msginfo = elem->data;
+ if (MSG_IS_IGNORE_THREAD(msginfo->flags) && (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD)) {
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+ }
+ if ((item->stype == F_OUTBOX ||
+ item->stype == F_QUEUE ||
+ item->stype == F_DRAFT ||
+ item->stype == F_TRASH) &&
+ (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ if (MSG_IS_NEW(msginfo->flags))
+ newcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ unreadcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ unreadmarkedcnt++;
+ totalcnt++;
+
+ procmsg_msginfo_free(msginfo);
+ }
+ g_slist_free(exists_list);
+
+ 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);
return 0;
}
g_free(mark_file);
}
-MsgInfo *folder_item_fetch_msginfo(FolderItem *item, gint num)
+MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
{
Folder *folder;
MsgInfo *msginfo;
if ((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
return msginfo;
- g_return_val_if_fail(folder->fetch_msginfo, NULL);
- if ((msginfo = folder->fetch_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;
}
return NULL;
}
-MsgInfo *folder_item_fetch_msginfo_by_id(FolderItem *item, const gchar *msgid)
+MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
{
Folder *folder;
MsgInfo *msginfo;
folder = item->folder;
- g_return_val_if_fail(folder->fetch_msg != NULL, NULL);
+ g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
+
+ return folder->klass->fetch_msg(folder, item, num);
+}
+
+static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
+{
+ static HeaderEntry hentry[] = {{"Message-ID:", NULL, TRUE},
+ {NULL, NULL, FALSE}};
+ FILE *fp;
+ MsgInfo *msginfo;
+ gint msgnum = 0;
+ gchar buf[BUFFSIZE];
+
+ if ((fp = fopen(file, "rb")) == NULL)
+ return 0;
+
+ if ((dest->stype == F_QUEUE) || (dest->stype == F_DRAFT))
+ while (fgets(buf, sizeof(buf), fp) != NULL)
+ if (buf[0] == '\r' || buf[0] == '\n') break;
+
+ procheader_get_header_fields(fp, hentry);
+ if (hentry[0].body) {
+ extract_parenthesis(hentry[0].body, '<', '>');
+ remove_space(hentry[0].body);
+ if ((msginfo = msgcache_get_msg_by_id(dest->cache, hentry[0].body)) != NULL) {
+ msgnum = msginfo->msgnum;
+ procmsg_msginfo_free(msginfo);
+
+ debug_print("found message as uid %d\n", msgnum);
+ }
+ }
+
+ g_free(hentry[0].body);
+ hentry[0].body = NULL;
+ fclose(fp);
- return folder->fetch_msg(folder, item, num);
+ return msgnum;
+}
+
+static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
+{
+ MsgPermFlags perm_flags = 0;
+ MsgTmpFlags tmp_flags = 0;
+
+ /* create new flags */
+ if (source != NULL) {
+ /* copy original flags */
+ perm_flags = source->flags.perm_flags;
+ tmp_flags = source->flags.tmp_flags;
+ } else {
+ perm_flags = dest->flags.perm_flags;
+ tmp_flags = dest->flags.tmp_flags;
+ }
+
+ /* remove new, unread and deleted in special folders */
+ if (dest->folder->stype == F_OUTBOX ||
+ dest->folder->stype == F_QUEUE ||
+ dest->folder->stype == F_DRAFT ||
+ dest->folder->stype == F_TRASH)
+ perm_flags &= ~(MSG_NEW | MSG_UNREAD | MSG_DELETED);
+
+ /* set ignore flag of ignored parent exists */
+ if (procmsg_msg_has_flagged_parent(dest, MSG_IGNORE_THREAD))
+ perm_flags |= MSG_IGNORE_THREAD;
+
+ /* Unset tmp flags that should not be copied */
+ tmp_flags &= ~(MSG_MOVE | MSG_COPY);
+
+ /* unset flags that are set but should not */
+ procmsg_msginfo_unset_flags(dest,
+ dest->flags.perm_flags & ~perm_flags,
+ dest->flags.tmp_flags & ~tmp_flags);
+ /* set new flags */
+ procmsg_msginfo_set_flags(dest,
+ ~dest->flags.perm_flags & perm_flags,
+ ~dest->flags.tmp_flags & tmp_flags);
+
+ folder_item_update(dest->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+}
+
+static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo *flagsource)
+{
+ /* update folder stats */
+ if (MSG_IS_NEW(newmsginfo->flags))
+ item->new_msgs++;
+ if (MSG_IS_UNREAD(newmsginfo->flags))
+ item->unread_msgs++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ item->unreadmarked_msgs++;
+ item->total_msgs++;
+
+ copy_msginfo_flags(flagsource, newmsginfo);
+
+ msgcache_add_msg(item->cache, newmsginfo);
+}
+
+static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
+{
+ if (!item->cache)
+ folder_item_read_cache(item);
+
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ msginfo->folder->new_msgs--;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ msginfo->folder->unread_msgs--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ 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,
folder = dest->folder;
- g_return_val_if_fail(folder->add_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->add_msg != NULL, -1);
if (!dest->cache)
folder_item_read_cache(dest);
- num = folder->add_msg(folder, dest, file, remove_source);
+ num = folder->klass->add_msg(folder, dest, file, FALSE);
if (num > 0) {
- msginfo = folder->fetch_msginfo(folder, dest, num);
+ msginfo = folder->klass->get_msginfo(folder, dest, num);
if (msginfo != NULL) {
- if (MSG_IS_NEW(msginfo->flags))
- dest->new++;
- if (MSG_IS_UNREAD(msginfo->flags))
- dest->unread++;
- dest->total++;
- dest->need_update = TRUE;
-
- msgcache_add_msg(dest->cache, msginfo);
-
+ add_msginfo_to_cache(dest, msginfo, NULL);
procmsg_msginfo_free(msginfo);
}
dest->last_num = num;
- }
+ } else if (num == 0) {
+ folder_item_scan(dest);
+ num = folder_item_get_msg_num_by_file(dest, file);
+ }
+
+ if (num >= 0 && remove_source) {
+ if (unlink(file) < 0)
+ FILE_OP_ERROR(file, "unlink");
+ }
return num;
}
FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
{
GSList *mlist;
- GSList *cur;
FolderItem *new_item;
FolderItem *next_item;
GNode *srcnode;
- int cnt = 0;
+ gchar *old_id, *new_id;
+
mlist = folder_item_get_msg_list(src);
/* move messages */
return NULL;
}
- statusbar_print_all(_("Moving %s to %s..."), src->name, new_item->path);
-
if (new_item->folder == NULL)
new_item->folder = dest->folder;
/* move messages */
- for (cur = mlist ; cur != NULL ; cur = cur->next) {
- MsgInfo * msginfo;
- cnt++;
- if (cnt%500)
- statusbar_print_all(_("Moving %s to %s (%d%%)..."), src->name,
- new_item->path,
- 100*cnt/g_slist_length(mlist));
- msginfo = (MsgInfo *) cur->data;
- folder_item_move_msg(new_item, msginfo);
- if (cnt%500)
- statusbar_pop_all();
- }
+ log_message(_("Moving %s to %s...\n"),
+ src->name, new_item->path);
+ folder_item_move_msgs_with_dest(new_item, mlist);
/*copy prefs*/
prefs_folder_item_copy_prefs(src, new_item);
new_item->collapsed = src->collapsed;
+ new_item->thread_collapsed = src->thread_collapsed;
new_item->threaded = src->threaded;
new_item->ret_rcpt = src->ret_rcpt;
new_item->hide_read_msgs = src->hide_read_msgs;
while (srcnode != NULL) {
if (srcnode && srcnode->data) {
next_item = (FolderItem*) srcnode->data;
+ srcnode = srcnode->next;
if (folder_item_move_recursive(next_item, new_item) == NULL)
return NULL;
}
- srcnode = srcnode->next;
}
+ old_id = folder_item_get_identifier(src);
+ new_id = folder_item_get_identifier(new_item);
+ debug_print("updating rules : %s => %s\n", old_id, new_id);
+
+ src->folder->klass->remove_folder(src->folder, src);
+ folder_write_list();
+
+ if (old_id != NULL && new_id != NULL)
+ prefs_filtering_rename_path(old_id, new_id);
+ g_free(old_id);
+ g_free(new_id);
+
return new_item;
}
-FolderItem *folder_item_move_to(FolderItem *src, FolderItem *dest)
+gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item)
{
FolderItem *tmp = dest->parent;
- char * src_identifier, * dst_identifier, * new_identifier;
- char * phys_srcpath, * phys_dstpath;
+ gchar * src_identifier, * dst_identifier;
+ gchar * phys_srcpath, * phys_dstpath;
GNode *src_node;
while (tmp) {
if (tmp == src) {
- alertpanel_error(_("Can't move a folder to one of its children."));
- return NULL;
+ return F_MOVE_FAILED_DEST_IS_CHILD;
}
tmp = tmp->parent;
}
dst_identifier = folder_get_identifier(dest->folder);
}
if (src_identifier == NULL || dst_identifier == NULL) {
- printf("Can't get identifiers\n");
- return NULL;
+ debug_print("Can't get identifiers\n");
+ return F_MOVE_FAILED;
+ }
+
+ if (src->folder != dest->folder) {
+ return F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX;
}
phys_srcpath = folder_item_get_path(src);
phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
- if (src->parent == dest) {
- alertpanel_error(_("Source and destination are the same."));
+ if (src->parent == dest || src == dest) {
g_free(src_identifier);
g_free(dst_identifier);
g_free(phys_srcpath);
g_free(phys_dstpath);
- return NULL;
+ return F_MOVE_FAILED_DEST_IS_PARENT;
}
debug_print("moving \"%s\" to \"%s\"\n", phys_srcpath, phys_dstpath);
if ((tmp = folder_item_move_recursive(src, dest)) == NULL) {
- alertpanel_error(_("Move failed!"));
- return NULL;
+ return F_MOVE_FAILED;
}
/* update rules */
- src->folder->remove_folder(src->folder, src);
src_node = g_node_find(src->folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, src);
if (src_node)
g_node_destroy(src_node);
debug_print("can't remove node: it's null!\n");
/* not to much worry if remove fails, move has been done */
- debug_print("updating rules ....\n");
- new_identifier = g_strconcat(dst_identifier, G_DIR_SEPARATOR_S, g_basename(phys_srcpath), NULL);
- prefs_filtering_rename_path(src_identifier, new_identifier);
-
- folder_write_list();
-
g_free(src_identifier);
g_free(dst_identifier);
- g_free(new_identifier);
g_free(phys_srcpath);
g_free(phys_dstpath);
- return tmp;
+ *new_item = tmp;
+
+ return F_MOVE_OK;
}
gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
{
- Folder *folder;
- gint num;
- Folder *src_folder;
-
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
-
- folder = dest->folder;
-
- g_return_val_if_fail(folder->remove_msg != NULL, -1);
- g_return_val_if_fail(folder->copy_msg != NULL, -1);
-
- if (!dest->cache) folder_item_read_cache(dest);
-
- src_folder = msginfo->folder->folder;
+ GSList *list = NULL;
+ gint ret;
- num = folder->copy_msg(folder, dest, msginfo);
+ list = g_slist_append(list, msginfo);
+ ret = folder_item_move_msgs_with_dest(dest, list);
+ g_slist_free(list);
- if (num != -1) {
- MsgInfo *newmsginfo;
-
- /* Add new msginfo to dest folder */
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
- newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
-
- if (dest->stype == F_OUTBOX || dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT || dest->stype == F_TRASH)
- MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
- msgcache_add_msg(dest->cache, newmsginfo);
-
- if (MSG_IS_NEW(newmsginfo->flags))
- dest->new++;
- if (MSG_IS_UNREAD(newmsginfo->flags))
- dest->unread++;
- dest->total++;
- dest->need_update = TRUE;
-
- procmsg_msginfo_free(newmsginfo);
- }
-
- /* remove source message from it's folder */
- if (src_folder->remove_msg) {
- src_folder->remove_msg(src_folder, msginfo->folder,
- msginfo->msgnum);
- msgcache_remove_msg(msginfo->folder->cache, msginfo->msgnum);
-
- if (MSG_IS_NEW(msginfo->flags))
- msginfo->folder->new--;
- if (MSG_IS_UNREAD(msginfo->flags))
- msginfo->folder->unread--;
- msginfo->folder->total--;
- msginfo->folder->need_update = TRUE;
- }
- }
-
- if (folder->finished_copy)
- folder->finished_copy(folder, dest);
-
- return num;
+ return ret;
}
/*
}
*/
+
+
gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
{
Folder *folder;
FolderItem *item;
GSList *newmsgnums = NULL;
GSList *l, *l2;
- gint num;
+ gint num, lastnum = -1;
+ 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->copy_msg != NULL, -1);
- g_return_val_if_fail(folder->remove_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
/*
* Copy messages to destination folder and
if (!item && msginfo->folder != NULL)
item = msginfo->folder;
- num = folder->copy_msg(folder, dest, msginfo);
+ 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
MsgInfo *msginfo = (MsgInfo *) l->data;
num = GPOINTER_TO_INT(l2->data);
+ l2 = g_slist_next(l2);
- if (num != -1) {
+ if (num >= 0) {
MsgInfo *newmsginfo;
- newmsginfo = folder->fetch_msginfo(folder, dest, num);
- if (newmsginfo) {
- newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
- msgcache_add_msg(dest->cache, newmsginfo);
-
- if (MSG_IS_NEW(newmsginfo->flags))
- dest->new++;
- if (MSG_IS_UNREAD(newmsginfo->flags))
- dest->unread++;
- dest->total++;
- dest->need_update = TRUE;
+ 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);
}
}
- l2 = g_slist_next(l2);
}
/*
MsgInfo *msginfo = (MsgInfo *) l->data;
num = GPOINTER_TO_INT(l2->data);
+ l2 = g_slist_next(l2);
- if (num != -1) {
- item->folder->remove_msg(item->folder,
- msginfo->folder,
- msginfo->msgnum);
- if (!item->cache)
- folder_item_read_cache(item);
- msgcache_remove_msg(item->cache, msginfo->msgnum);
-
- if (MSG_IS_NEW(msginfo->flags))
- msginfo->folder->new--;
- if (MSG_IS_UNREAD(msginfo->flags))
- msginfo->folder->unread--;
- msginfo->folder->total--;
- msginfo->folder->need_update = TRUE;
+ if (num >= 0) {
+ item->folder->klass->remove_msg(item->folder,
+ msginfo->folder,
+ msginfo->msgnum);
+ remove_msginfo_from_cache(item, msginfo);
}
-
- l2 = g_slist_next(l2);
}
- if (folder->finished_copy)
- folder->finished_copy(folder, dest);
+ if (folder->klass->finished_copy)
+ folder->klass->finished_copy(folder, dest);
g_slist_free(newmsgnums);
- return dest->last_num;
+ return lastnum;
}
/*
gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
{
- Folder *folder;
- gint num;
-
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
-
- folder = dest->folder;
-
- g_return_val_if_fail(folder->copy_msg != NULL, -1);
+ GSList *list = NULL;
+ gint ret;
- if (!dest->cache) folder_item_read_cache(dest);
+ list = g_slist_append(list, msginfo);
+ ret = folder_item_copy_msgs_with_dest(dest, list);
+ g_slist_free(list);
- num = folder->copy_msg(folder, dest, msginfo);
- if (num != -1) {
- MsgInfo *newmsginfo;
-
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
- newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
- msgcache_add_msg(dest->cache, newmsginfo);
-
- if (MSG_IS_NEW(newmsginfo->flags))
- dest->new++;
- if (MSG_IS_UNREAD(newmsginfo->flags))
- dest->unread++;
- dest->total++;
- dest->need_update = TRUE;
-
- procmsg_msginfo_free(newmsginfo);
- }
- }
-
- if (folder->finished_copy)
- folder->finished_copy(folder, dest);
-
- return num;
+ return ret;
}
/*
gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
{
Folder *folder;
- gint num;
+ 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->copy_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
/*
* Copy messages to destination folder and
for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
MsgInfo * msginfo = (MsgInfo *) l->data;
- num = folder->copy_msg(folder, dest, msginfo);
+ num = folder->klass->copy_msg(folder, dest, msginfo);
newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
}
MsgInfo *msginfo = (MsgInfo *) l->data;
num = GPOINTER_TO_INT(l2->data);
+ l2 = g_slist_next(l2);
- if (num != -1) {
+ if (num >= 0) {
MsgInfo *newmsginfo;
- newmsginfo = folder->fetch_msginfo(folder, dest, num);
- if (newmsginfo) {
- newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
- msgcache_add_msg(dest->cache, newmsginfo);
-
- if (MSG_IS_NEW(newmsginfo->flags))
- dest->new++;
- if (MSG_IS_UNREAD(newmsginfo->flags))
- dest->unread++;
- dest->total++;
- dest->need_update = TRUE;
+ 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);
}
}
- l2 = g_slist_next(l2);
}
- if (folder->finished_copy)
- folder->finished_copy(folder, dest);
+ if (folder->klass->finished_copy)
+ folder->klass->finished_copy(folder, dest);
g_slist_free(newmsgnums);
- return dest->last_num;
+ return lastnum;
}
gint folder_item_remove_msg(FolderItem *item, gint num)
folder = item->folder;
if (!item->cache) folder_item_read_cache(item);
- ret = folder->remove_msg(folder, item, num);
+ ret = folder->klass->remove_msg(folder, item, num);
msginfo = msgcache_get_msg(item->cache, num);
if (msginfo != NULL) {
- if (MSG_IS_NEW(msginfo->flags))
- item->new--;
- if (MSG_IS_UNREAD(msginfo->flags))
- item->unread--;
+ remove_msginfo_from_cache(item, msginfo);
procmsg_msginfo_free(msginfo);
- msgcache_remove_msg(item->cache, num);
}
- item->total--;
- item->need_update = TRUE;
+ folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
return ret;
}
gint ret = 0;
g_return_val_if_fail(item != NULL, -1);
-
folder = item->folder;
- if (folder->remove_msgs) {
- ret = folder->remove_msgs(folder, item, msglist);
- if (ret == 0)
- folder->scan(folder);
- return ret;
- }
+ g_return_val_if_fail(folder != NULL, -1);
if (!item->cache) folder_item_read_cache(item);
folder = item->folder;
- g_return_val_if_fail(folder->remove_all_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->remove_all_msg != NULL, -1);
- result = folder->remove_all_msg(folder, item);
+ result = folder->klass->remove_all_msg(folder, item);
if (result == 0) {
- if (folder->finished_remove)
- folder->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->total = 0;
- item->need_update = TRUE;
+ 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);
}
return result;
}
+void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFlags newflags)
+{
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(msginfo != NULL);
+
+ if (item->folder->klass->change_flags != NULL) {
+ item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
+ } else {
+ msginfo->flags.perm_flags = newflags;
+ }
+}
+
gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
{
Folder *folder;
folder = item->folder;
- g_return_val_if_fail(folder->is_msg_changed != NULL, -1);
+ g_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
- return folder->is_msg_changed(folder, item, msginfo);
+ return folder->klass->is_msg_changed(folder, item, msginfo);
}
gchar *folder_item_get_cache_file(FolderItem *item)
PrefsAccount *account = NULL;
gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE,
threaded = TRUE, apply_sub = FALSE;
- gboolean ret_rcpt = FALSE, hidereadmsgs = FALSE; /* CLAWS */
+ gboolean ret_rcpt = FALSE, hidereadmsgs = FALSE,
+ thread_collapsed = FALSE; /* CLAWS */
FolderSortKey sort_key = SORT_BY_NONE;
FolderSortType sort_type = SORT_ASCENDING;
- gint new = 0, unread = 0, total = 0;
+ gint new = 0, unread = 0, total = 0, unreadmarked = 0;
time_t mtime = 0;
g_return_val_if_fail(node->data != NULL, FALSE);
new = atoi(attr->value);
else if (!strcmp(attr->name, "unread"))
unread = atoi(attr->value);
+ else if (!strcmp(attr->name, "unreadmarked"))
+ unreadmarked = atoi(attr->value);
else if (!strcmp(attr->name, "total"))
total = atoi(attr->value);
else if (!strcmp(attr->name, "no_sub"))
no_select = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "collapsed"))
collapsed = *attr->value == '1' ? TRUE : FALSE;
+ else if (!strcmp(attr->name, "thread_collapsed"))
+ thread_collapsed = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "threaded"))
threaded = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "hidereadmsgs"))
else if (!strcmp(attr->value, "mark"))
sort_key = SORT_BY_MARK;
else if (!strcmp(attr->value, "unread"))
- sort_key = SORT_BY_UNREAD;
+ sort_key = SORT_BY_STATUS;
else if (!strcmp(attr->value, "mime"))
sort_key = SORT_BY_MIME;
+ else if (!strcmp(attr->value, "to"))
+ sort_key = SORT_BY_TO;
else if (!strcmp(attr->value, "locked"))
sort_key = SORT_BY_LOCKED;
} else if (!strcmp(attr->name, "sort_type")) {
item = folder_item_new(folder, name, path);
item->stype = stype;
item->mtime = mtime;
- item->new = new;
- item->unread = unread;
- 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->thread_collapsed = thread_collapsed;
item->threaded = threaded;
item->hide_read_msgs = hidereadmsgs;
item->ret_rcpt = ret_rcpt;
Folder *folder;
XMLNode *xmlnode;
GList *list;
- FolderType type = F_UNKNOWN;
+ FolderClass *class = NULL;
const gchar *name = NULL;
const gchar *path = NULL;
PrefsAccount *account = NULL;
gboolean collapsed = FALSE, threaded = TRUE, apply_sub = FALSE;
- gboolean ret_rcpt = FALSE; /* CLAWS */
+ gboolean ret_rcpt = FALSE, thread_collapsed = FALSE; /* CLAWS */
if (g_node_depth(node) != 2) return FALSE;
g_return_val_if_fail(node->data != NULL, FALSE);
XMLAttr *attr = list->data;
if (!attr || !attr->name || !attr->value) continue;
- if (!strcmp(attr->name, "type")) {
- if (!strcasecmp(attr->value, "mh"))
- type = F_MH;
- else if (!strcasecmp(attr->value, "mbox"))
- type = F_MBOX;
- else if (!strcasecmp(attr->value, "maildir"))
- type = F_MAILDIR;
- else if (!strcasecmp(attr->value, "imap"))
- type = F_IMAP;
- else if (!strcasecmp(attr->value, "news"))
- type = F_NEWS;
- } else if (!strcmp(attr->name, "name"))
+ if (!strcmp(attr->name, "type"))
+ class = folder_get_class_from_string(attr->value);
+ else if (!strcmp(attr->name, "name"))
name = attr->value;
else if (!strcmp(attr->name, "path"))
path = attr->value;
else if (!strcmp(attr->name, "collapsed"))
collapsed = *attr->value == '1' ? TRUE : FALSE;
+ else if (!strcmp(attr->name, "thread_collapsed"))
+ thread_collapsed = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "threaded"))
threaded = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "account_id")) {
ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
}
- folder = folder_new(type, name, path);
+ folder = folder_new(class, name, path);
g_return_val_if_fail(folder != NULL, FALSE);
folder->account = account;
- if (account && (type == F_IMAP || type == F_NEWS))
+ if (account != NULL)
account->folder = REMOTE_FOLDER(folder);
node->data = folder->node->data;
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;
FILE *fp = (FILE *)data;
FolderItem *item;
gint i, depth;
- static gchar *folder_type_str[] = {"mh", "mbox", "maildir", "imap",
- "news", "unknown"};
static gchar *folder_item_stype_str[] = {"normal", "inbox", "outbox",
"draft", "queue", "trash"};
static gchar *sort_key_str[] = {"none", "number", "size", "date",
"from", "subject", "score", "label",
- "mark", "unread", "mime", "locked" };
+ "mark", "unread", "mime", "to",
+ "locked"};
g_return_if_fail(node != NULL);
g_return_if_fail(fp != NULL);
if (depth == 1) {
Folder *folder = item->folder;
- fprintf(fp, "<folder type=\"%s\"", folder_type_str[folder->type]);
+ fprintf(fp, "<folder type=\"%s\"", folder->klass->idstr);
if (folder->name)
PUT_ESCAPE_STR(fp, "name", folder->name);
- if (folder->type == F_MH || folder->type == F_MBOX)
+ if (FOLDER_TYPE(folder) == F_MH || FOLDER_TYPE(folder) == F_MBOX)
PUT_ESCAPE_STR(fp, "path",
LOCAL_FOLDER(folder)->rootpath);
if (item->collapsed && node->children)
fputs(" no_select=\"1\"", fp);
if (item->collapsed && node->children)
fputs(" collapsed=\"1\"", fp);
+ else
+ fputs(" collapsed=\"0\"", fp);
+ if (item->thread_collapsed)
+ fputs(" thread_collapsed=\"1\"", fp);
+ else
+ fputs(" thread_collapsed=\"0\"", fp);
if (item->threaded)
fputs(" threaded=\"1\"", fp);
else
}
fprintf(fp,
- " mtime=\"%lu\" new=\"%d\" unread=\"%d\" total=\"%d\"",
- item->mtime, item->new, item->unread, item->total);
+ " mtime=\"%lu\" new=\"%d\" unread=\"%d\" unreadmarked=\"%d\" total=\"%d\"",
+ item->mtime, item->new_msgs, item->unread_msgs, item->unreadmarked_msgs, item->total_msgs);
if (item->account)
fprintf(fp, " account_id=\"%d\"",
if (g_node_depth(node) > 0) {
if (fitem->op_count > 0) {
fitem->op_count = 0;
- folder_update_item(fitem, FALSE);
+ folder_item_update(fitem, F_ITEM_UPDATE_MSGCNT);
}
if (node->children) {
GNode *child;
*/
/* CLAWS: temporary local folder for filtering */
-static Folder *processing_folder;
+#define TEMP_FOLDER "TEMP_FOLDER"
+#define PROCESSING_FOLDER_ITEM "processing"
+
static FolderItem *processing_folder_item;
static void folder_create_processing_folder(void)
{
-#define PROCESSING_FOLDER ".processing"
- Folder *tmpparent;
+ Folder *processing_folder;
gchar *tmpname;
- tmpparent = folder_get_default_folder();
- g_assert(tmpparent);
- debug_print("tmpparentroot %s\n", LOCAL_FOLDER(tmpparent)->rootpath);
- if (LOCAL_FOLDER(tmpparent)->rootpath[0] == '/')
- tmpname = g_strconcat(LOCAL_FOLDER(tmpparent)->rootpath,
- G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+ if ((processing_folder = folder_find_from_name(TEMP_FOLDER, mh_get_class())) == NULL) {
+ gchar *tmppath;
+
+ tmppath =
+ g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ "tempfolder", NULL);
+ processing_folder =
+ folder_new(mh_get_class(), TEMP_FOLDER, tmppath);
+ g_free(tmppath);
+ }
+ g_assert(processing_folder != NULL);
+
+ debug_print("tmpparentroot %s\n", LOCAL_FOLDER(processing_folder)->rootpath);
+ if (LOCAL_FOLDER(processing_folder)->rootpath[0] == '/')
+ tmpname = g_strconcat(LOCAL_FOLDER(processing_folder)->rootpath,
+ G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
NULL);
else
tmpname = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
- LOCAL_FOLDER(tmpparent)->rootpath,
- G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+ LOCAL_FOLDER(processing_folder)->rootpath,
+ G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
NULL);
- processing_folder = folder_new(F_MH, "PROCESSING", LOCAL_FOLDER(tmpparent)->rootpath);
- g_assert(processing_folder);
-
if (!is_dir_exist(tmpname)) {
debug_print("*TMP* creating %s\n", tmpname);
- processing_folder_item = processing_folder->create_folder(processing_folder,
- processing_folder->node->data,
- PROCESSING_FOLDER);
- g_assert(processing_folder_item);
- }
- else {
+ 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);
}
+ g_assert(processing_folder_item != NULL);
g_free(tmpname);
}
prefs_folder_item_read_config(item);
item->collapsed = pp->collapsed;
+ item->thread_collapsed = pp->thread_collapsed;
item->threaded = pp->threaded;
item->ret_rcpt = pp->ret_rcpt;
item->hide_read_msgs = pp->hide_read_msgs;
pp = g_new0(PersistPrefs, 1);
g_return_if_fail(pp != NULL);
pp->collapsed = item->collapsed;
+ pp->thread_collapsed = item->thread_collapsed;
pp->threaded = item->threaded;
pp->ret_rcpt = item->ret_rcpt;
pp->hide_read_msgs = item->hide_read_msgs;
if (processing_list == NULL)
return;
+ folder_item_update_freeze();
+
mlist = folder_item_get_msg_list(item);
-
for (cur = mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo;
filter_message_by_msginfo(processing_list, msginfo);
procmsg_msginfo_free(msginfo);
}
-
- folder_update_items_when_required(FALSE);
-
g_slist_free(mlist);
+
+ folder_item_update_thaw();
}
/*
- * Callback handling for FolderItem content changes
+ * functions for handling FolderItem content changes
*/
-GSList *folder_item_update_callbacks_list = NULL;
-gint folder_item_update_callbacks_nextid = 0;
+static gint folder_item_update_freeze_cnt = 0;
-struct FolderItemUpdateCallback
-{
- gint id;
- FolderItemUpdateFunc func;
- gpointer data;
-};
-
-gint folder_item_update_callback_register(FolderItemUpdateFunc func, gpointer data)
+/**
+ * Notify the folder system about changes to a folder. If the
+ * update system is not frozen the FOLDER_ITEM_UPDATE_HOOKLIST will
+ * be invoked, otherwise the changes will be remebered until
+ * the folder system is thawed.
+ *
+ * \param item The FolderItem that was changed
+ * \param update_flags Type of changed that was made
+ */
+void folder_item_update(FolderItem *item, FolderItemUpdateFlags update_flags)
{
- struct FolderItemUpdateCallback *callback;
-
- g_return_val_if_fail(func != NULL, -1);
-
- folder_item_update_callbacks_nextid++;
-
- callback = g_new0(struct FolderItemUpdateCallback, 1);
- callback->id = folder_item_update_callbacks_nextid;
- callback->func = func;
- callback->data = data;
-
- folder_item_update_callbacks_list =
- g_slist_append(folder_item_update_callbacks_list, callback);
-
- return folder_item_update_callbacks_nextid;
+ if (folder_item_update_freeze_cnt == 0) {
+ FolderItemUpdateData source;
+
+ source.item = item;
+ source.update_flags = update_flags;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+ } else {
+ item->update_flags |= update_flags;
+ }
}
-void folder_item_update_callback_unregister(gint id)
+void folder_item_update_recursive(FolderItem *item, FolderItemUpdateFlags update_flags)
{
- GSList *list, *next;
+ GNode *node = item->folder->node;
- for (list = folder_item_update_callbacks_list; list != NULL; list = next) {
- struct FolderItemUpdateCallback *callback;
+ node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+ node = node->children;
- next = list->next;
+ folder_item_update(item, update_flags);
+ while (node != NULL) {
+ if (node && node->data) {
+ FolderItem *next_item = (FolderItem*) node->data;
- callback = list->data;
- if (callback->id == id) {
- folder_item_update_callbacks_list =
- g_slist_remove(folder_item_update_callbacks_list, callback);
- g_free(callback);
+ folder_item_update(next_item, update_flags);
}
+ node = node->next;
}
}
-static void folder_item_update_callback_execute(FolderItem *item, gboolean contentchange)
-{
- GSList *list;
-
- for (list = folder_item_update_callbacks_list; list != NULL; list = list->next) {
- struct FolderItemUpdateCallback *callback;
-
- callback = list->data;
- callback->func(item, contentchange, callback->data);
- }
-}
-
-void folder_update_item(FolderItem *item, gboolean contentchange)
+void folder_item_update_freeze()
{
- folder_item_update_callback_execute(item, contentchange);
+ folder_item_update_freeze_cnt++;
}
-static void folder_update_item_func(FolderItem *item, gpointer contentchange)
+static void folder_item_update_func(FolderItem *item, gpointer data)
{
- if (item->need_update) {
- folder_item_update_callback_execute(item, GPOINTER_TO_INT(contentchange));
- item->need_update = FALSE;
+ FolderItemUpdateData source;
+
+ if (item->update_flags) {
+ source.item = item;
+ source.update_flags = item->update_flags;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+ item->update_flags = 0;
}
}
-void folder_update_items_when_required(gboolean contentchange)
+void folder_item_update_thaw()
{
- folder_func_to_all_folders(folder_update_item_func, GINT_TO_POINTER(contentchange));
-}
-
-void folder_update_item_recursive(FolderItem *item, gboolean update_summary)
-{
- GNode *node = item->folder->node;
- node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
- node = node->children;
- folder_item_update_callback_execute(item, update_summary);
- while (node != NULL) {
- if (node && node->data) {
- FolderItem *next_item = (FolderItem*) node->data;
- folder_item_update_callback_execute(next_item, update_summary);
- }
- node = node->next;
+ if (folder_item_update_freeze_cnt > 0)
+ folder_item_update_freeze_cnt--;
+ if (folder_item_update_freeze_cnt == 0) {
+ /* Update all folders */
+ folder_func_to_all_folders(folder_item_update_func, NULL);
}
}
projects / claws.git / blobdiff