From 8347ce1403c68a408a3b9952f6486b5ac584104b Mon Sep 17 00:00:00 2001 From: 8 Date: Tue, 18 Sep 2001 21:43:00 +0000 Subject: If filter inbox is set on the store, and we're opening inbox '', then 2001-09-18 * providers/local/camel-maildir-folder.c (camel_maildir_folder_new): If filter inbox is set on the store, and we're opening inbox '', then enable filtering on new messages. * providers/local/camel-local-folder.c (camel_local_folder_construct): After loading the summary, check it, and only abort if that fails. Also maintain the changes count. * providers/local/camel-local-summary.c (camel_local_summary_load): Remove summary_check code from here. (camel_local_summary_check): Sync index/summary here, if we were successful. * providers/local/camel-spool-folder.c (camel_spool_folder_new): If we have filter-new-messages-on-inbox set and we just opened inbox, turn on filtering on this folder. (camel_spool_folder_construct): Keep track of changes for the folder, so that filter-new-messages works right (?) * providers/local/camel-spool-store.c (get_folder): Pass 'INBOX' as the folder name, not the path. * camel-folder-search.c (search_not): Modified patch from since the summary is messageinfo's, not strings. ** Ok so the problem with the stuff below is that maildir/spool 'summary_load' throws away all events, including recents, joy eh? * providers/local/camel-maildir-summary.c (maildir_summary_check): Add new messages to the recent changeinfo. * providers/local/camel-spool-summary.c: Mark 'new' message as recent, for later processing if required (i.e. 'filter new messages'). * camel-store.c (construct): new function, cascade up construct method and check for 'filter' param, and set accordingly for any one that might want it. * providers/imap/camel-imap-store.c (construct): map the param_filter_inbox flag to the store->flags as CAMEL_STORE_FILTER_INBOX. * camel-store.h (CAMEL_STORE_FILTER_INBOX): new flag to tell it to filter inbox. * providers/imap/camel-imap-folder.h: Removed do_filtering flag from CamelImapFolder. * providers/imap/camel-imap-folder.c (imap_update_summary): Remove the 'recents' parameter, use the 'changes' parameter instead to convey this info. (camel_imap_folder_changed): Changed for update_summary api change. Now always just emit the changed event if we have any changes to report, filtering code removed, handled upstream. (filter_proc): (filter_free): Removed old filtering code. (camel_imap_folder_new): Set the filter_recent flag on the folder if we're the inbox and filtering of inbox is enabled. * camel-folder.c (folder_changed): If we have 'recent' messages, and are set to filter recents, then freeze the folder and launch a thread to do the processing (or similar if threading not enabled). (thaw): Make sure we emit the changed signal outside of owning the lock and if things have changed. Also, no longer bother downgrading folder_changed events to message_changed events. * camel-folder.h (struct _CamelFolder): Added filter_recent flag -> signifies all recent messages in folder should be filtered. * camel-session.c: (camel_session_thread_msg_new, camel_session_thread_msg_free, camel_session_thread_queue, camel_session_thread_wait): code to handle async operations as part of camel processing. (camel_session_finalise): free thread_lock, destroy thread, active hash, etc. (camel_session_init): init thread, active hash, etc. (camel_session_class_init): Init virtual functions. (session_thread_msg_new, session_thread_msg_free, session_thread_destroy, session_thread_received, session_thread_queue, session_thread_wait): default implementation of session threads stuff. 2001-09-17 * camel-folder.c (camel_folder_change_info_recent_uid): New function to add a 'recent' uid to the change info. (camel_folder_change_info_clear): Clear recent list. (camel_folder_change_info_free): Free recent list. (camel_folder_change_info_new): Setup recent list. * camel-folder.h: Added a uid_recent item to the folder_changed event data. * providers/local/camel-maildir-store.c (scan_dir): Free new in the right block. * providers/local/camel-local-provider.c: Add local config entries to filter on new messages in spool and maildir provider. * camel-vee-folder.c (vee_folder_construct): Remove the assertion which stops ? in names from being allowed. svn path=/trunk/; revision=12956 --- camel/providers/imap/camel-imap-folder.c | 93 +++----------------------------- camel/providers/imap/camel-imap-folder.h | 2 +- camel/providers/imap/camel-imap-store.c | 4 +- 3 files changed, 11 insertions(+), 88 deletions(-) (limited to 'camel/providers/imap') diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index fc873f9e85..5d2a8ba146 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -50,7 +50,6 @@ #include "camel-data-wrapper.h" #include "camel-disco-diary.h" #include "camel-exception.h" -#include "camel-filter-driver.h" #include "camel-mime-filter-crlf.h" #include "camel-mime-filter-from.h" #include "camel-mime-message.h" @@ -220,7 +219,7 @@ camel_imap_folder_new (CamelStore *parent, const char *folder_name, if ((imap_store->parameters & IMAP_PARAM_FILTER_INBOX) && !g_strcasecmp (folder_name, "INBOX")) - imap_folder->do_filtering = TRUE; + folder->filter_recent = TRUE; return folder; } @@ -1586,7 +1585,6 @@ add_message_from_data (CamelFolder *folder, GPtrArray *messages, static void imap_update_summary (CamelFolder *folder, int exists, CamelFolderChangeInfo *changes, - GPtrArray *recents, CamelException *ex) { CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store); @@ -1775,8 +1773,8 @@ imap_update_summary (CamelFolder *folder, int exists, camel_folder_summary_add (folder->summary, mi); camel_folder_change_info_add_uid (changes, camel_message_info_uid (mi)); - if (recents && (mi->flags & CAMEL_IMAP_MESSAGE_RECENT)) - g_ptr_array_add (recents, (char *)camel_message_info_uid (mi)); + if ((mi->flags & CAMEL_IMAP_MESSAGE_RECENT)) + camel_folder_change_info_recent_uid(changes, camel_message_info_uid (mi)); } g_ptr_array_free (messages, TRUE); return; @@ -1798,44 +1796,6 @@ imap_update_summary (CamelFolder *folder, int exists, } } -struct _filter_msg { - CamelImapMsg msg; - - GPtrArray *recents; - CamelFolder *folder; - CamelFilterDriver *driver; -}; - -static void -filter_proc(CamelImapStore *store, CamelImapMsg *mm) -{ - struct _filter_msg *msg = (struct _filter_msg *)mm; - - printf("executing filtering %d messages folder %p\n", msg->recents->len, msg->folder); - - /* what about exceptions? */ - camel_filter_driver_filter_folder(msg->driver, msg->folder, NULL, msg->recents, FALSE, NULL); -} - -static void -filter_free(CamelImapStore *store, CamelImapMsg *mm) -{ - struct _filter_msg *msg = (struct _filter_msg *)mm; - int i; - - printf("freeing filtering %d messages folder %p\n", msg->recents->len, msg->folder); - - camel_object_unref((CamelObject *)msg->driver); - - camel_folder_thaw(msg->folder); - camel_object_unref((CamelObject *)msg->folder); - - for (i=0;irecents->len;i++) - g_free(msg->recents->pdata[i]); - - g_ptr_array_free(msg->recents, TRUE); -} - /* Called with the store's command_lock locked */ void camel_imap_folder_changed (CamelFolder *folder, int exists, @@ -1872,50 +1832,11 @@ camel_imap_folder_changed (CamelFolder *folder, int exists, } len = camel_folder_summary_count (folder->summary); - if (exists > len) { - if (imap_folder->do_filtering) - recents = g_ptr_array_new (); - imap_update_summary (folder, exists, changes, recents, ex); - } + if (exists > len) + imap_update_summary (folder, exists, changes, ex); - /* if we have updates to make for filtering (probably), then we freeze the - folder so we dont show them till they're complete, this may cause unacceptable - delays for users, but the alternative isn't very nice either (show them and let - them change as processed) */ - if (recents && !camel_exception_is_set (ex) && recents->len) { - CamelFilterDriver *driver; - - camel_folder_freeze (folder); - - if (camel_folder_change_info_changed (changes)) - camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); - - driver = camel_session_get_filter_driver (CAMEL_SERVICE (folder->parent_store)->session, "incoming", ex); - if (driver) { -#ifdef ENABLE_THREADS - int i; - struct _filter_msg *msg = (struct _filter_msg *)camel_imap_msg_new(filter_proc, filter_free, sizeof(*msg)); - - msg->recents = g_ptr_array_new(); - for (i=0;ilen;i++) - g_ptr_array_add(msg->recents, g_strdup(recents->pdata[i])); - - camel_object_ref((CamelObject *)folder); - msg->folder = folder; - msg->driver = driver; - printf("queueing filtering %d messages folder %p\n", msg->recents->len, folder); - camel_imap_msg_queue((CamelImapStore *)folder->parent_store, (CamelImapMsg *)msg); -#else - camel_filter_driver_filter_folder (driver, folder, NULL, recents, FALSE, ex); - camel_folder_thaw (folder); - camel_object_unref (CAMEL_OBJECT (driver)); -#endif - } else - camel_folder_thaw (folder); - } else { - if (camel_folder_change_info_changed (changes)) - camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); - } + if (camel_folder_change_info_changed (changes)) + camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); camel_folder_change_info_free (changes); diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h index db507d52d5..295cfd041e 100644 --- a/camel/providers/imap/camel-imap-folder.h +++ b/camel/providers/imap/camel-imap-folder.h @@ -48,7 +48,7 @@ struct _CamelImapFolder { struct _CamelImapFolderPrivate *priv; - gboolean need_rescan, need_refresh, do_filtering; + gboolean need_rescan, need_refresh; CamelFolderSearch *search; CamelImapMessageCache *cache; }; diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index d4cf4fb16c..b58b97fa83 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -285,8 +285,10 @@ construct (CamelService *service, CamelSession *session, } if (camel_url_get_param (url, "check_all")) imap_store->parameters |= IMAP_PARAM_CHECK_ALL; - if (camel_url_get_param (url, "filter")) + if (camel_url_get_param (url, "filter")) { imap_store->parameters |= IMAP_PARAM_FILTER_INBOX; + store->flags |= CAMEL_STORE_FILTER_INBOX; + } } static void -- cgit v1.2.3