#include "log.h"
#include "folder_item_prefs.h"
#include "remotefolder.h"
+#include "partial_download.h"
/* Dependecies to be removed ?! */
#include "prefs_common.h"
{
XMLTag *tag;
- tag = xml_new_tag("folder");
+ tag = xml_tag_new("folder");
if (folder->name)
- xml_tag_add_attr(tag, "name", g_strdup(folder->name));
+ xml_tag_add_attr(tag, xml_attr_new("name", folder->name));
if (folder->account)
- xml_tag_add_attr(tag, "account_id", g_strdup_printf("%d", folder->account->account_id));
+ xml_tag_add_attr(tag, xml_attr_new_int("account_id", folder->account->account_id));
if (folder->node && folder->node->data) {
FolderItem *rootitem = (FolderItem *) folder->node->data;
- xml_tag_add_attr(tag, "collapsed", g_strdup(rootitem->collapsed ? "1" : "0"));
+ xml_tag_add_attr(tag, xml_attr_new("collapsed", rootitem->collapsed ? "1" : "0"));
}
- xml_tag_add_attr(tag, "sort", g_strdup_printf("%d", folder->sort));
+ xml_tag_add_attr(tag, xml_attr_new_int("sort", folder->sort));
return tag;
}
if (!attr || !attr->name || !attr->value) continue;
if (!strcmp(attr->name, "type")) {
- if (!strcasecmp(attr->value, "normal"))
+ if (!g_ascii_strcasecmp(attr->value, "normal"))
item->stype = F_NORMAL;
- else if (!strcasecmp(attr->value, "inbox"))
+ else if (!g_ascii_strcasecmp(attr->value, "inbox"))
item->stype = F_INBOX;
- else if (!strcasecmp(attr->value, "outbox"))
+ else if (!g_ascii_strcasecmp(attr->value, "outbox"))
item->stype = F_OUTBOX;
- else if (!strcasecmp(attr->value, "draft"))
+ else if (!g_ascii_strcasecmp(attr->value, "draft"))
item->stype = F_DRAFT;
- else if (!strcasecmp(attr->value, "queue"))
+ else if (!g_ascii_strcasecmp(attr->value, "queue"))
item->stype = F_QUEUE;
- else if (!strcasecmp(attr->value, "trash"))
+ else if (!g_ascii_strcasecmp(attr->value, "trash"))
item->stype = F_TRASH;
} else if (!strcmp(attr->name, "name")) {
if (item->name != NULL)
"mark", "unread", "mime", "to",
"locked"};
XMLTag *tag;
+ gchar *value;
- tag = xml_new_tag("folderitem");
+ tag = xml_tag_new("folderitem");
- xml_tag_add_attr(tag, "type", g_strdup(folder_item_stype_str[item->stype]));
+ xml_tag_add_attr(tag, xml_attr_new("type", folder_item_stype_str[item->stype]));
if (item->name)
- xml_tag_add_attr(tag, "name", g_strdup(item->name));
+ xml_tag_add_attr(tag, xml_attr_new("name", item->name));
if (item->path)
- xml_tag_add_attr(tag, "path", g_strdup(item->path));
+ xml_tag_add_attr(tag, xml_attr_new("path", item->path));
if (item->no_sub)
- xml_tag_add_attr(tag, "no_sub", g_strdup("1"));
+ xml_tag_add_attr(tag, xml_attr_new("no_sub", "1"));
if (item->no_select)
- xml_tag_add_attr(tag, "no_select", g_strdup("1"));
- xml_tag_add_attr(tag, "collapsed", g_strdup(item->collapsed && item->node->children ? "1" : "0"));
- xml_tag_add_attr(tag, "thread_collapsed", g_strdup(item->thread_collapsed ? "1" : "0"));
- xml_tag_add_attr(tag, "threaded", g_strdup(item->threaded ? "1" : "0"));
- xml_tag_add_attr(tag, "hidereadmsgs", g_strdup(item->hide_read_msgs ? "1" : "0"));
+ xml_tag_add_attr(tag, xml_attr_new("no_select", "1"));
+ xml_tag_add_attr(tag, xml_attr_new("collapsed", item->collapsed && item->node->children ? "1" : "0"));
+ xml_tag_add_attr(tag, xml_attr_new("thread_collapsed", item->thread_collapsed ? "1" : "0"));
+ xml_tag_add_attr(tag, xml_attr_new("threaded", item->threaded ? "1" : "0"));
+ xml_tag_add_attr(tag, xml_attr_new("hidereadmsgs", item->hide_read_msgs ? "1" : "0"));
if (item->ret_rcpt)
- xml_tag_add_attr(tag, "reqretrcpt", g_strdup("1"));
+ xml_tag_add_attr(tag, xml_attr_new("reqretrcpt", "1"));
if (item->sort_key != SORT_BY_NONE) {
- xml_tag_add_attr(tag, "sort_key", g_strdup(sort_key_str[item->sort_key]));
- xml_tag_add_attr(tag, "sort_type", g_strdup(item->sort_type == SORT_ASCENDING ? "ascending" : "descending"));
+ xml_tag_add_attr(tag, xml_attr_new("sort_key", sort_key_str[item->sort_key]));
+ xml_tag_add_attr(tag, xml_attr_new("sort_type", item->sort_type == SORT_ASCENDING ? "ascending" : "descending"));
}
- xml_tag_add_attr(tag, "mtime", g_strdup_printf("%ld", (unsigned long int) item->mtime));
- xml_tag_add_attr(tag, "new", g_strdup_printf("%d", item->new_msgs));
- xml_tag_add_attr(tag, "unread", g_strdup_printf("%d", item->unread_msgs));
- xml_tag_add_attr(tag, "unreadmarked", g_strdup_printf("%d", item->unreadmarked_msgs));
- xml_tag_add_attr(tag, "total", g_strdup_printf("%d", item->total_msgs));
+ value = g_strdup_printf("%ld", (unsigned long int) item->mtime);
+ xml_tag_add_attr(tag, xml_attr_new("mtime", value));
+ g_free(value);
+ xml_tag_add_attr(tag, xml_attr_new_int("new", item->new_msgs));
+ xml_tag_add_attr(tag, xml_attr_new_int("unread", item->unread_msgs));
+ xml_tag_add_attr(tag, xml_attr_new_int("unreadmarked", item->unreadmarked_msgs));
+ xml_tag_add_attr(tag, xml_attr_new_int("total", item->total_msgs));
if (item->account)
- xml_tag_add_attr(tag, "account_id", g_strdup_printf("%d", item->account->account_id));
+ xml_tag_add_attr(tag, xml_attr_new_int("account_id", item->account->account_id));
if (item->apply_sub)
- xml_tag_add_attr(tag, "apply_sub", g_strdup("1"));
+ xml_tag_add_attr(tag, xml_attr_new("apply_sub", "1"));
return tag;
}
path = folder_get_list_path();
if ((pfile = prefs_write_open(path)) == NULL) return;
- fprintf(pfile->fp, "<?xml version=\"1.0\" encoding=\"%s\"?>\n",
- conv_get_current_charset_str());
- tag = xml_new_tag("folderlist");
+ xml_file_put_xml_decl(pfile->fp);
+ tag = xml_tag_new("folderlist");
- xmlnode = g_new0(XMLNode, 1);
- xmlnode->tag = tag;
- xmlnode->element = NULL;
+ xmlnode = xml_node_new(tag, NULL);
rootnode = g_node_new(xmlnode);
if (status->str) {
id = folder_item_get_identifier(item);
- g_string_sprintfa(status->str, "%5d %5d %5d %s\n",
+ g_string_append_printf(status->str, "%5d %5d %5d %s\n",
item->new_msgs, item->unread_msgs,
item->total_msgs, id);
g_free(id);
gchar *id;
id = folder_item_get_identifier(item);
- g_string_sprintfa(str, "%5d %5d %5d %s\n",
+ g_string_append_printf(str, "%5d %5d %5d %s\n",
item->new_msgs, item->unread_msgs,
item->total_msgs, id);
g_free(id);
}
if (full)
- g_string_sprintfa(str, "%5d %5d %5d\n", new, unread, total);
+ g_string_append_printf(str, "%5d %5d %5d\n", new, unread, total);
else
- g_string_sprintfa(str, "%d %d %d\n", new, unread, total);
+ g_string_append_printf(str, "%d %d %d\n", new, unread, total);
ret = str->str;
g_string_free(str, FALSE);
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)
+ if (g_ascii_strcasecmp(class->idstr, str) == 0)
return class;
}
gchar *folder_item_get_identifier(FolderItem *item)
{
- gchar *id;
- gchar *folder_id;
+ gchar *id = NULL;
+ gchar *folder_id = NULL;
g_return_val_if_fail(item != NULL, NULL);
g_return_val_if_fail(item->path != NULL, NULL);
} else {
flags->perm_flags = 0;
}
- flags->tmp_flags = MSG_CACHED;
if (FOLDER_TYPE(dest->folder) == F_MH) {
if (dest->stype == F_QUEUE) {
MSG_SET_TMP_FLAGS(*flags, MSG_QUEUED);
return folder->klass->close(folder, item);
}
-static void msginfo_set_mime_flags(GNode *node, gpointer data)
-{
- MsgInfo *msginfo = data;
- MimeInfo *mimeinfo = node->data;
-
- if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_HAS_ATTACHMENT);
- } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN &&
- mimeinfo->type != MIMETYPE_TEXT &&
- mimeinfo->type != MIMETYPE_MULTIPART) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_HAS_ATTACHMENT)
- }
-
- /* don't descend below top level message for signed and encrypted info */
- if (mimeinfo->type == MIMETYPE_MESSAGE)
- return;
-
- if (privacy_mimeinfo_is_signed(mimeinfo)) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_SIGNED);
- }
-
- if (privacy_mimeinfo_is_encrypted(mimeinfo)) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_ENCRYPTED);
- } else {
- /* searching inside encrypted parts doesn't really make sense */
- g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
- }
-}
-
static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
{
MsgInfoList *msglist = NULL;
Folder *folder = item->folder;
- MsgInfoList *elem;
if (folder->klass->get_msginfos != NULL)
msglist = folder->klass->get_msginfos(folder, item, numlist);
}
}
- for (elem = msglist; elem != NULL; elem = g_slist_next(elem)) {
- MsgInfo *msginfo = elem->data;
-
- if (MSG_IS_MULTIPART(msginfo->flags)) {
- MimeInfo *mimeinfo;
-
- mimeinfo = procmime_scan_message(msginfo);
- g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
- procmime_mimeinfo_free_all(mimeinfo);
- /* check for attachments */
- }
- }
-
return msglist;
}
return msginfo;
}
+static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
+{
+ GRelation *relation;
+ gint ret = 0;
+ GSList *cur;
+
+ if(msglist == NULL)
+ return 0;
+ if(item->folder->klass->get_flags == NULL)
+ return 0;
+
+ relation = g_relation_new(2);
+ g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+ if ((ret = item->folder->klass->get_flags(
+ item->folder, item, msglist, relation)) == 0) {
+ GTuples *tuples;
+ MsgInfo *msginfo;
+ MsgPermFlags permflags;
+ gboolean skip;
+
+ for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+ msginfo = (MsgInfo *) cur->data;
+
+ tuples = g_relation_select(relation, msginfo, 0);
+ skip = tuples->len < 1;
+ if (!skip)
+ permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+ g_tuples_destroy(tuples);
+ if (skip)
+ continue;
+
+ if (msginfo->flags.perm_flags != permflags) {
+ procmsg_msginfo_set_flags(msginfo,
+ permflags & ~msginfo->flags.perm_flags, 0);
+ procmsg_msginfo_unset_flags(msginfo,
+ ~permflags & msginfo->flags.perm_flags, 0);
+ }
+ }
+ }
+ g_relation_destroy(relation);
+
+ return ret;
+}
+
gint folder_item_scan_full(FolderItem *item, gboolean filtering)
{
Folder *folder;
g_slist_free(new_list);
}
+ syncronize_flags(item, exists_list);
+
folder_item_update_freeze();
if (newmsg_list != NULL) {
GSList *elem;
return 0;
}
-gint folder_item_syncronize_flags(FolderItem *item)
-{
- MsgInfoList *msglist = NULL;
- GSList *cur;
- GRelation *relation;
- gint ret = 0;
-
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->folder != NULL, -1);
- g_return_val_if_fail(item->folder->klass != NULL, -1);
- if(item->folder->klass->get_flags == NULL)
- return 0;
-
- if (item->cache == NULL)
- folder_item_read_cache(item);
-
- msglist = msgcache_get_msg_list(item->cache);
-
- relation = g_relation_new(2);
- g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
- if ((ret = item->folder->klass->get_flags(
- item->folder, item, msglist, relation)) == 0) {
- GTuples *tuples;
- MsgInfo *msginfo;
- MsgPermFlags permflags;
- gboolean skip;
-
- for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
- msginfo = (MsgInfo *) cur->data;
-
- tuples = g_relation_select(relation, msginfo, 0);
- skip = tuples->len < 1;
- if (!skip)
- permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
- g_tuples_destroy(tuples);
- if (skip)
- continue;
-
- if (msginfo->flags.perm_flags != permflags) {
- procmsg_msginfo_set_flags(msginfo,
- permflags & ~msginfo->flags.perm_flags, 0);
- procmsg_msginfo_unset_flags(msginfo,
- ~permflags & msginfo->flags.perm_flags, 0);
- }
- }
- }
- g_relation_destroy(relation);
-
- for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
- procmsg_msginfo_free((MsgInfo *) cur->data);
-
- return ret;
-}
-
gint folder_item_scan(FolderItem *item)
{
return folder_item_scan_full(item, TRUE);
*memusage += msgcache_get_memory_usage(item->cache);
}
+gint folder_item_syncronize_flags(FolderItem *item)
+{
+ MsgInfoList *msglist = NULL;
+ GSList *cur;
+ gint ret = 0;
+
+ g_return_val_if_fail(item != NULL, -1);
+ g_return_val_if_fail(item->folder != NULL, -1);
+ g_return_val_if_fail(item->folder->klass != NULL, -1);
+
+ if (item->cache == NULL)
+ folder_item_read_cache(item);
+
+ msglist = msgcache_get_msg_list(item->cache);
+
+ ret = syncronize_flags(item, msglist);
+
+ for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
+ procmsg_msginfo_free((MsgInfo *) cur->data);
+
+ return ret;
+}
+
gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
{
FolderItem *fa = (FolderItem *)a;
mark_file = folder_item_get_mark_file(item);
item->cache = msgcache_read_cache(item, cache_file);
if (!item->cache) {
+ MsgInfoList *list, *cur;
+ guint newcnt = 0, unreadcnt = 0, unreadmarkedcnt = 0;
+ MsgInfo *msginfo;
+
item->cache = msgcache_new();
folder_item_scan_full(item, TRUE);
- }
- msgcache_read_mark(item->cache, mark_file);
+
+ msgcache_read_mark(item->cache, mark_file);
+
+ list = msgcache_get_msg_list(item->cache);
+ for (cur = list; cur != NULL; cur = g_slist_next(cur)) {
+ msginfo = cur->data;
+
+ 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++;
+ }
+ item->new_msgs = newcnt;
+ item->unread_msgs = unreadcnt;
+ item->unreadmarked_msgs = unreadmarkedcnt;
+ procmsg_msg_list_free(list);
+ } else
+ msgcache_read_mark(item->cache, mark_file);
+
g_free(cache_file);
g_free(mark_file);
} else {
return msgcache_get_msg_list(item->cache);
}
+static void msginfo_set_mime_flags(GNode *node, gpointer data)
+{
+ MsgInfo *msginfo = data;
+ MimeInfo *mimeinfo = node->data;
+
+ if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+ } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN &&
+ mimeinfo->type != MIMETYPE_TEXT &&
+ mimeinfo->type != MIMETYPE_MULTIPART) {
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+ }
+
+ /* don't descend below top level message for signed and encrypted info */
+ if (mimeinfo->type == MIMETYPE_MESSAGE)
+ return;
+
+ if (privacy_mimeinfo_is_signed(mimeinfo)) {
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_SIGNED);
+ }
+
+ if (privacy_mimeinfo_is_encrypted(mimeinfo)) {
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_ENCRYPTED);
+ } else {
+ /* searching inside encrypted parts doesn't really make sense */
+ g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
+ }
+}
+
gchar *folder_item_fetch_msg(FolderItem *item, gint num)
{
Folder *folder;
+ gchar *msgfile;
+ MsgInfo *msginfo;
g_return_val_if_fail(item != NULL, NULL);
g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
- return folder->klass->fetch_msg(folder, item, num);
+ msgfile = folder->klass->fetch_msg(folder, item, num);
+
+ if (msgfile != NULL) {
+ msginfo = folder_item_get_msginfo(item, num);
+ if ((msginfo != NULL) && !MSG_IS_SCANNED(msginfo->flags)) {
+ MimeInfo *mimeinfo;
+
+ if (msginfo->folder->stype != F_QUEUE &&
+ msginfo->folder->stype != F_DRAFT)
+ mimeinfo = procmime_scan_file(msgfile);
+ else
+ mimeinfo = procmime_scan_queue_file(msgfile);
+ /* check for attachments */
+ if (mimeinfo != NULL) {
+ g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
+ procmime_mimeinfo_free_all(mimeinfo);
+
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
+ }
+ }
+ }
+
+ return msgfile;
}
gint folder_item_fetch_all_msg(FolderItem *item)
g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
g_relation_index(relation, 1, g_direct_hash, g_direct_equal);
+ for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
+ MsgInfo * msginfo = (MsgInfo *) l->data;
+
+ if (msginfo->planned_download != 0) {
+ int old_planned = msginfo->planned_download;
+ partial_unmark(msginfo);
+ /* little hack to reenable after */
+ msginfo->planned_download = old_planned;
+ }
+ }
+
/*
* Copy messages to destination folder and
* store new message numbers in newmsgnums
g_tuples_destroy(tuples);
if (num >= 0) {
- MsgInfo *newmsginfo;
+ MsgInfo *newmsginfo = NULL;
if (folderscan) {
if (msginfo->msgid != NULL) {
if (newmsginfo != NULL) {
copy_msginfo_flags(msginfo, newmsginfo);
num = newmsginfo->msgnum;
- procmsg_msginfo_free(newmsginfo);
}
}
} else {
newmsginfo = get_msginfo(dest, num);
if (newmsginfo != NULL) {
add_msginfo_to_cache(dest, newmsginfo, msginfo);
- procmsg_msginfo_free(newmsginfo);
}
}
+ if (msginfo->planned_download
+ == POP3_PARTIAL_DLOAD_DELE) {
+ partial_mark_for_delete(newmsginfo);
+ }
+ if (msginfo->planned_download
+ == POP3_PARTIAL_DLOAD_DLOAD) {
+ partial_mark_for_download(newmsginfo);
+ }
+ procmsg_msginfo_free(newmsginfo);
+
+
if (num > lastnum)
lastnum = num;
}
static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)
{
FolderItem *item = (FolderItem *) nodedata;
- XMLNode *xmlnode;
XMLTag *tag;
g_return_val_if_fail(item != NULL, NULL);
else
tag = folder_item_get_xml(item->folder, item);
- xmlnode = g_new0(XMLNode, 1);
- xmlnode->tag = tag;
- xmlnode->element = NULL;
-
- return xmlnode;
+ return xml_node_new(tag, NULL);;
}
static GNode *folder_get_xml_node(Folder *folder)
else
tag = folder_get_xml(folder);
- xml_tag_add_attr(tag, "type", g_strdup(folder->klass->idstr));
+ xml_tag_add_attr(tag, xml_attr_new("type", folder->klass->idstr));
- xmlnode = g_new0(XMLNode, 1);
- xmlnode->tag = tag;
- xmlnode->element = NULL;
+ xmlnode = xml_node_new(tag, NULL);
node = g_node_new(xmlnode);
if (folder->node->children) {
static void folder_item_update_with_msg(FolderItem *item, FolderItemUpdateFlags update_flags, MsgInfo *msg)
{
- if (folder_item_update_freeze_cnt == 0 || (msg != NULL && item->opened)) {
+ if (folder_item_update_freeze_cnt == 0 /* || (msg != NULL && item->opened) */) {
FolderItemUpdateData source;
source.item = item;