* src/folder.[ch]

[claws.git] / src / folder.c

diff --git a/src/folder.c b/src/folder.c
index 047b1bca12a91165ddb739528a0d78f7d582a8e6..aaa78111047469cb9536e380d58e0277c664510e 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -46,6 +46,8 @@
 #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"
 
@@ -66,8 +68,7 @@ static void folder_get_persist_prefs_recursive
                                        (GNode *node, GHashTable *pptable);
 static gboolean persist_prefs_free     (gpointer key, gpointer val, gpointer data);
 void folder_item_read_cache            (FolderItem *item);
-void folder_item_write_cache           (FolderItem *item);
-
+void folder_item_free_cache            (FolderItem *item);
 
 Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
 {
@@ -267,9 +268,12 @@ void folder_item_destroy(FolderItem *item)
 {
        g_return_if_fail(item != NULL);
 
+       debug_print(_("Destroying folder item %s\n"), item->path);
+       
+       if(item->cache)
+               folder_item_free_cache(item);
        g_free(item->name);
        g_free(item->path);
-       msgcache_destroy(item->cache);
        g_free(item);
 }
 
@@ -295,9 +299,19 @@ void folder_set_name(Folder *folder, const gchar *name)
        }
 }
 
+gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
+       FolderItem *item = (FolderItem *) node->data;
+
+       folder_item_destroy(item);
+       return FALSE;
+}
+
 void folder_tree_destroy(Folder *folder)
 {
-       /* TODO: destroy all FolderItem before */
+       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);
 
        folder->inbox = NULL;
@@ -396,6 +410,32 @@ void folder_write_list(void)
                g_warning("failed to write folder list.\n");
 }
 
+gboolean folder_scan_tree_func(GNode *node, gpointer data)
+{
+       GHashTable *pptable = (GHashTable *)data;
+       FolderItem *item = (FolderItem *)node->data;
+       
+       folder_item_restore_persist_prefs(item, pptable);
+}
+
+void folder_scan_tree(Folder *folder)
+{
+       GHashTable *pptable;
+       
+       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);
+
+       prefs_matcher_read_config();
+}
+
 struct TotalMsgCount
 {
        guint new;
@@ -823,7 +863,7 @@ 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, maxgetcount = 0;
+       guint min = 0xffffffff, max = 0, cache_max = 0;
        FolderScanInfo *folderscaninfo;
        guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
        
@@ -902,8 +942,8 @@ gint folder_item_scan(FolderItem *item)
                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))
+                       (((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);
@@ -967,7 +1007,6 @@ gint folder_item_scan(FolderItem *item)
                }
        } else if (folder->fetch_msginfo) {
                for(elem = new_list; elem != NULL; elem = g_slist_next(elem)) {
-                       MsgFlags flags;
                        MsgInfo *msginfo;
                        guint num;
 
@@ -1047,7 +1086,9 @@ void folder_find_expired_caches(FolderItem *item, gpointer data)
 void folder_item_free_cache(FolderItem *item)
 {
        g_return_if_fail(item != NULL);
-       g_return_if_fail(item->cache != NULL);
+       
+       if(item->cache == NULL)
+               return;
        
        folder_item_write_cache(item);
        msgcache_destroy(item->cache);
@@ -1142,12 +1183,33 @@ MsgInfo *folder_item_fetch_msginfo(FolderItem *item, gint num)
        if(!item->cache)
                folder_item_read_cache(item);
        
-       if(msginfo = msgcache_get_msg(item->cache, num))
+       if((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
                return msginfo;
        
        g_return_val_if_fail(folder->fetch_msginfo, NULL);
-       msginfo = folder->fetch_msginfo(folder, item, num);
-       return msginfo;
+       if((msginfo = folder->fetch_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)
+{
+       Folder *folder;
+       MsgInfo *msginfo;
+       
+       g_return_val_if_fail(item != NULL, NULL);
+       
+       folder = item->folder;
+       if(!item->cache)
+               folder_item_read_cache(item);
+       
+       if((msginfo = msgcache_get_msg_by_id(item->cache, msgid)) != NULL)
+               return msginfo;
+
+       return NULL;
 }
 
 GSList *folder_item_get_msg_list(FolderItem *item)
@@ -1234,7 +1296,6 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        Folder *folder;
        gint num;
-       gchar * filename;
        Folder * src_folder;
 
        g_return_val_if_fail(dest != NULL, -1);
@@ -1317,7 +1378,6 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
        Folder *folder;
        FolderItem * item;
        GSList * l;
-       gchar * filename;
        gint num;
 
        g_return_val_if_fail(dest != NULL, -1);
@@ -1402,8 +1462,6 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        Folder *folder;
        gint num;
-       gchar * filename;
-       Folder * src_folder;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msginfo != NULL, -1);
@@ -1468,7 +1526,6 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
        Folder *folder;
        gint num;
        GSList * l;
-       gchar * filename;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
@@ -1575,6 +1632,13 @@ gint folder_item_remove_all_msg(FolderItem *item)
        if (result == 0) {
                if (folder->finished_remove)
                        folder->finished_remove(folder, item);
+
+               folder_item_free_cache(item);
+               item->cache = msgcache_new();
+
+               item->new = 0;
+               item->unread = 0;
+               item->total = 0;
        }
 
        return result;
@@ -2026,7 +2090,6 @@ static void folder_create_processing_folder(void)
 {
 #define PROCESSING_FOLDER ".processing"        
        Folder     *tmpparent;
-       FolderItem *tmpfolder;
        gchar      *tmpname;
 
        tmpparent = folder_get_default_folder();
@@ -2138,7 +2201,7 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
                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, item->path, pp);
+               g_hash_table_insert(pptable, g_strdup(item->path), pp);
        }               
 
        if (node->children) {
@@ -2153,6 +2216,8 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
 
 static gboolean persist_prefs_free(gpointer key, gpointer val, gpointer data)
 {
+       if (key) 
+               g_free(key);
        if (val) 
                g_free(val);
        return TRUE;