diff options
Diffstat (limited to 'camel/providers')
-rw-r--r-- | camel/providers/mbox/camel-mbox-folder.c | 133 | ||||
-rw-r--r-- | camel/providers/mbox/camel-mbox-summary.c | 225 | ||||
-rw-r--r-- | camel/providers/mbox/camel-mbox-summary.h | 6 |
3 files changed, 318 insertions, 46 deletions
diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c index 91ac79c22e..c6dfb657e7 100644 --- a/camel/providers/mbox/camel-mbox-folder.c +++ b/camel/providers/mbox/camel-mbox-folder.c @@ -57,31 +57,32 @@ static CamelFolderClass *parent_class=NULL; #define CMBOXS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)->klass) -static void _init (CamelFolder *folder, CamelStore *parent_store, +static void mbox_init (CamelFolder *folder, CamelStore *parent_store, CamelFolder *parent_folder, const gchar *name, gchar separator, CamelException *ex); -static void _open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex); -static void _close (CamelFolder *folder, gboolean expunge, CamelException *ex); -static gboolean _exists (CamelFolder *folder, CamelException *ex); -static gboolean _create(CamelFolder *folder, CamelException *ex); -static gboolean _delete (CamelFolder *folder, gboolean recurse, CamelException *ex); -static gboolean _delete_messages (CamelFolder *folder, CamelException *ex); -static GList *_list_subfolders (CamelFolder *folder, CamelException *ex); -static CamelMimeMessage *_get_message_by_number (CamelFolder *folder, gint number, CamelException *ex); -static gint _get_message_count (CamelFolder *folder, CamelException *ex); -static void _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex); -static GList *_get_uid_list (CamelFolder *folder, CamelException *ex); -static CamelMimeMessage *_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex); +static void mbox_open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex); +static void mbox_close (CamelFolder *folder, gboolean expunge, CamelException *ex); +static gboolean mbox_exists (CamelFolder *folder, CamelException *ex); +static gboolean mbox_create(CamelFolder *folder, CamelException *ex); +static gboolean mbox_delete (CamelFolder *folder, gboolean recurse, CamelException *ex); +static gboolean mbox_delete_messages (CamelFolder *folder, CamelException *ex); +static GList *mbox_list_subfolders (CamelFolder *folder, CamelException *ex); +static CamelMimeMessage *mbox_get_message_by_number (CamelFolder *folder, gint number, CamelException *ex); +static gint mbox_get_message_count (CamelFolder *folder, CamelException *ex); +static void mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex); +static GList *mbox_get_uid_list (CamelFolder *folder, CamelException *ex); +static CamelMimeMessage *mbox_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex); + +static void mbox_expunge (CamelFolder *folder, CamelException *ex); #if 0 -static void _expunge (CamelFolder *folder, CamelException *ex); static void _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder, CamelException *ex); static const gchar *_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex); #endif GPtrArray *summary_get_message_info (CamelFolder *folder, int first, int count); -static void _finalize (GtkObject *object); +static void mbox_finalize (GtkObject *object); static void camel_mbox_folder_class_init (CamelMboxFolderClass *camel_mbox_folder_class) @@ -94,24 +95,24 @@ camel_mbox_folder_class_init (CamelMboxFolderClass *camel_mbox_folder_class) /* virtual method definition */ /* virtual method overload */ - camel_folder_class->init = _init; - camel_folder_class->open = _open; - camel_folder_class->close = _close; - camel_folder_class->exists = _exists; - camel_folder_class->create = _create; - camel_folder_class->delete = _delete; - camel_folder_class->delete_messages = _delete_messages; - camel_folder_class->list_subfolders = _list_subfolders; - camel_folder_class->get_message_by_number = _get_message_by_number; - camel_folder_class->get_message_count = _get_message_count; - camel_folder_class->append_message = _append_message; - camel_folder_class->get_uid_list = _get_uid_list; + camel_folder_class->init = mbox_init; + camel_folder_class->open = mbox_open; + camel_folder_class->close = mbox_close; + camel_folder_class->exists = mbox_exists; + camel_folder_class->create = mbox_create; + camel_folder_class->delete = mbox_delete; + camel_folder_class->delete_messages = mbox_delete_messages; + camel_folder_class->list_subfolders = mbox_list_subfolders; + camel_folder_class->get_message_by_number = mbox_get_message_by_number; + camel_folder_class->get_message_count = mbox_get_message_count; + camel_folder_class->append_message = mbox_append_message; + camel_folder_class->get_uid_list = mbox_get_uid_list; + camel_folder_class->expunge = mbox_expunge; #if 0 - camel_folder_class->expunge = _expunge; camel_folder_class->copy_message_to = _copy_message_to; camel_folder_class->get_message_uid = _get_message_uid; #endif - camel_folder_class->get_message_by_uid = _get_message_by_uid; + camel_folder_class->get_message_by_uid = mbox_get_message_by_uid; camel_folder_class->search_by_expression = camel_mbox_folder_search_by_expression; camel_folder_class->search_complete = camel_mbox_folder_search_complete; @@ -119,12 +120,12 @@ camel_mbox_folder_class_init (CamelMboxFolderClass *camel_mbox_folder_class) camel_folder_class->get_message_info = summary_get_message_info; - gtk_object_class->finalize = _finalize; + gtk_object_class->finalize = mbox_finalize; } static void -_finalize (GtkObject *object) +mbox_finalize (GtkObject *object) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (object); @@ -159,7 +160,7 @@ camel_mbox_folder_get_type (void) } static void -_init (CamelFolder *folder, CamelStore *parent_store, +mbox_init (CamelFolder *folder, CamelStore *parent_store, CamelFolder *parent_folder, const gchar *name, gchar separator, CamelException *ex) { @@ -180,6 +181,12 @@ _init (CamelFolder *folder, CamelStore *parent_store, folder->has_uid_capability = TRUE; folder->has_search_capability = TRUE; + folder->permanent_flags = CAMEL_MESSAGE_ANSWERED | + CAMEL_MESSAGE_DELETED | + CAMEL_MESSAGE_DRAFT | + CAMEL_MESSAGE_FLAGGED | + CAMEL_MESSAGE_SEEN; + mbox_folder->summary = NULL; /* now set the name info */ @@ -196,7 +203,7 @@ _init (CamelFolder *folder, CamelStore *parent_store, } static void -_open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex) +mbox_open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder); @@ -222,13 +229,17 @@ _open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex) } static void -_close (CamelFolder *folder, gboolean expunge, CamelException *ex) +mbox_close (CamelFolder *folder, gboolean expunge, CamelException *ex) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder); /* call parent implementation */ parent_class->close (folder, expunge, ex); + if (expunge) { + mbox_expunge(folder, ex); + } + /* save index */ if (mbox_folder->index) { ibex_close(mbox_folder->index); @@ -240,9 +251,21 @@ _close (CamelFolder *folder, gboolean expunge, CamelException *ex) } +static void +mbox_expunge (CamelFolder *folder, CamelException *ex) +{ + CamelMboxFolder *mbox = (CamelMboxFolder *)folder; + + if (camel_mbox_summary_expunge(mbox->summary) == -1) { + camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID, /* FIXME: right error code */ + "Could not expunge: %s", strerror(errno)); + } +} + + /* FIXME: clean up this snot */ static gboolean -_exists (CamelFolder *folder, CamelException *ex) +mbox_exists (CamelFolder *folder, CamelException *ex) { CamelMboxFolder *mbox_folder; struct stat stat_buf; @@ -305,7 +328,7 @@ _exists (CamelFolder *folder, CamelException *ex) /* FIXME: clean up this snot */ static gboolean -_create (CamelFolder *folder, CamelException *ex) +mbox_create (CamelFolder *folder, CamelException *ex) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder); const gchar *folder_file_path, *folder_dir_path; @@ -376,7 +399,7 @@ _create (CamelFolder *folder, CamelException *ex) /* FIXME: cleanup */ static gboolean -_delete (CamelFolder *folder, gboolean recurse, CamelException *ex) +mbox_delete (CamelFolder *folder, gboolean recurse, CamelException *ex) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder); const gchar *folder_file_path, *folder_dir_path; @@ -476,7 +499,7 @@ _delete (CamelFolder *folder, gboolean recurse, CamelException *ex) /* TODO: remove this */ gboolean -_delete_messages (CamelFolder *folder, CamelException *ex) +mbox_delete_messages (CamelFolder *folder, CamelException *ex) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder); @@ -535,7 +558,7 @@ _delete_messages (CamelFolder *folder, CamelException *ex) /* FIXME: cleanup */ static GList * -_list_subfolders (CamelFolder *folder, CamelException *ex) +mbox_list_subfolders (CamelFolder *folder, CamelException *ex) { GList *subfolder_name_list = NULL; @@ -653,7 +676,7 @@ _list_subfolders (CamelFolder *folder, CamelException *ex) } static gint -_get_message_count (CamelFolder *folder, CamelException *ex) +mbox_get_message_count (CamelFolder *folder, CamelException *ex) { CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder; @@ -678,7 +701,7 @@ _get_message_count (CamelFolder *folder, CamelException *ex) /* FIXME: this may need some tweaking for performance? */ /* FIXME: MUST check all sytem call return codes MUST MUST */ static void -_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex) +mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder), *source_folder; CamelStream *output_stream; @@ -786,7 +809,7 @@ _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException static GList * -_get_uid_list (CamelFolder *folder, CamelException *ex) +mbox_get_uid_list (CamelFolder *folder, CamelException *ex) { GList *uid_list = NULL; CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder; @@ -803,7 +826,7 @@ _get_uid_list (CamelFolder *folder, CamelException *ex) } static CamelMimeMessage * -_get_message_by_number (CamelFolder *folder, gint number, CamelException *ex) +mbox_get_message_by_number (CamelFolder *folder, gint number, CamelException *ex) { CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder; CamelMboxMessageInfo *info; @@ -818,11 +841,27 @@ _get_message_by_number (CamelFolder *folder, gint number, CamelException *ex) return NULL; } - return _get_message_by_uid (folder, info->info.uid, ex); + return mbox_get_message_by_uid (folder, info->info.uid, ex); +} + +/* track flag changes in the summary */ +static void +message_changed(CamelMimeMessage *m, int type, CamelMboxFolder *mf) +{ + printf("Message changed: %s: %d\n", m->message_uid, type); + switch (type) { + case MESSAGE_FLAGS_CHANGED: + camel_mbox_summary_set_flags_by_uid(mf->summary, m->message_uid, m->flags); + break; + default: + printf("Unhandled message change event: %d\n", type); + break; + } } + static CamelMimeMessage * -_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex) +mbox_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder); CamelStream *message_stream; @@ -872,6 +911,10 @@ _get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex) message->folder = folder; gtk_object_ref((GtkObject *)folder); message->message_uid = g_strdup(uid); + message->flags = info->info.flags; + printf("%p flags = %x = %x\n", message, info->info.flags, message->flags); + + gtk_signal_connect((GtkObject *)message, "message_changed", message_changed, folder); return message; } diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c index 5608afc3df..4d10709fcd 100644 --- a/camel/providers/mbox/camel-mbox-summary.c +++ b/camel/providers/mbox/camel-mbox-summary.c @@ -29,6 +29,8 @@ #include <gtk/gtk.h> +#include <camel/camel-mime-message.h> + #include <camel/camel-mime-parser.h> #include <camel/camel-mime-filter.h> #include <camel/camel-mime-filter-basic.h> @@ -374,6 +376,7 @@ message_struct_new(CamelMimeParser *mp, CamelMboxMessageContentInfo *parent, int ms->info.content = (CamelMessageContentInfo *)body_part_new(mp, parent, start, body); ms->xev_offset = xev_offset; + return ms; } @@ -674,6 +677,10 @@ error: #define SAVEIT +/* TODO: Allow to sync with current summary info, without over-writing flags if they + already exist there */ +/* TODO: Lazy sync, make this read-only, and dont write out xev headers unless we need + to? */ static int index_folder(CamelMboxSummary *s, int startoffset) { CamelMimeParser *mp; @@ -705,7 +712,7 @@ static int index_folder(CamelMboxSummary *s, int startoffset) int write_offset = 0; /* how much does the dest differ from the source pos */ int old_offset = 0; - guint32 newuid; + guint32 newuid, newflags; off_t xevoffset = -1; char *tmpname; @@ -761,6 +768,7 @@ static int index_folder(CamelMboxSummary *s, int startoffset) case HSCAN_MULTIPART: case HSCAN_HEADER: /* starting a new header */ newuid=~0; + newflags=0; if (!toplevel) { char name[32]; unsigned int olduid, oldflags; @@ -775,6 +783,7 @@ static int index_folder(CamelMboxSummary *s, int startoffset) if (header_evolution_decode(xev, &olduid, &oldflags) != ~0) { d(printf(" uid = %d = %x\n", olduid, olduid)); newuid = olduid; + newflags = oldflags; #if 0 while (camel_mime_parser_step(mp, &data, &datalen) != HSCAN_FROM_END) ; @@ -834,6 +843,7 @@ static int index_folder(CamelMboxSummary *s, int startoffset) parent = (CamelMboxMessageContentInfo *)message->info.content; if (newuid != ~0) { message->info.uid = g_strdup_printf("%u", newuid); + message->info.flags = newflags; } else { g_warning("This shouldn't happen?"); } @@ -848,6 +858,7 @@ static int index_folder(CamelMboxSummary *s, int startoffset) body = (CamelMboxMessageContentInfo *)message->info.content; if (newuid != ~0) { message->info.uid = g_strdup_printf("%u", newuid); + message->info.flags = newflags; } else { g_warning("This shouldn't happen?"); } @@ -1259,6 +1270,218 @@ guint32 camel_mbox_summary_set_uid(CamelMboxSummary *s, guint32 uid) return s->nextuid; } +void camel_mbox_summary_set_flags_by_uid(CamelMboxSummary *s, const char *uid, guint32 flags) +{ + CamelMessageInfo *info; + + info = (CamelMessageInfo *)camel_mbox_summary_uid(s, uid); + if (info != NULL) { + if (info->flags != flags) { + info->flags = flags | CAMEL_MESSAGE_FOLDER_FLAGGED; + s->dirty = TRUE; + } + } else { + g_warning("Message has dissapeared from summary? uid %s", uid); + } +} + +/* update offsets in the summary to take account deleted parts */ +static void +offset_content(CamelMboxMessageContentInfo *content, off_t offset) +{ + content->pos -= offset; + content->bodypos -= offset; + content->endpos -= offset; + content = (CamelMboxMessageContentInfo *)content->info.childs; + while (content) { + offset_content(content, offset); + content = (CamelMboxMessageContentInfo *)content->info.next; + } +} + +void camel_mbox_summary_remove_uid(CamelMboxSummary *s, const char *uid) +{ + CamelMboxMessageInfo *oldinfo; + char *olduid; + + if (g_hash_table_lookup_extended(s->message_uid, uid, (void *)&olduid, (void *)&oldinfo)) { +#if 0 + /* FIXME: this code should be executed to update the summary info, + however, only if we're not depending on the info not changing yet */ + off_t offset = info->endpos - info->pos; + int i, count, got = FALSE; + + count = s->messages->len; + for (i=0;i<count;i++) { + CamelMboxMessageInfo *minfo = g_ptr_array_index(s->messages, i); + if (got) { + offset_content(minfo, offset); + } else if (minfo == info) { + got = TRUE; + } + } +#endif + g_hash_table_remove(s->message_uid, uid); + g_ptr_array_remove(s->messages, oldinfo); + message_struct_free(oldinfo); + g_free(olduid); + } +} + +/* perform expunge/update xev headers, etc */ +/* TODO: merge this with the indexing code, so that it can index new parts + without having to reread everything again? */ +/* TODO: sync with the mbox, if it has changed */ +int +camel_mbox_summary_expunge(CamelMboxSummary *s) +{ + int quick = TRUE, work=FALSE; + int i, count; + CamelMboxMessageInfo *info; + + printf("Executing expunge ...\n"); + + count = camel_mbox_summary_message_count(s); + for (i=0;quick && i<count;i++) { + info = camel_mbox_summary_index(s, i); + if (info->xev_offset == -1 || info->info.flags & CAMEL_MESSAGE_DELETED) + quick = FALSE; + else + work |= (info->info.flags & CAMEL_MESSAGE_FOLDER_FLAGGED) != 0; + } + if (quick) { + int fd; + char name[32]; + + if (!work) + return 0; + + camel_mbox_summary_save(s); + + fd = open(s->folder_path, O_WRONLY); + + if (fd == -1) { + g_error("Cannot open folder for update: %s", strerror(errno)); + return -1; + } + + /* poke in the new xev info */ + for (i=0;i<count;i++) { + info = camel_mbox_summary_index(s, i); + g_assert(info); + g_assert(info->xev_offset != -1); + if (info->info.flags & CAMEL_MESSAGE_FOLDER_FLAGGED) { + printf("Setting new flags to message %s = %04x\n", info->info.uid, info->info.flags & 0xffff); + lseek(fd, info->xev_offset, SEEK_SET); + sprintf(name, "X-Evolution: %08x-%04x\n\n", (unsigned int)strtoul(info->info.uid, NULL, 10), info->info.flags & 0xffff); + write(fd, name, strlen(name)); + info->info.flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED; + } + } + close(fd); + } else { + char *tmpname; + int fd, fdout; + int last_write = 0, offset = 0, summary_end = 0, last_start = 0; + CamelMboxMessageContentInfo *content; + struct stat st; + + printf("We must expunge messages and/or write headers\n"); + + /* FIXME: This should check the current summary is correct */ + + /* we have to write out new headers or delete messages, starting from message i */ + + fd = open(s->folder_path, O_RDONLY); + if (fd == -1) { + g_error("Cannot open folder for read: %s", strerror(errno)); + return -1; + } + + tmpname = g_strdup_printf("%s.tmp", s->folder_path); + fdout = open(tmpname, O_WRONLY|O_CREAT|O_TRUNC, 0600); + if (fdout == -1) { + g_error("Cannot open tmp file for write: %s", strerror(errno)); + close(fd); + g_free(tmpname); + return -1; + } + + for (i=0;i<count;i++) { + info = camel_mbox_summary_index(s, i); + g_assert(info); + g_assert(info->info.content); + + content = (CamelMboxMessageContentInfo *)info->info.content; + + /* FIXME: Must also write out xev headers etc, as appropriate? */ + + /* we need to use the end of the previous message, becuase the beginning of + this message doesn't include the "^From " line. */ + + /* do we remove this message? */ + if (info->info.flags & CAMEL_MESSAGE_DELETED) { + printf("Deleting message: %s\n", info->info.uid); + camel_mbox_summary_copy_block(fd, fdout, last_write, last_start-last_write); + last_write = content->endpos; + last_start = last_write; + offset += (content->endpos - content->pos); + + /* remove this message from the index */ + if (s->index) { + char name[32]; + + sprintf(name, "%x", info->info.uid); + ibex_unindex(s->index, name); + } + + camel_mbox_summary_remove_uid(s, info->info.uid); + i--; /* redo this index */ + count--; + } else { + printf("Keeping message: %s\n", info->info.uid); + last_start = content->endpos; + offset_content(content, offset); + summary_end = content->endpos; + } + } + /* copy the rest of the file ... */ + camel_mbox_summary_copy_block(fd, fdout, last_write, INT_MAX); + + close(fd); + if (close(fdout) == -1) { + g_error("Cannot close tmp folder: %s", strerror(errno)); + unlink(tmpname); + g_free(tmpname); + return -1; + } + + if (rename(tmpname, s->folder_path) == -1) { + g_error("Cannot rename folder: %s", strerror(errno)); + unlink(tmpname); + g_free(tmpname); + return -1; + } + + /* force an index sync */ + if (s->index) { + ibex_write(s->index); + } + + /* update summary size to match the actual (written) folder size ... */ + s->size = summary_end; + /* and the time to match the newly written time, so we dont update needlessly */ + if (stat(s->folder_path, &st) == 0) { + s->time = st.st_mtime; + } + + camel_mbox_summary_save(s); + } + + return 0; +} + + #if 0 int main(int argc, char **argv) { diff --git a/camel/providers/mbox/camel-mbox-summary.h b/camel/providers/mbox/camel-mbox-summary.h index 80b59ef54f..fda574c6f8 100644 --- a/camel/providers/mbox/camel-mbox-summary.h +++ b/camel/providers/mbox/camel-mbox-summary.h @@ -63,15 +63,21 @@ void camel_mbox_summary_unref(CamelMboxSummary *); int camel_mbox_summary_load(CamelMboxSummary *); int camel_mbox_summary_save(CamelMboxSummary *); int camel_mbox_summary_check(CamelMboxSummary *); +int camel_mbox_summary_expunge(CamelMboxSummary *); guint32 camel_mbox_summary_next_uid(CamelMboxSummary *); /* set the minimum uid */ guint32 camel_mbox_summary_set_uid(CamelMboxSummary *s, guint32 uid); CamelMboxMessageInfo *camel_mbox_summary_uid(CamelMboxSummary *s, const char *uid); +/* dont use this function yet ... */ +void camel_mbox_summary_remove_uid(CamelMboxSummary *s, const char *uid); CamelMboxMessageInfo *camel_mbox_summary_index(CamelMboxSummary *, int index); int camel_mbox_summary_message_count(CamelMboxSummary *); +/* set flags within a summary item */ +void camel_mbox_summary_set_flags_by_uid(CamelMboxSummary *s, const char *uid, guint32 flags); + /* TODO: should be in a utility library */ int camel_mbox_summary_copy_block(int fromfd, int tofd, off_t readpos, size_t bytes); |