From 8ad855fef6632e32723242fda554fce04f025036 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 17 Jan 2001 00:27:19 +0000 Subject: Delayed loading of IMAP message parts. * camel-types.h: typedef CamelMessageInfo and CamelMessageContentInfo here * camel-folder-summary.h: Add a "size" field to CamelMessageContentInfo. * camel-folder-summary.c (camel_folder_summary_content_info_new, camel_folder_summary_content_info_free): Renamed and made non-static for providers that construct their own content info. (content_info_load, content_info_save): load/save size * camel-data-wrapper.c (camel_data_wrapper_is_offline): New function to return if a data wrapper's contents are "offline". (So that, for example, we don't make thumbnails of images that haven't been loaded off the IMAP server yet.) Defaults to FALSE. * providers/imap/camel-imap-folder.c (camel_imap_folder_selected): Fix a bug in re-selecting a folder when messages have been expunged from it by another client in the meantime. (imap_get_message): Rewrite. If the message is larger than a certain size, just create a skeleton message containing CamelImapWrappers that will read parts as needed. This way, large attachments only need to be downloaded if the user looks at them, and multipart/alternative alternatives that aren't used will never be downloaded at all. (imap_update_summary): Rewrite this a bunch too to make the parsing more robust. * providers/imap/camel-imap-summary.c (CAMEL_IMAP_SUMMARY_VERSION): bump. (camel_imap_summary_new): Set build_content to TRUE. (content_info_load, content_info_save): Only save/load the content for messages that have it. (The content info gets created as a side effect of imap_get_message.) * providers/imap/camel-imap-utils.c (imap_parse_body): New routine (and helpers) to parse an IMAP 'body' FETCH response and fill in a CamelMessageContentInfo from it. * providers/imap/Makefile.am (libcamelimap_la_SOURCES, libcamelimap_la_HEADERS): add camel-imap-wrapper. svn path=/trunk/; revision=7557 --- camel/providers/imap/camel-imap-summary.c | 34 +++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) (limited to 'camel/providers/imap/camel-imap-summary.c') diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c index 5d657b6d68..dd77673cad 100644 --- a/camel/providers/imap/camel-imap-summary.c +++ b/camel/providers/imap/camel-imap-summary.c @@ -32,14 +32,17 @@ #include #include -#define CAMEL_IMAP_SUMMARY_VERSION (0x2000) +#define CAMEL_IMAP_SUMMARY_VERSION (0x300) static int summary_header_load (CamelFolderSummary *, FILE *); static int summary_header_save (CamelFolderSummary *, FILE *); static CamelMessageInfo *message_info_load (CamelFolderSummary *s, FILE *in); -static int message_info_save (CamelFolderSummary *s, FILE *out, - CamelMessageInfo *info); +static int message_info_save (CamelFolderSummary *s, FILE *out, + CamelMessageInfo *info); +static CamelMessageContentInfo *content_info_load (CamelFolderSummary *s, FILE *in); +static int content_info_save (CamelFolderSummary *s, FILE *out, + CamelMessageContentInfo *info); static void camel_imap_summary_class_init (CamelImapSummaryClass *klass); static void camel_imap_summary_init (CamelImapSummary *obj); @@ -76,6 +79,8 @@ camel_imap_summary_class_init (CamelImapSummaryClass *klass) cfs_class->summary_header_save = summary_header_save; cfs_class->message_info_load = message_info_load; cfs_class->message_info_save = message_info_save; + cfs_class->content_info_load = content_info_load; + cfs_class->content_info_save = content_info_save; } static void @@ -109,7 +114,7 @@ camel_imap_summary_new (const char *filename, guint32 validity) camel_object_new (camel_imap_summary_get_type ())); CamelImapSummary *imap_summary = (CamelImapSummary *)summary; - camel_folder_summary_set_build_content (summary, FALSE); + camel_folder_summary_set_build_content (summary, TRUE); camel_folder_summary_set_filename (summary, filename); if (camel_folder_summary_load (summary) == -1) { @@ -186,3 +191,24 @@ message_info_save (CamelFolderSummary *s, FILE *out, CamelMessageInfo *info) return camel_folder_summary_encode_uint32 (out, iinfo->server_flags); } + + +static CamelMessageContentInfo * +content_info_load (CamelFolderSummary *s, FILE *in) +{ + if (fgetc (in)) + return camel_imap_summary_parent->content_info_load (s, in); + else + return camel_folder_summary_content_info_new (s); +} + +static int +content_info_save (CamelFolderSummary *s, FILE *out, + CamelMessageContentInfo *info) +{ + if (info->type) { + fputc (1, out); + return camel_imap_summary_parent->content_info_save (s, out, info); + } else + return fputc (0, out); +} -- cgit v1.2.3