#include "intl.h"
#include "folder.h"
-#include "folderview.h"
#include "session.h"
#include "imap.h"
#include "news.h"
#include "xml.h"
#include "codeconv.h"
#include "prefs.h"
-#include "prefs_common.h"
#include "account.h"
-#include "prefs_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"
+#include "prefs_account.h"
+#include "prefs_folder_item.h"
static GList *folder_list = NULL;
folder->item_new = NULL;
folder->item_destroy = NULL;
folder->fetch_msg = NULL;
- folder->fetch_msginfo = NULL;
- folder->fetch_msginfos = NULL;
+ folder->get_msginfo = NULL;
+ folder->get_msginfos = NULL;
folder->get_num_list = NULL;
folder->ui_func = NULL;
folder->ui_func_data = NULL;
item->mtime = 0;
item->new = 0;
item->unread = 0;
+ item->unreadmarked = 0;
item->total = 0;
item->last_num = -1;
item->cache = NULL;
folder_persist_prefs_free(pptable);
prefs_matcher_read_config();
+
+ folder_write_list();
}
FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
{
guint new;
guint unread;
+ guint unreadmarked;
guint total;
};
count->new += item->new;
count->unread += item->unread;
+ count->unreadmarked += item->unreadmarked;
count->total += item->total;
}
-void folder_count_total_msgs(guint *new, guint *unread, guint *total)
+void folder_count_total_msgs(guint *new, guint *unread, guint *unreadmarked, guint *total)
{
struct TotalMsgCount count;
- count.new = count.unread = count.total = 0;
+ count.new = count.unread = count.unreadmarked = count.total = 0;
debug_print("Counting total number of messages...\n");
*new = count.new;
*unread = count.unread;
+ *unreadmarked = count.unreadmarked;
*total = count.total;
}
return (gint_a - gint_b);
}
+gint folder_item_open(FolderItem *item)
+{
+ if(((item->folder->type == F_IMAP) && !item->no_select) || (item->folder->type == F_NEWS)) {
+ folder_item_scan(item);
+ }
+
+ /* Processing */
+ if(item->prefs->processing != NULL) {
+ gchar *buf;
+
+ buf = g_strdup_printf(_("Processing (%s)...\n"), item->path);
+ debug_print("%s\n", buf);
+ g_free(buf);
+
+ folder_item_apply_processing(item);
+
+ debug_print("done.\n");
+ }
+
+ return 0;
+}
+
+void folder_item_close(FolderItem *item)
+{
+ GSList *mlist, *cur;
+
+ g_return_if_fail(item != NULL);
+
+ if (item->new) {
+ 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);
+ }
+ g_slist_free(mlist);
+ }
+
+ folder_item_write_cache(item);
+
+ folder_update_item(item, FALSE);
+
+}
+
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;
+ 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;
+
g_return_val_if_fail(item != NULL, -1);
if (item->path == NULL) return -1;
else
folder_cur_num = G_MAXINT;
+ contentchange = TRUE;
+
continue;
}
else
cache_cur_num = G_MAXINT;
+ contentchange = TRUE;
+
continue;
}
msgcache_remove_msg(item->cache, msginfo->msgnum);
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, item, folder_cur_num))) {
+ if (NULL != (newmsginfo = folder->get_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++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ unreadmarkedcnt++;
procmsg_msginfo_free(newmsginfo);
}
newcnt++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
unreadcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ unreadmarkedcnt++;
}
totalcnt++;
procmsg_msginfo_free(msginfo);
else
folder_cur_num = G_MAXINT;
+ contentchange = TRUE;
+
continue;
}
}
g_slist_free(cache_list);
g_slist_free(folder_list);
- if (folder->fetch_msginfos) {
+ if (folder->get_msginfos) {
GSList *elem;
GSList *newmsg_list;
MsgInfo *msginfo;
if (new_list) {
- newmsg_list = folder->fetch_msginfos(folder, item, new_list);
+ newmsg_list = folder->get_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);
newcnt++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
unreadcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ unreadmarkedcnt++;
totalcnt++;
procmsg_msginfo_free(msginfo);
}
g_slist_free(newmsg_list);
}
- } else if (folder->fetch_msginfo) {
+ } else if (folder->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->fetch_msginfo(folder, item, num);
+ msginfo = folder->get_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++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ unreadmarkedcnt++;
totalcnt++;
procmsg_msginfo_free(msginfo);
debug_print("Added newly found message %d to cache.\n", num);
item->new = newcnt;
item->unread = unreadcnt;
item->total = totalcnt;
-
+ item->unreadmarked = unreadmarkedcnt;
g_slist_free(new_list);
- folderview_update_item(item, FALSE);
+ folder_update_item(item, contentchange);
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->get_msginfo, NULL);
+ if ((msginfo = folder->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;
num = folder->add_msg(folder, dest, file, remove_source);
if (num > 0) {
- msginfo = folder->fetch_msginfo(folder, dest, num);
+ msginfo = folder->get_msginfo(folder, dest, num);
if (msginfo != NULL) {
if (MSG_IS_NEW(msginfo->flags))
dest->new++;
if (MSG_IS_UNREAD(msginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ dest->unreadmarked++;
dest->total++;
dest->need_update = TRUE;
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 */
+ statusbar_verbosity_set(TRUE);
for (cur = mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo;
cnt++;
- msginfo = (MsgInfo *) cur->data;
- folder_item_move_msg(new_item, msginfo);
if (cnt%500)
- statusbar_print_all(_("Moving %s to %s (%d%%)..."), src->name,
+ log_message(_("Moving %s to %s (%d%%)...\n"), src->name,
new_item->path,
100*cnt/g_slist_length(mlist));
+ msginfo = (MsgInfo *) cur->data;
+ folder_item_move_msg(new_item, msginfo);
+
+ procmsg_msginfo_free(msginfo);
}
+ statusbar_verbosity_set(FALSE);
/*copy prefs*/
prefs_folder_item_copy_prefs(src, new_item);
new_item->sort_key = src->sort_key;
new_item->sort_type = src->sort_type;
+ prefs_matcher_write_config();
+
/* recurse */
srcnode = src->folder->node;
srcnode = g_node_find(srcnode, G_PRE_ORDER, G_TRAVERSE_ALL, src);
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->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;
}
}
if (src_identifier == NULL || dst_identifier == NULL) {
printf("Can't get identifiers\n");
- return NULL;
+ 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);
else
- debug_print("can't remove node: is null !\n");
+ 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)
MsgInfo *newmsginfo;
/* Add new msginfo to dest folder */
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
+ if (NULL != (newmsginfo = folder->get_msginfo(folder, dest, num))) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX || dest->stype == F_QUEUE ||
dest->new++;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ dest->unreadmarked++;
dest->total++;
dest->need_update = TRUE;
msginfo->folder->new--;
if (MSG_IS_UNREAD(msginfo->flags))
msginfo->folder->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ msginfo->folder->unreadmarked--;
msginfo->folder->total--;
msginfo->folder->need_update = TRUE;
}
if (num != -1) {
MsgInfo *newmsginfo;
- newmsginfo = folder->fetch_msginfo(folder, dest, num);
+ newmsginfo = folder->get_msginfo(folder, dest, num);
if (newmsginfo) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX ||
dest->new++;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ dest->unreadmarked++;
dest->total++;
dest->need_update = TRUE;
msginfo->folder->new--;
if (MSG_IS_UNREAD(msginfo->flags))
msginfo->folder->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ msginfo->folder->unreadmarked--;
msginfo->folder->total--;
msginfo->folder->need_update = TRUE;
}
if (num != -1) {
MsgInfo *newmsginfo;
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
+ if (NULL != (newmsginfo = folder->get_msginfo(folder, dest, num))) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX ||
dest->stype == F_QUEUE ||
dest->new++;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ dest->unreadmarked++;
dest->total++;
dest->need_update = TRUE;
if (num != -1) {
MsgInfo *newmsginfo;
- newmsginfo = folder->fetch_msginfo(folder, dest, num);
+ newmsginfo = folder->get_msginfo(folder, dest, num);
if (newmsginfo) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX ||
dest->new++;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ dest->unreadmarked++;
dest->total++;
dest->need_update = TRUE;
item->new--;
if (MSG_IS_UNREAD(msginfo->flags))
item->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ item->unreadmarked--;
procmsg_msginfo_free(msginfo);
msgcache_remove_msg(item->cache, num);
}
gint ret = 0;
g_return_val_if_fail(item != NULL, -1);
-
folder = item->folder;
+ g_return_val_if_fail(folder != NULL, -1);
+
+ if (!item->cache) folder_item_read_cache(item);
+
if (folder->remove_msgs) {
ret = folder->remove_msgs(folder, item, msglist);
if (ret == 0)
- folder->scan(folder);
+ folder_item_scan(item);
return ret;
}
- if (!item->cache) folder_item_read_cache(item);
-
while (msglist != NULL) {
MsgInfo *msginfo = (MsgInfo *)msglist->data;
item->new = 0;
item->unread = 0;
+ item->unreadmarked = 0;
item->total = 0;
item->need_update = TRUE;
}
gboolean ret_rcpt = FALSE, hidereadmsgs = 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"))
item->mtime = mtime;
item->new = new;
item->unread = unread;
+ item->unreadmarked = unreadmarked;
item->total = total;
item->no_sub = no_sub;
item->no_select = no_select;
return filename;
}
+#define PUT_ESCAPE_STR(fp, attr, str) \
+{ \
+ fputs(" " attr "=\"", fp); \
+ xml_file_put_escape_str(fp, str); \
+ fputs("\"", fp); \
+}
+
static void folder_write_list_recursive(GNode *node, gpointer data)
{
FILE *fp = (FILE *)data;
Folder *folder = item->folder;
fprintf(fp, "<folder type=\"%s\"", folder_type_str[folder->type]);
- if (folder->name) {
- fputs(" name=\"", fp);
- xml_file_put_escape_str(fp, folder->name);
- fputs("\"", fp);
- }
- if ((folder->type == F_MH) || (folder->type == F_MBOX)) {
- fputs(" path=\"", fp);
- xml_file_put_escape_str
- (fp, LOCAL_FOLDER(folder)->rootpath);
- fputs("\"", fp);
- }
+ if (folder->name)
+ PUT_ESCAPE_STR(fp, "name", folder->name);
+ if (folder->type == F_MH || folder->type == F_MBOX)
+ PUT_ESCAPE_STR(fp, "path",
+ LOCAL_FOLDER(folder)->rootpath);
if (item->collapsed && node->children)
fputs(" collapsed=\"1\"", fp);
if (folder->account)
} else {
fprintf(fp, "<folderitem type=\"%s\"",
folder_item_stype_str[item->stype]);
- if (item->name) {
- fputs(" name=\"", fp);
- xml_file_put_escape_str(fp, item->name);
- fputs("\"", fp);
- }
- if (item->path) {
- fputs(" path=\"", fp);
- xml_file_put_escape_str(fp, item->path);
- fputs("\"", fp);
- }
-
+ if (item->name)
+ PUT_ESCAPE_STR(fp, "name", item->name);
+ if (item->path)
+ PUT_ESCAPE_STR(fp, "path", item->path);
+
if (item->no_sub)
fputs(" no_sub=\"1\"", fp);
if (item->no_select)
}
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, item->unread, item->unreadmarked, item->total);
+
if (item->account)
fprintf(fp, " account_id=\"%d\"",
item->account->account_id);
fputs(" />\n", fp);
}
-static void folder_update_op_count_rec(GNode *node) {
+static void folder_update_op_count_rec(GNode *node)
+{
FolderItem *fitem = FOLDER_ITEM(node->data);
if (g_node_depth(node) > 0) {
if (fitem->op_count > 0) {
fitem->op_count = 0;
- folderview_update_item(fitem, 0);
+ folder_update_item(fitem, FALSE);
}
if (node->children) {
GNode *child;
procmsg_msginfo_free(msginfo);
}
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
g_slist_free(mlist);
}
+
+/*
+ * Callback handling for FolderItem content changes
+ */
+void folder_update_item(FolderItem *item, gboolean contentchange)
+{
+ FolderItemUpdateData source;
+
+ source.item = item;
+ source.content_change = contentchange;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+}
+
+static void folder_update_item_func(FolderItem *item, gpointer contentchange)
+{
+ FolderItemUpdateData source;
+
+ if (item->need_update) {
+ source.item = item;
+ source.content_change = GPOINTER_TO_INT(contentchange);
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+
+ item->need_update = FALSE;
+ }
+}
+
+void folder_update_items_when_required(gboolean contentchange)
+{
+ 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;
+ FolderItemUpdateData source;
+
+ node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+ node = node->children;
+
+ source.item = item;
+ source.content_change = update_summary;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+ while (node != NULL) {
+ if (node && node->data) {
+ FolderItem *next_item = (FolderItem*) node->data;
+
+ source.item = next_item;
+ source.content_change = update_summary;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+ }
+ node = node->next;
+ }
+}
+
+#undef PUT_ESCAPE_STR
projects / claws.git / blobdiff