#include <tny-header.h>
#include <tny-simple-list.h>
#include <tny-gtk-text-buffer-stream.h>
-#include <tny-camel-stream.h>
-#include <camel/camel-stream-mem.h>
+#include <tny-camel-mem-stream.h>
#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 LINE_WRAP 78
+#define MAX_BODY_LINES 1024
+#define MAX_BODY_LENGTH 1024*128
typedef struct _ModestFormatterPrivate ModestFormatterPrivate;
struct _ModestFormatterPrivate {
static gchar *
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, 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);
- tny_mime_part_decode_to_stream (body, stream, NULL);
+ 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;
+
+ 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 (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));
/* 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;
}
TnyStream *text_body_stream;
/* Create the stream */
- text_body_stream = TNY_STREAM (tny_camel_stream_new
- (camel_stream_mem_new_with_buffer
- (text, strlen(text))));
+ text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+ (text, strlen(text)));
/* Construct MIME part */
tny_stream_reset (text_body_stream);
- tny_mime_part_construct_from_stream (part, text_body_stream, content_type);
+ tny_mime_part_construct (part, text_body_stream, content_type, "7bit");
tny_stream_reset (text_body_stream);
/* Clean */
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);
TnyMsg *new_msg = NULL;
TnyMimePart *body_part = NULL;
ModestFormatterPrivate *priv;
+ gchar *txt;
/* Build new part */
new_msg = modest_formatter_create_message (self, TRUE, TRUE, FALSE);
/* Create the two parts */
priv = MODEST_FORMATTER_GET_PRIVATE (self);
- construct_from_text (body_part, "", priv->content_type);
+ txt = modest_text_utils_cite ("", priv->content_type, priv->signature,
+ NULL, tny_header_get_date_sent (header));
+ construct_from_text (body_part, txt, priv->content_type);
+ g_free (txt);
g_object_unref (body_part);
- /* Add parts */
- tny_mime_part_add_part (TNY_MIME_PART (new_msg), TNY_MIME_PART (msg));
+ if (msg) {
+ /* Add parts */
+ tny_mime_part_add_part (TNY_MIME_PART (new_msg), TNY_MIME_PART (msg));
+ }
return new_msg;
}
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
priv->content_type = NULL;
+ priv->signature = NULL;
}
static void
modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header,
GList *attachments)
{
+ gchar *result, *from;
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
- return modest_text_utils_cite (text,
- priv->content_type,
- priv->signature,
- tny_header_get_from (header),
- tny_header_get_date_sent (header));
+ from = tny_header_dup_from (header);
+ result = modest_text_utils_cite (text,
+ priv->content_type,
+ priv->signature,
+ from,
+ tny_header_get_date_sent (header));
+ g_free (from);
+ return result;
}
static gchar *
modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header,
GList *attachments)
{
+ gchar *result, *from, *to, *subject;
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
- return modest_text_utils_inline (text,
- priv->content_type,
- priv->signature,
- tny_header_get_from (header),
- tny_header_get_date_sent (header),
- tny_header_get_to (header),
- tny_header_get_subject (header));
+ from = tny_header_dup_from (header);
+ to = tny_header_dup_to (header);
+ subject = tny_header_dup_subject (header);
+ result = modest_text_utils_inline (text,
+ priv->content_type,
+ priv->signature,
+ from,
+ tny_header_get_date_sent (header),
+ to,
+ subject);
+ g_free (subject);
+ g_free (to);
+ g_free (from);
+ return result;
}
static gchar *
GList *filenames = NULL;
GList *node = NULL;
gchar *result = NULL;
-
+ gchar *from;
+
/* First we need a GList of attachments filenames */
for (node = attachments; node != NULL; node = g_list_next (node)) {
TnyMimePart *part = (TnyMimePart *) node->data;
gchar *filename = NULL;
if (TNY_IS_MSG (part)) {
TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
- filename = g_strdup (tny_header_get_subject (header));
+ filename = tny_header_dup_subject (header);
if ((filename == NULL)||(filename[0] == '\0')) {
g_free (filename);
filename = g_strdup (_("mail_va_no_subject"));
g_object_unref (header);
} else {
filename = g_strdup (tny_mime_part_get_filename (part));
- if ((filename == NULL)||(filename[0] == '\0'))
+ if ((filename == NULL)||(filename[0] == '\0')) {
+ g_free (filename);
filename = g_strdup ("");
+ }
}
- filenames = g_list_append (filenames, filename);
+ filenames = g_list_prepend (filenames, filename);
}
- filenames = g_list_reverse (filenames);
/* TODO: get 80 from the configuration */
+ from = tny_header_dup_from (header);
result = modest_text_utils_quote (text,
priv->content_type,
priv->signature,
- tny_header_get_from (header),
+ from,
tny_header_get_date_sent (header),
filenames,
- 80);
+ 72);
+ g_free (from);
g_list_foreach (filenames, (GFunc) g_free, NULL);
g_list_free (filenames);
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/"))) {
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;
}
projects / modest / blobdiff