X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-formatter.c;h=7925aa482fcc936603ae584d6142778302d5c331;hp=5392b062486d9c3890f2cfdb5b458e2fd8a5120f;hb=HEAD;hpb=0a600fce312da2fafdbe63d2c60b428fac0df208

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 5392b06..7925aa4 100644
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -36,9 +36,12 @@
 #include "modest-formatter.h"
 #include "modest-text-utils.h"
 #include "modest-tny-platform-factory.h"
-#include <modest-runtime.h>
+#include "modest-runtime.h"
+#include "modest-stream-html-to-text.h"
 
-#define MAX_BODY_LENGTH 4096
+#define LINE_WRAP 78
+#define MAX_BODY_LINES 1024
+#define MAX_BODY_LENGTH 1024*128
 
 typedef struct _ModestFormatterPrivate ModestFormatterPrivate;
 struct _ModestFormatterPrivate {
@@ -70,41 +73,90 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
 {
 	TnyStream *mp_stream;
 	TnyStream *stream;
+	TnyStream *input_stream;
 	GtkTextBuffer *buf;
 	GtkTextIter start, end;
-	gchar *text, *converted_text;
+	gchar *text;
 	ModestFormatterPrivate *priv;
-	gint total;
+	gint total, lines, total_lines, line_chars;
+	gboolean is_html, first_time;
+	gboolean forced_wrap;
 
 	buf = gtk_text_buffer_new (NULL);
 	stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf));
 	tny_stream_reset (stream);
 	mp_stream = tny_mime_part_get_decoded_stream (body);
 
+	is_html = (g_strcmp0 (tny_mime_part_get_content_type (body), "text/html") == 0);
+	if (is_html) {
+		input_stream = modest_stream_html_to_text_new (mp_stream);
+	} else {
+		input_stream = g_object_ref (mp_stream);
+	}
+
 	total = 0;
+	total_lines = 0;
+	line_chars = 0;
+	lines = 0;
 
-	while (!tny_stream_is_eos (mp_stream)) {
+	forced_wrap = FALSE;
+	first_time = TRUE;
+	while (!tny_stream_is_eos (input_stream)) {
 		gchar buffer [128];
+		gchar *offset;
 		gint n_read;
 		gint next_read;
 
 		next_read = MIN (128, MAX_BODY_LENGTH - total);
 		if (next_read == 0)
 			break;
-		n_read = tny_stream_read (mp_stream, buffer, next_read);
-		if (n_read > 0) {
-			gint n_write;
-			n_write = tny_stream_write (stream, buffer, n_read);
+		n_read = tny_stream_read (input_stream, buffer, next_read);
+
+		if (G_UNLIKELY (n_read < 0))
+			break;
+
+		offset = buffer;
+		while (offset < buffer + n_read) {
+
+			if (*offset == '\n' && !(forced_wrap && offset[1] == '\n')) {
+				total_lines ++;
+				line_chars = 0;
+			} else {
+				if (*offset == '\n') {
+					forced_wrap = FALSE;
+				}
+				line_chars ++;
+				if (line_chars >= LINE_WRAP) {
+					total_lines ++;
+					line_chars = 0;
+					forced_wrap = TRUE;
+				}
+			}
+			if (total_lines >= MAX_BODY_LINES)
+				break;
+			offset++;
+		}
+
+		if (offset - buffer > 0) {
+			gint n_write = 0, to_write = 0;
+
+			to_write = offset - buffer;
+			n_write = tny_stream_write (stream, buffer, to_write);
 			total += n_write;
 		} else if (n_read == -1) {
 			break;
 		}
+
+		if (total_lines >= MAX_BODY_LINES)
+			break;
 	}
 
 	tny_stream_reset (stream);
 
 	g_object_unref (G_OBJECT(stream));
-	
+	g_object_unref (G_OBJECT (mp_stream));
+	g_object_unref (G_OBJECT (input_stream));
+
 	gtk_text_buffer_get_bounds (buf, &start, &end);
 	text = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
 	g_object_unref (G_OBJECT(buf));
@@ -112,15 +164,6 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
 	/* Convert to desired content type if needed */
 	priv = MODEST_FORMATTER_GET_PRIVATE (self);
 
-	if (strcmp (tny_mime_part_get_content_type (body), priv->content_type) == 0) {
-		if (!strcmp (priv->content_type, "text/html"))
-			converted_text = modest_text_utils_convert_to_html  (text);
-		else
-			converted_text = g_strdup (text);
-
-		g_free (text);
-		text = converted_text;
-	}
 	return text;
 }
 
@@ -170,7 +213,7 @@ modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header
 	priv = MODEST_FORMATTER_GET_PRIVATE (self);
 	construct_from_text (TNY_MIME_PART (body_part), (const gchar*) txt, priv->content_type);
 	g_object_unref (body_part);
-	
+
 	/* Clean */
 	g_free (body_text);
 	g_free (txt);
@@ -384,7 +427,7 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
 					  from,
 					  tny_header_get_date_sent (header),
 					  filenames,
-					  80);
+					  72);
 	g_free (from);
 
 	g_list_foreach (filenames, (GFunc) g_free, NULL);
@@ -445,7 +488,7 @@ find_body_parent (TnyMimePart *part)
 	msg_content_type = tny_mime_part_get_content_type (part);
 
 	if ((msg_content_type != NULL) &&
-	    (!g_strcasecmp (msg_content_type, "multipart/alternative")))
+	    (!g_ascii_strcasecmp (msg_content_type, "multipart/alternative")))
 		return g_object_ref (part);
 	else if ((msg_content_type != NULL) &&
 		 (g_str_has_prefix (msg_content_type, "multipart/"))) {
@@ -458,10 +501,10 @@ find_body_parent (TnyMimePart *part)
 
 		while (!tny_iterator_is_done (iter)) {
 			TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
-			if (part && !g_strcasecmp(tny_mime_part_get_content_type (part), "multipart/alternative")) {
+			if (part && !g_ascii_strcasecmp(tny_mime_part_get_content_type (part), "multipart/alternative")) {
 				alternative_part = part;
 				break;
-			} else if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
+			} else if (part && !g_ascii_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
 				related_part = part;
 				break;
 			}