folder_set_name(folder, name);
/* Init folder data */
- folder->type = F_UNKNOWN;
folder->account = NULL;
folder->inbox = NULL;
folder->outbox = NULL;
folder->check_msgnum_validity = NULL;
/* Create root folder item */
- item = folder_item_new(name, NULL);
+ item = folder_item_new(folder, name, NULL);
item->folder = folder;
folder->node = g_node_new(item);
folder->data = NULL;
void folder_destroy(Folder *folder)
{
g_return_if_fail(folder != NULL);
+ g_return_if_fail(folder->destroy != NULL);
- switch (folder->type) {
- case F_MBOX:
- mbox_folder_destroy(MBOX_FOLDER(folder));
- case F_MH:
- mh_folder_destroy(MH_FOLDER(folder));
- break;
- case F_IMAP:
- imap_folder_destroy(IMAP_FOLDER(folder));
- break;
- case F_NEWS:
- news_folder_destroy(NEWS_FOLDER(folder));
- break;
- default:
- break;
- }
+ folder->destroy(folder);
folder_list = g_list_remove(folder_list, folder);
}
#endif
-FolderItem *folder_item_new(const gchar *name, const gchar *path)
+FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
{
- FolderItem *item;
+ FolderItem *item = NULL;
- item = g_new0(FolderItem, 1);
+ switch (folder->type) {
+ case F_IMAP:
+ item = imap_folder_item_new();
+ break;
+ case F_MH:
+ case F_NEWS:
+ case F_MBOX:
+ item = g_new0(FolderItem, 1);
+ break;
+ default:
+ return NULL;
+ }
+
+ g_return_val_if_fail(item != NULL, NULL);
item->stype = F_NORMAL;
item->name = g_strdup(name);
{
g_return_if_fail(item != NULL);
- debug_print(_("Destroying folder item %s\n"), item->path);
-
- if(item->cache)
+ debug_print("Destroying folder item %s\n", item->path);
+
+ if (item->folder != NULL) {
+ switch (item->folder->type) {
+ case F_IMAP:
+ imap_folder_item_destroy(item);
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (item->cache)
folder_item_free_cache(item);
g_free(item->name);
g_free(item->path);
void folder_tree_destroy(Folder *folder)
{
+ g_return_if_fail(folder != NULL);
+ g_return_if_fail(folder->node != NULL);
+
prefs_scoring_clear();
prefs_filtering_clear();
g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_tree_destroy_func, NULL);
- g_node_destroy(folder->node);
+ if (folder->node)
+ g_node_destroy(folder->node);
folder->inbox = NULL;
folder->outbox = NULL;
{
GHashTable *pptable;
- if(!folder->scan_tree)
+ if (!folder->scan_tree)
return;
pptable = folder_persist_prefs_new(folder);
folder_tree_destroy(folder);
folder->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);
count.new = count.unread = count.total = 0;
- debug_print(_("Counting total number of messages...\n"));
+ debug_print("Counting total number of messages...\n");
folder_func_to_all_folders(folder_count_total_msgs_func, &count);
return folder->trash;
}
-#define CREATE_FOLDER_IF_NOT_EXIST(member, dir, type) \
-{ \
- if (!folder->member) { \
- item = folder_item_new(dir, dir); \
- item->stype = type; \
- folder_item_append(rootitem, item); \
- folder->member = item; \
- } \
+#define CREATE_FOLDER_IF_NOT_EXIST(member, dir, type) \
+{ \
+ if (!folder->member) { \
+ item = folder_item_new(folder, dir, dir); \
+ item->stype = type; \
+ folder_item_append(rootitem, item); \
+ folder->member = item; \
+ } \
}
void folder_set_missing_folders(void)
#undef CREATE_FOLDER_IF_NOT_EXIST
-gchar *folder_item_get_path(FolderItem *item)
+gchar *folder_get_path(Folder *folder)
{
- gchar *folder_path;
gchar *path;
- g_return_val_if_fail(item != NULL, NULL);
+ g_return_val_if_fail(folder != NULL, NULL);
- if (FOLDER_TYPE(item->folder) == F_MH)
- folder_path = g_strdup(LOCAL_FOLDER(item->folder)->rootpath);
- else if (FOLDER_TYPE(item->folder) == F_MBOX) {
- path = mbox_get_virtual_path(item);
+ if (FOLDER_TYPE(folder) == F_MH)
+ path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
+ else if (FOLDER_TYPE(folder) == F_MBOX) {
+ path = mbox_get_virtual_path(folder);
if (path == NULL)
return NULL;
- folder_path = g_strconcat(get_mbox_cache_dir(),
+ path = g_strconcat(get_mbox_cache_dir(),
G_DIR_SEPARATOR_S, path, NULL);
- g_free(path);
-
- return folder_path;
+ return path;
}
- else if (FOLDER_TYPE(item->folder) == F_IMAP) {
- g_return_val_if_fail(item->folder->account != NULL, NULL);
- folder_path = g_strconcat(get_imap_cache_dir(),
- G_DIR_SEPARATOR_S,
- item->folder->account->recv_server,
- G_DIR_SEPARATOR_S,
- item->folder->account->userid,
- NULL);
- } else if (FOLDER_TYPE(item->folder) == F_NEWS) {
- g_return_val_if_fail(item->folder->account != NULL, NULL);
- folder_path = g_strconcat(get_news_cache_dir(),
- G_DIR_SEPARATOR_S,
- item->folder->account->nntp_server,
- NULL);
+ else if (FOLDER_TYPE(folder) == 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);
+ } else if (FOLDER_TYPE(folder) == 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);
} else
- return NULL;
+ path = NULL;
+ return path;
+}
+
+gchar *folder_item_get_path(FolderItem *item)
+{
+ gchar *folder_path;
+ gchar *path;
+
+ g_return_val_if_fail(item != NULL, NULL);
+
+ folder_path = folder_get_path(item->folder);
g_return_val_if_fail(folder_path != NULL, NULL);
if (folder_path[0] == G_DIR_SEPARATOR) {
}
}
-typedef enum {
- IN_CACHE = 1 << 0,
- IN_FOLDER = 1 << 1,
-} FolderScanInfo;
+static gint folder_sort_cache_list_by_msgnum(gconstpointer a, gconstpointer b)
+{
+ MsgInfo *msginfo_a = (MsgInfo *) a;
+ MsgInfo *msginfo_b = (MsgInfo *) b;
+
+ return (msginfo_a->msgnum - msginfo_b->msgnum);
+}
+
+static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
+{
+ guint gint_a = GPOINTER_TO_INT(a);
+ guint gint_b = GPOINTER_TO_INT(a);
+
+ return (gint_a - gint_b);
+}
gint folder_item_scan(FolderItem *item)
{
Folder *folder;
- GSList *folder_list, *cache_list, *elem, *new_list = NULL;
- gint i;
- guint min = 0xffffffff, max = 0, cache_max = 0;
- FolderScanInfo *folderscaninfo;
+ GSList *folder_list, *cache_list, *folder_list_cur, *cache_list_cur, *new_list = NULL;
guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
-
+ guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
+
g_return_val_if_fail(item != NULL, -1);
- if(item->path == NULL) return -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);
- debug_print(_("Scanning folder %s for cache changes.\n"), item->path);
+ debug_print("Scanning folder %s for cache changes.\n", item->path);
/* Get list of messages for folder and cache */
- if(!folder->check_msgnum_validity ||
+ if (!folder->check_msgnum_validity ||
folder->check_msgnum_validity(folder, item)) {
- if(!item->cache)
+ if (!item->cache)
folder_item_read_cache(item);
cache_list = msgcache_get_msg_list(item->cache);
} else {
- if(item->cache)
+ if (item->cache)
msgcache_destroy(item->cache);
item->cache = msgcache_new();
cache_list = NULL;
}
folder_list = folder->get_num_list(item->folder, item);
- /* Get min und max number in folder */
- for(elem = cache_list; elem != NULL; elem = elem->next) {
- MsgInfo *msginfo = (MsgInfo *)elem->data;
+ /* Sort both lists */
+ cache_list = g_slist_sort(cache_list, folder_sort_cache_list_by_msgnum);
+ folder_list = g_slist_sort(folder_list, folder_sort_folder_list);
- min = MIN(msginfo->msgnum, min);
- max = MAX(msginfo->msgnum, max);
- }
- cache_max = max;
- for(elem = folder_list; elem != NULL; elem = elem->next) {
- guint num = GPOINTER_TO_INT(elem->data);
-
- min = MIN(num, min);
- max = MAX(num, max);
- }
+ cache_list_cur = cache_list;
+ folder_list_cur = folder_list;
- debug_print("Folder message number range from %d to %d\n", min, max);
+ if (cache_list_cur != NULL) {
+ GSList *cache_list_last;
+
+ cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
+ cache_list_last = g_slist_last(cache_list);
+ cache_max_num = ((MsgInfo *)cache_list_last->data)->msgnum;
+ } else
+ cache_cur_num = G_MAXINT;
- if(max == 0) {
- for(elem = cache_list; elem != NULL; elem = elem->next) {
- MsgInfo *msginfo = (MsgInfo *)elem->data;
+ if (folder_list_cur != NULL) {
+ GSList *folder_list_last;
+
+ folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+ folder_list_last = g_slist_last(folder_list);
+ folder_max_num = GPOINTER_TO_INT(folder_list_last->data);
+ } else
+ folder_cur_num = G_MAXINT;
+
+ while ((cache_cur_num != G_MAXINT) || (folder_cur_num != G_MAXINT)) {
+ /*
+ * Message only exists in the folder
+ * Remember message for fetching
+ */
+ if (folder_cur_num < cache_cur_num) {
+ gboolean add = FALSE;
+
+ switch(folder->type) {
+ case F_NEWS:
+ if (folder_cur_num < cache_max_num)
+ break;
+
+ if (prefs_common.max_articles == 0) {
+ add = TRUE;
+ }
+
+ if (folder_max_num <= prefs_common.max_articles) {
+ add = TRUE;
+ } else if (folder_cur_num > (folder_max_num - prefs_common.max_articles)) {
+ add = TRUE;
+ }
+ break;
+ default:
+ add = TRUE;
+ break;
+ }
+
+ if (add) {
+ new_list = g_slist_prepend(new_list, GINT_TO_POINTER(folder_cur_num));
+ debug_print("Remembered message %d for fetching\n", folder_cur_num);
+ }
- procmsg_msginfo_free(msginfo);
- }
- g_slist_free(folder_list);
- g_slist_free(cache_list);
+ /* Move to next folder number */
+ folder_list_cur = folder_list_cur->next;
- return 0;
- }
+ if (folder_list_cur != NULL)
+ folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+ else
+ folder_cur_num = G_MAXINT;
- folderscaninfo = g_new0(FolderScanInfo, max - min + 1);
+ continue;
+ }
- for(elem = folder_list; elem != NULL; elem = elem->next) {
- guint num = GPOINTER_TO_INT(elem->data);
+ /*
+ * Message only exists in the cache
+ * Remove the message from the cache
+ */
+ if (cache_cur_num < folder_cur_num) {
+ msgcache_remove_msg(item->cache, cache_cur_num);
+ debug_print("Removed message %d from cache.\n", cache_cur_num);
- folderscaninfo[num - min] |= IN_FOLDER;
- }
- for(elem = cache_list; elem != NULL; elem = elem->next) {
- MsgInfo *msginfo = (MsgInfo *)elem->data;
+ /* Move to next cache number */
+ cache_list_cur = cache_list_cur->next;
- folderscaninfo[msginfo->msgnum - min] |= IN_CACHE;
- procmsg_msginfo_free(msginfo);
- }
+ if (cache_list_cur != NULL)
+ cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
+ else
+ cache_cur_num = G_MAXINT;
- for(i = max - min; i >= 0; i--) {
- guint num;
-
- num = i + min;
- /* Add message to cache if in folder and not in cache */
- if( (folderscaninfo[i] & IN_FOLDER) &&
- !(folderscaninfo[i] & IN_CACHE) &&
- (folder->type != F_NEWS ||
- (((prefs_common.max_articles == 0) || (num > (max - prefs_common.max_articles))) &&
- (num > cache_max)))
- ) {
- new_list = g_slist_prepend(new_list, GINT_TO_POINTER(num));
- debug_print(_("Remembered message %d for fetching\n"), num);
- }
- /* Remove message from cache if not in folder and in cache */
- if(!(folderscaninfo[i] & IN_FOLDER) &&
- (folderscaninfo[i] & IN_CACHE)) {
- msgcache_remove_msg(item->cache, i + min);
- debug_print(_("Removed message %d from cache.\n"), num);
+ continue;
}
- /* Check if msginfo needs update if in cache and in folder */
- if((folderscaninfo[i] & IN_FOLDER) &&
- (folderscaninfo[i] & IN_CACHE) &&
- (folder->is_msg_changed != NULL)) {
+
+ /*
+ * Message number exists in folder and cache!
+ * Check if the message has been modified
+ */
+ if (cache_cur_num == folder_cur_num) {
MsgInfo *msginfo;
- msginfo = msgcache_get_msg(item->cache, num);
- if(folder->is_msg_changed(folder, item, msginfo)) {
+ msginfo = msgcache_get_msg(item->cache, folder_cur_num);
+ if (folder->is_msg_changed && folder->is_msg_changed(folder, item, msginfo)) {
MsgInfo *newmsginfo;
msgcache_remove_msg(item->cache, msginfo->msgnum);
- newmsginfo = folder->fetch_msginfo(folder, item, 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);
+ 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"), num);
+ debug_print("Updated msginfo for message %d.\n", folder_cur_num);
} else {
- if(MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ 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))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
unreadcnt++;
}
totalcnt++;
procmsg_msginfo_free(msginfo);
+
+ /* Move to next folder and cache number */
+ cache_list_cur = cache_list_cur->next;
+ folder_list_cur = folder_list_cur->next;
+
+ if (cache_list_cur != NULL)
+ cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
+ else
+ cache_cur_num = G_MAXINT;
+
+ if (folder_list_cur != NULL)
+ folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+ else
+ folder_cur_num = G_MAXINT;
+
+ continue;
}
}
- if(folder->fetch_msginfos) {
+ 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) {
+ if (new_list) {
newmsg_list = folder->fetch_msginfos(folder, item, new_list);
- for(elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
+ 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))
+ 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))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
unreadcnt++;
totalcnt++;
procmsg_msginfo_free(msginfo);
folderview_update_item(item, FALSE);
}
} else if (folder->fetch_msginfo) {
- for(elem = new_list; elem != NULL; elem = g_slist_next(elem)) {
+ 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) {
+ if (msginfo != NULL) {
msgcache_add_msg(item->cache, msginfo);
- if(MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ 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))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
unreadcnt++;
totalcnt++;
procmsg_msginfo_free(msginfo);
- debug_print(_("Added newly found message %d to cache.\n"), num);
+ debug_print("Added newly found message %d to cache.\n", num);
}
}
folderview_update_item(item, FALSE);
item->unread = unreadcnt;
item->total = totalcnt;
- g_slist_free(folder_list);
- g_slist_free(cache_list);
g_slist_free(new_list);
- g_free(folderscaninfo);
+
+ folderview_update_item(item, FALSE);
return 0;
}
{
gint *memusage = (gint *)data;
- if(item->cache == NULL)
+ if (item->cache == NULL)
return;
*memusage += msgcache_get_memory_usage(item->cache);
GSList **folder_item_list = (GSList **)data;
gint difftime, expiretime;
- if(item->cache == NULL)
+ if (item->cache == NULL)
+ return;
+
+ if (item->opened > 0)
return;
difftime = (gint) (time(NULL) - msgcache_get_last_access_time(item->cache));
expiretime = prefs_common.cache_min_keep_time * 60;
- debug_print(_("Cache unused time: %d (Expire time: %d)\n"), difftime, expiretime);
- if(difftime > expiretime) {
+ debug_print("Cache unused time: %d (Expire time: %d)\n", difftime, expiretime);
+ if (difftime > expiretime) {
*folder_item_list = g_slist_insert_sorted(*folder_item_list, item, folder_cache_time_compare_func);
}
}
{
g_return_if_fail(item != NULL);
- if(item->cache == NULL)
+ if (item->cache == NULL)
return;
+ if (item->opened > 0)
+ return;
+
folder_item_write_cache(item);
msgcache_destroy(item->cache);
item->cache = NULL;
gint memusage = 0;
folder_func_to_all_folders(folder_count_total_cache_memusage, &memusage);
- debug_print(_("Total cache memory usage: %d\n"), memusage);
+ debug_print("Total cache memory usage: %d\n", memusage);
- if(memusage > (prefs_common.cache_max_mem_usage * 1024)) {
+ if (memusage > (prefs_common.cache_max_mem_usage * 1024)) {
GSList *folder_item_list = NULL, *listitem;
- debug_print(_("Trying to free cache memory\n"));
+ debug_print("Trying to free cache memory\n");
folder_func_to_all_folders(folder_find_expired_caches, &folder_item_list);
listitem = folder_item_list;
while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
FolderItem *item = (FolderItem *)(listitem->data);
- debug_print(_("Freeing cache memory for %s\n"), item->path);
+ debug_print("Freeing cache memory for %s\n", item->path);
memusage -= msgcache_get_memory_usage(item->cache);
- folder_item_free_cache(item);
+ folder_item_free_cache(item);
listitem = listitem->next;
}
g_slist_free(folder_item_list);
cache_file = folder_item_get_cache_file(item);
mark_file = folder_item_get_mark_file(item);
item->cache = msgcache_read_cache(item, cache_file);
- if(!item->cache) {
+ if (!item->cache) {
item->cache = msgcache_new();
folder_item_scan(item);
}
return;
id = folder_item_get_identifier(item);
- debug_print(_("Save cache for folder %s\n"), id);
+ debug_print("Save cache for folder %s\n", id);
g_free(id);
cache_file = folder_item_get_cache_file(item);
mark_file = folder_item_get_mark_file(item);
- if(msgcache_write(cache_file, mark_file, item->cache) < 0) {
+ if (msgcache_write(cache_file, mark_file, item->cache) < 0) {
prefs = item->prefs;
if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
/* for cache file */
g_return_val_if_fail(item != NULL, NULL);
folder = item->folder;
- if(!item->cache)
+ if (!item->cache)
folder_item_read_cache(item);
- if((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
+ 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) {
+ if ((msginfo = folder->fetch_msginfo(folder, item, num)) != NULL) {
msgcache_add_msg(item->cache, msginfo);
return msginfo;
}
g_return_val_if_fail(item != NULL, NULL);
folder = item->folder;
- if(!item->cache)
+ if (!item->cache)
folder_item_read_cache(item);
- if((msginfo = msgcache_get_msg_by_id(item->cache, msgid)) != NULL)
+ if ((msginfo = msgcache_get_msg_by_id(item->cache, msgid)) != NULL)
return msginfo;
return NULL;
{
g_return_val_if_fail(item != NULL, NULL);
- if(item->cache == 0)
+ if (item->cache == 0)
folder_item_read_cache(item);
g_return_val_if_fail(item->cache != NULL, NULL);
if (num > 0) {
msginfo = folder->fetch_msginfo(folder, dest, num);
- if(MSG_IS_NEW(msginfo->flags))
- dest->new++;
- if(MSG_IS_UNREAD(msginfo->flags))
- dest->unread++;
- dest->total++;
+ if (msginfo != NULL) {
+ if (MSG_IS_NEW(msginfo->flags))
+ dest->new++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ dest->unread++;
+ dest->total++;
+
+ msgcache_add_msg(dest->cache, msginfo);
+
+ procmsg_msginfo_free(msginfo);
+ }
dest->last_num = num;
- msgcache_add_msg(dest->cache, msginfo);
- procmsg_msginfo_free(msginfo);
}
return num;
{
Folder *folder;
gint num;
- Folder * src_folder;
+ Folder *src_folder;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msginfo != NULL, -1);
if (num != -1) {
MsgInfo *newmsginfo;
- 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);
-
- /* CLAWS */
- if(src_folder->remove_msg) {
- src_folder->remove_msg(src_folder,
- msginfo->folder,
- msginfo->msgnum);
+ 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);
+
+ /* CLAWS */
+ 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_NEW(newmsginfo->flags))
+ dest->new++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ msginfo->folder->unread--;
+ if (MSG_IS_UNREAD(newmsginfo->flags))
+ dest->unread++;
+ msginfo->folder->total--;
+ dest->total++;
+
+ procmsg_msginfo_free(newmsginfo);
}
- msgcache_remove_msg(msginfo->folder->cache, msginfo->msgnum);
-
- if (MSG_IS_NEW(msginfo->flags))
- msginfo->folder->new--;
- if (MSG_IS_NEW(newmsginfo->flags))
- dest->new++;
- if (MSG_IS_UNREAD(msginfo->flags))
- msginfo->folder->unread--;
- if (MSG_IS_UNREAD(newmsginfo->flags))
- dest->unread++;
- msginfo->folder->total--;
- dest->total++;
-
- procmsg_msginfo_free(newmsginfo);
}
if (folder->finished_copy)
gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
{
Folder *folder;
- FolderItem * item;
- GSList * l;
+ FolderItem *item;
+ GSList *newmsgnums = NULL;
+ GSList *l, *l2;
gint num;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(folder->copy_msg != NULL, -1);
g_return_val_if_fail(folder->remove_msg != NULL, -1);
- if (!dest->cache) folder_item_read_cache(dest);
-
+ /*
+ * Copy messages to destination folder and
+ * store new message numbers in newmsgnums
+ */
item = NULL;
- for(l = msglist ; l != NULL ; l = g_slist_next(l)) {
+ for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
MsgInfo * msginfo = (MsgInfo *) l->data;
if (!item && msginfo->folder != NULL)
item = msginfo->folder;
- if (!item->cache) folder_item_read_cache(dest);
num = folder->copy_msg(folder, dest, msginfo);
+ newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
+ }
+
+ /* Read cache for dest folder */
+ if (!dest->cache) folder_item_read_cache(dest);
+
+ /*
+ * Fetch new MsgInfos for new messages in dest folder,
+ * add them to the msgcache and update folder message counts
+ */
+ l2 = newmsgnums;
+ for (l = msglist; l != NULL; l = g_slist_next(l)) {
+ MsgInfo *msginfo = (MsgInfo *) l->data;
+
+ num = GPOINTER_TO_INT(l2->data);
+
if (num != -1) {
MsgInfo *newmsginfo;
newmsginfo = folder->fetch_msginfo(folder, dest, num);
- if(newmsginfo) {
+ if (newmsginfo) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX ||
dest->stype == F_QUEUE ||
MSG_NEW|MSG_UNREAD|MSG_DELETED);
msgcache_add_msg(dest->cache, newmsginfo);
- if (MSG_IS_NEW(msginfo->flags))
- msginfo->folder->new--;
if (MSG_IS_NEW(newmsginfo->flags))
dest->new++;
- if (MSG_IS_UNREAD(msginfo->flags))
- msginfo->folder->unread--;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
- msginfo->folder->total--;
dest->total++;
procmsg_msginfo_free(newmsginfo);
}
+ }
+ l2 = g_slist_next(l2);
+ }
+
+ /*
+ * Remove source messages from their folders if
+ * copying was successfull and update folder
+ * message counts
+ */
+ l2 = newmsgnums;
+ for (l = msglist; l != NULL; l = g_slist_next(l)) {
+ MsgInfo *msginfo = (MsgInfo *) l->data;
+
+ num = GPOINTER_TO_INT(l2->data);
+
+ 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--;
}
- }
+
+ l2 = g_slist_next(l2);
+ }
+
if (folder->finished_copy)
folder->finished_copy(folder, dest);
+ g_slist_free(newmsgnums);
return dest->last_num;
}
if (num != -1) {
MsgInfo *newmsginfo;
- 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++;
-
- procmsg_msginfo_free(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++;
+
+ procmsg_msginfo_free(newmsginfo);
+ }
}
if (folder->finished_copy)
{
Folder *folder;
gint num;
- GSList * l;
+ GSList *newmsgnums = NULL;
+ GSList *l, *l2;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msglist != NULL, -1);
g_return_val_if_fail(folder->copy_msg != NULL, -1);
- if (!dest->cache) folder_item_read_cache(dest);
-
- for(l = msglist ; l != NULL ; l = g_slist_next(l)) {
+ /*
+ * Copy messages to destination folder and
+ * store new message numbers in newmsgnums
+ */
+ for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
MsgInfo * msginfo = (MsgInfo *) l->data;
num = folder->copy_msg(folder, dest, msginfo);
+ newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
+ }
+
+ /* Read cache for dest folder */
+ if (!dest->cache) folder_item_read_cache(dest);
+
+ /*
+ * Fetch new MsgInfos for new messages in dest folder,
+ * add them to the msgcache and update folder message counts
+ */
+ l2 = newmsgnums;
+ for (l = msglist; l != NULL; l = g_slist_next(l)) {
+ MsgInfo *msginfo = (MsgInfo *) l->data;
+
+ num = GPOINTER_TO_INT(l2->data);
+
if (num != -1) {
MsgInfo *newmsginfo;
newmsginfo = folder->fetch_msginfo(folder, dest, num);
- if(newmsginfo) {
+ if (newmsginfo) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX ||
dest->stype == F_QUEUE ||
procmsg_msginfo_free(newmsginfo);
}
}
+ l2 = g_slist_next(l2);
}
-
+
if (folder->finished_copy)
folder->finished_copy(folder, dest);
+ g_slist_free(newmsgnums);
return dest->last_num;
}
ret = folder->remove_msg(folder, item, num);
msginfo = msgcache_get_msg(item->cache, num);
- if(MSG_IS_NEW(msginfo->flags))
- item->new--;
- if(MSG_IS_UNREAD(msginfo->flags))
- item->unread--;
+ if (msginfo != NULL) {
+ if (MSG_IS_NEW(msginfo->flags))
+ item->new--;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ item->unread--;
+ procmsg_msginfo_free(msginfo);
+ msgcache_remove_msg(item->cache, num);
+ }
item->total--;
- procmsg_msginfo_free(msginfo);
- msgcache_remove_msg(item->cache, num);
return ret;
}
}
}
- item = folder_item_new(name, path);
+ item = folder_item_new(folder, name, path);
item->stype = stype;
item->account = account;
item->mtime = mtime;
static void folder_write_list_recursive(GNode *node, gpointer data)
{
FILE *fp = (FILE *)data;
- FolderItem *item = FOLDER_ITEM(node->data);
+ FolderItem *item;
gint i, depth;
static gchar *folder_type_str[] = {"mh", "mbox", "maildir", "imap",
"news", "unknown"};
static gchar *sort_key_str[] = {"none", "number", "size", "date",
"from", "subject", "score", "label",
"mark", "unread", "mime", "locked" };
+ g_return_if_fail(node != NULL);
+ g_return_if_fail(fp != NULL);
+ item = FOLDER_ITEM(node->data);
g_return_if_fail(item != NULL);
depth = g_node_depth(node);
}
else {
debug_print("*TMP* already created\n");
- processing_folder_item = folder_item_new(".processing", ".processing");
+ processing_folder_item = folder_item_new(processing_folder, ".processing", ".processing");
g_assert(processing_folder_item);
folder_item_append(processing_folder->node->data, processing_folder_item);
}
void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
{
const PersistPrefs *pp;
+ gchar *id = folder_item_get_identifier(item);
+
+ pp = folder_get_persist_prefs(pptable, id);
+ g_free(id);
- pp = folder_get_persist_prefs(pptable, item->path);
if (!pp) return;
/* CLAWS: since not all folder properties have been migrated to
FolderItem *item = FOLDER_ITEM(node->data);
PersistPrefs *pp;
GNode *child, *cur;
+ gchar *id;
g_return_if_fail(node != NULL);
g_return_if_fail(item != NULL);
- /* FIXME: item->path == NULL for top level folder, so this means that
- * properties of MH folder root will not be stored. Not quite important,
- * because the top level folder properties are not special anyway. */
+ /* NOTE: item->path == NULL means top level folder; not interesting
+ * to store preferences of that one. */
if (item->path) {
+ id = folder_item_get_identifier(item);
pp = g_new0(PersistPrefs, 1);
g_return_if_fail(pp != NULL);
pp->collapsed = item->collapsed;
pp->hide_read_msgs = item->hide_read_msgs;
pp->sort_key = item->sort_key;
pp->sort_type = item->sort_type;
- g_hash_table_insert(pptable, g_strdup(item->path), pp);
- }
+ g_hash_table_insert(pptable, id, pp);
+ }
if (node->children) {
child = node->children;
return TRUE;
}
+void folder_item_apply_processing(FolderItem *item)
+{
+ GSList *processing_list;
+ GSList *mlist, *cur;
+ GHashTable *folder_table;
+
+ g_return_if_fail(item != NULL);
+
+ processing_list = item->prefs->processing;
+ if (processing_list == NULL)
+ return;
+ folder_table = g_hash_table_new(NULL, NULL);
+
+ mlist = folder_item_get_msg_list(item);
+
+ for (cur = mlist ; cur != NULL ; cur = cur->next) {
+ MsgInfo * msginfo;
+
+ msginfo = (MsgInfo *) cur->data;
+ filter_message_by_msginfo(processing_list, msginfo,
+ folder_table);
+ procmsg_msginfo_free(msginfo);
+ }
+
+ /* folder_item_scan_foreach(summaryview->folder_table); */
+ folderview_update_item_foreach(folder_table, FALSE);
+
+ g_slist_free(mlist);
+
+ g_hash_table_destroy(folder_table);
+}
projects / claws.git / blobdiff