From 8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07 Mon Sep 17 00:00:00 2001 From: NotZed Date: Mon, 24 Apr 2000 06:05:41 +0000 Subject: No longer call data_wrapper_repository_init. 2000-04-24 NotZed * camel.c (camel_init): No longer call data_wrapper_repository_init. * camel-medium.c (write_to_stream): Moved (back) to camel-mime-part. (add_header): (set_header): (remove_header): (get_header): Make all these abstract, and spit warnings if called. I guess it could manage the list, but well, it doesn't. * camel-medium.h (struct _CamelMedium): Dont store headers here, the implementor is the only one who knows their format. (CamelMediumClass): Changed header values to be void *'s. They need not be strings? * camel-simple-data-wrapper.c (construct_from_stream): And we're back. Set the output stream. (construct_from_parser): Moved to camel-mime-part-utils. * camel-mime-part-utils.c (camel_mime_part_construct_content_from_parser): Create the contents of multipart and simple messages. * camel-multipart.c (construct_from_parser): Moved to camel-mime-part-utils. (separate_part): Removed. * camel-mime-part.c (construct_from_stream): Back again! This now switches over to using a mime parser for any mime parts, only. (my_write_to_stream): Write our headers and so forth here. (add_header): Add header directly, parent class is abstract. (remove_header): Ditto. (set_header): Ditto. * camel-data-wrapper.c (camel_data_wrapper_construct_from_stream): Remade abstract. (camel_data_wrapper_construct_from_parser): Moved to camel_mime_part. * camel-data-wrapper.h: Put back construct_from_stream. * camel-mime-part.h: Put construct_from_parser in here, the data-wrapper shouldn't know about mime. Ok, so now to undo half of the last hours changes ... duh. 2a51,93 * providers/pop3/camel-pop3-folder.c (get_message_by_number): Use construct_from_stream instead of set_input_stream(). * camel-simple-data-wrapper-stream.c (camel_simple_data_wrapper_stream_construct): REmoved the destroy callback code. (wrapper_destroy_cb): Removed. * camel-simple-data-wrapper.h: Add prototype for _construct() method. * camel.c: Include unicode.h to kill a warning. * camel-data-wrapper.h (CameldataWrapperClass): Removed construct_from_stream virtual method. Removed get/set input stream. * data-wrapper-repository.[ch]: Removed&from build. Obsoleted? The justification as is follows: It is mixing storage protocol/format with message architecture. It really just doesn't serve any purpose, as each medium implementor will have to have its own type->handler mapping, and the only current implementor, mimepart has a very simple structure and no need for this. * camel-medium.c (write_to_stream): Moved here from most of the stuff in camel-mime-part. Well, the MEDIUM is the one that knows what the headers are, and the content is, let it write it out. * camel-mime-part-utils.c (camel_mime_part_construct_content): Copied from camel-mime-part.c, removed handling of message followon state (moved to camel-mime-message). (camel_mime_part_construct_content_from_parser): Renamed from construct_content. (camel_mime_part_construct_headers_from_stream): (camel_mime_part_construct_content_from_stream): (camel_mime_part_store_stream_in_buffer): Removed. Replaced by the new construct from parser stuff. * camel-mime-message.c (construct_from_parser): Do construct_from_parser for mime-message. (_write_to_stream): Set the mime-version header for medium to write out, rather than writing it out ourselves. 4a96,102 (construct_from_stream): Removed. (camel_data_wrapper_construct_from_stream): Changed to a helper function, creates a mime_parser, and constructs from that. (set_input_stream): Removed. (camel_data_wrapper_set_input_stream): Removed. (get_input_stream): Removed. (camel_data_wrapper_get_input_stream): Removed. 11a110,111 (_get_message_by_uid): Use construct_from_stream() instead of creating our own parser. 16a117,131 (camel_mime_part_construct_content): Removed to camel-mime-part-utils.c (my_get_output_stream): Removed. The streeam is in the data-wrapper. (my_get_content_object): Removed. The content object is stored in the medium. If none is there, the object wasn't created properly. (my_write_content_to_stream): Removed. The content object is the one that knows how to write itself out!!!!!!!! (my_write_to_stream): Remove the base header writing stuff - has been moved to camel-medium, where it belongs. This can just be used to check for mandatory headers. (my_construct_from_stream): Removed. (my_set_input_stream): What the hell, i'll remove this too. Nobody seems to understand how it differs from create from stream, and they both seem to serve the same purpose ... 19a135,136 (construct_from_stream): Removed! Job taken over by construct_from_parser. 24a142 (set_input_stream): REmoved. Replaced by construct_from_parser. svn path=/trunk/; revision=2577 --- camel/camel-simple-data-wrapper.c | 174 ++------------------------------------ 1 file changed, 5 insertions(+), 169 deletions(-) (limited to 'camel/camel-simple-data-wrapper.c') diff --git a/camel/camel-simple-data-wrapper.c b/camel/camel-simple-data-wrapper.c index d368a4ddfd..cb387ee04e 100644 --- a/camel/camel-simple-data-wrapper.c +++ b/camel/camel-simple-data-wrapper.c @@ -5,7 +5,6 @@ /* * * Authors: Bertrand Guiheneuf - * Michael Zucchi * * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com) * @@ -45,15 +44,11 @@ static CamelDataWrapperClass *parent_class = NULL; /* Returns the class for a CamelDataWrapper */ #define CSDW_CLASS(so) CAMEL_SIMPLE_DATA_WRAPPER_CLASS (GTK_OBJECT (so)->klass) -static void construct_from_stream (CamelDataWrapper *data_wrapper, - CamelStream *stream); static void write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream); static void finalize (GtkObject *object); static CamelStream * get_output_stream (CamelDataWrapper *data_wrapper); -static void construct_from_parser(CamelDataWrapper *dw, CamelMimeParser *mp); - - +static void construct_from_stream (CamelDataWrapper *dw, CamelStream *stream); static void camel_simple_data_wrapper_class_init (CamelSimpleDataWrapperClass *camel_simple_data_wrapper_class) @@ -68,10 +63,8 @@ camel_simple_data_wrapper_class_init (CamelSimpleDataWrapperClass *camel_simple_ /* virtual method overload */ camel_data_wrapper_class->write_to_stream = write_to_stream; - camel_data_wrapper_class->construct_from_stream = construct_from_stream; camel_data_wrapper_class->get_output_stream = get_output_stream; - - camel_data_wrapper_class->construct_from_parser = construct_from_parser; + camel_data_wrapper_class->construct_from_stream = construct_from_stream; gtk_object_class->finalize = finalize; } @@ -152,38 +145,6 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) parent_class->write_to_stream (data_wrapper, stream); } - -#define CMSDW_TMP_BUF_SIZE 100 -static void -construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) -{ - CamelSimpleDataWrapper *simple_data_wrapper = - CAMEL_SIMPLE_DATA_WRAPPER (data_wrapper); - gint nb_bytes_read; - static gchar *tmp_buf; - GByteArray *array; - - if (!tmp_buf) - tmp_buf = g_new (gchar, CMSDW_TMP_BUF_SIZE); - - array = simple_data_wrapper->byte_array; - if (array) - g_byte_array_free (array, FALSE); - - array = g_byte_array_new (); - simple_data_wrapper->byte_array = array; - nb_bytes_read = camel_stream_read (stream, tmp_buf, CMSDW_TMP_BUF_SIZE); - while (nb_bytes_read > 0) { - if (nb_bytes_read > 0) - g_byte_array_append (array, tmp_buf, nb_bytes_read); - nb_bytes_read = camel_stream_read (stream, tmp_buf, - CMSDW_TMP_BUF_SIZE); - }; -} - - - - /** * camel_simple_data_wrapper_set_text: set some text as data wrapper content * @simple_data_wrapper: SimpleDataWrapper object @@ -225,134 +186,9 @@ get_output_stream (CamelDataWrapper *data_wrapper) return parent_class->get_output_stream (data_wrapper); } -/* simple data wrapper */ static void -construct_from_parser(CamelDataWrapper *dw, CamelMimeParser *mp) +construct_from_stream(CamelDataWrapper *dw, CamelStream *stream) { - GByteArray *buffer; - char *buf; - int len; - off_t start, end; - CamelMimeFilter *fdec = NULL, *fch = NULL; - struct _header_content_type *ct; - int decid=-1, chrid=-1, cache=FALSE; - CamelStream *source; - char *encoding; - - d(printf("constructing simple-data-wrapper\n")); - - /* Ok, try and be smart. If we're storing a small message (typical) convert it, - and store it in memory as we parse it ... if not, throw away the conversion - and scan till the end ... */ - - /* if we can't seek, dont have a stream/etc, then we must cache it */ - source = camel_mime_parser_stream(mp); - gtk_object_ref((GtkObject *)source); - if (source == NULL - || !CAMEL_IS_SEEKABLE_STREAM(source)) - cache = TRUE; - - /* first, work out conversion, if any, required, we dont care about what we dont know about */ - encoding = header_content_encoding_decode(camel_mime_parser_header(mp, "content-transfer-encoding", NULL)); - if (encoding) { - if (!strcasecmp(encoding, "base64")) { - d(printf("Adding base64 decoder ...\n")); - fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_DEC); - decid = camel_mime_parser_filter_add(mp, fdec); - } else if (!strcasecmp(encoding, "quoted-printable")) { - d(printf("Adding quoted-printable decoder ...\n")); - fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_DEC); - decid = camel_mime_parser_filter_add(mp, fdec); - } - g_free(encoding); - } - - /* if we're doing text, then see if we have to convert it to UTF8 as well */ - ct = camel_mime_parser_content_type(mp); - if (header_content_type_is(ct, "text", "*")) { - const char *charset = header_content_type_param(ct, "charset"); - if (charset!=NULL - && !(strcasecmp(charset, "us-ascii")==0 - || strcasecmp(charset, "utf-8")==0)) { - d(printf("Adding conversion filter from %s to utf-8\n", charset)); - fch = (CamelMimeFilter *)camel_mime_filter_charset_new_convert(charset, "utf-8"); - if (fch) { - chrid = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)fch); - } else { - g_warning("Cannot convert '%s' to 'utf-8', message display may be corrupt", charset); - } - } - - } - - buffer = g_byte_array_new(); - - /* write to a memory buffer or something??? */ - start = camel_mime_parser_tell(mp); - while ( camel_mime_parser_step(mp, &buf, &len) != HSCAN_BODY_END ) { - if (buffer) { - if (buffer->len > 20480 && !cache) { - /* is this a 'big' message? Yes? We dont want to convert it all then.*/ - camel_mime_parser_filter_remove(mp, decid); - camel_mime_parser_filter_remove(mp, chrid); - decid = -1; - chrid = -1; - g_byte_array_free(buffer, TRUE); - buffer = NULL; - } else { - g_byte_array_append(buffer, buf, len); - } - } - } - - if (buffer) { - CamelStream *mem; - d(printf("Small message part, kept in memory!\n")); - mem = camel_stream_mem_new_with_byte_array(buffer, CAMEL_STREAM_MEM_READ); - camel_data_wrapper_set_output_stream (dw, mem); - } else { - CamelSeekableSubstream *sub; - CamelStreamFilter *filter; - - d(printf("Big message part, left on disk ...\n")); - - end = camel_mime_parser_tell(mp); - sub = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds ((CamelSeekableStream *)source, start, end); - if (fdec || fch) { - filter = camel_stream_filter_new_with_stream((CamelStream *)sub); - if (fdec) { - camel_mime_filter_reset(fdec); - camel_stream_filter_add(filter, fdec); - } - if (fch) { - camel_mime_filter_reset(fdec); - camel_stream_filter_add(filter, fch); - } - camel_data_wrapper_set_output_stream (dw, (CamelStream *)filter); - } else { - camel_data_wrapper_set_output_stream (dw, (CamelStream *)sub); - } - } - - camel_mime_parser_filter_remove(mp, decid); - camel_mime_parser_filter_remove(mp, chrid); - - if (fdec) - gtk_object_unref((GtkObject *)fdec); - if (fch) - gtk_object_unref((GtkObject *)fch); - gtk_object_unref((GtkObject *)source); - - /* FIXME: lookup in headers for content-type/encoding */ -#if 0 - /* trivial, mem-based ... */ - buffer = g_byte_array_new(); - start = camel_mime_parser_tell(mp); - while ( camel_mime_parser_step(mp, &buf, &len) != HSCAN_BODY_END ) { - g_byte_array_append(buffer, buf, len); - } - end = camel_mime_parser_tell(mp); - mem = camel_stream_mem_new_with_byte_array(buffer, CAMEL_STREAM_MEM_READ); - camel_data_wrapper_set_output_stream (dw, mem); -#endif + camel_data_wrapper_set_output_stream (dw, stream); } + -- cgit v1.2.3