diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2013-04-03 09:34:40 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2013-04-03 09:34:40 +0000 |
commit | 541afd326f6bd4f0a130e9fdce9a82b7350d37dc (patch) | |
tree | abb574a55cb40014feaf9f465f18175ad7fa54ed /libsylph | |
parent | ee249804d592b44897008e17b3108ba9a2c1325d (diff) |
added the feature to save message as plain text (locale or UTF-8 encoding).
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3245 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'libsylph')
-rw-r--r-- | libsylph/libsylph-0.def | 2 | ||||
-rw-r--r-- | libsylph/procmsg.c | 196 | ||||
-rw-r--r-- | libsylph/procmsg.h | 7 | ||||
-rw-r--r-- | libsylph/utils.c | 31 | ||||
-rw-r--r-- | libsylph/utils.h | 6 |
5 files changed, 194 insertions, 48 deletions
diff --git a/libsylph/libsylph-0.def b/libsylph/libsylph-0.def index 325ecac4..7bcf893d 100644 --- a/libsylph/libsylph-0.def +++ b/libsylph/libsylph-0.def @@ -708,3 +708,5 @@ EXPORTS folder_get_ui_func2 @ 706
folder_call_ui_func2 @ 707
export_msgs_to_mbox @ 708
+ copy_file_stream @ 709
+ procmsg_save_message_as_text @ 710
diff --git a/libsylph/procmsg.c b/libsylph/procmsg.c index 525f9b47..d833c177 100644 --- a/libsylph/procmsg.c +++ b/libsylph/procmsg.c @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2011 Hiroyuki Yamamoto + * Copyright (C) 1999-2013 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1725,13 +1725,74 @@ static gint print_command_exec(const gchar *file, const gchar *cmdline) return 0; } +static void procmsg_write_headers(MsgInfo *msginfo, MimeInfo *partinfo, + FILE *fp, FILE *dest_fp, + const gchar *encoding, gboolean all_headers) +{ + GPtrArray *headers; + gint i; + + if (all_headers) + headers = procheader_get_header_array_asis(fp, NULL); + else + headers = procheader_get_header_array_for_display(fp, NULL); + + for (i = 0; i < headers->len; i++) { + Header *hdr; + gchar *file_str; + const gchar *body; + + hdr = g_ptr_array_index(headers, i); + + if (partinfo) { + if (!g_ascii_strcasecmp(hdr->name, "Subject") || + !g_ascii_strcasecmp(hdr->name, "From") || + !g_ascii_strcasecmp(hdr->name, "To") || + !g_ascii_strcasecmp(hdr->name, "Cc")) { + unfold_line(hdr->body); + } + + body = hdr->body; + while (g_ascii_isspace(*body)) + body++; + } else { + if (!g_ascii_strcasecmp(hdr->name, "Subject")) + body = msginfo->subject; + else if (!g_ascii_strcasecmp(hdr->name, "From")) + body = msginfo->from; + else if (!g_ascii_strcasecmp(hdr->name, "To")) + body = msginfo->to; + else if (!g_ascii_strcasecmp(hdr->name, "Cc")) { + unfold_line(hdr->body); + body = hdr->body; + while (g_ascii_isspace(*body)) + body++; + } else { + body = hdr->body; + while (g_ascii_isspace(*body)) + body++; + } + } + + if (body && *body != '\0') { + file_str = conv_codeset_strdup + (body, CS_INTERNAL, encoding); + fprintf(dest_fp, "%s: %s\n", hdr->name, + file_str ? file_str : body); + g_free(file_str); + } else { + fprintf(dest_fp, "%s: (none)\n", hdr->name); + } + } + + procheader_header_array_destroy(headers); +} + void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline, gboolean all_headers) { gchar *prtmp; FILE *msgfp, *tmpfp, *prfp; - GPtrArray *headers; - gint i; gchar buf[BUFFSIZE]; g_return_if_fail(msginfo != NULL); @@ -1760,51 +1821,11 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline, return; } - if (all_headers) - headers = procheader_get_header_array_asis(msgfp, NULL); - else - headers = procheader_get_header_array_for_display(msgfp, NULL); + procmsg_write_headers(msginfo, NULL, msgfp, prfp, + conv_get_locale_charset_str(), all_headers); fclose(msgfp); - for (i = 0; i < headers->len; i++) { - Header *hdr; - gchar *locale_str; - const gchar *body; - - hdr = g_ptr_array_index(headers, i); - - if (!g_ascii_strcasecmp(hdr->name, "Subject")) - body = msginfo->subject; - else if (!g_ascii_strcasecmp(hdr->name, "From")) - body = msginfo->from; - else if (!g_ascii_strcasecmp(hdr->name, "To")) - body = msginfo->to; - else if (!g_ascii_strcasecmp(hdr->name, "Cc")) { - unfold_line(hdr->body); - body = hdr->body; - while (g_ascii_isspace(*body)) - body++; - } else { - body = hdr->body; - while (g_ascii_isspace(*body)) - body++; - } - - if (body && *body != '\0') { - locale_str = conv_codeset_strdup - (body, CS_INTERNAL, - conv_get_locale_charset_str()); - fprintf(prfp, "%s: %s\n", hdr->name, - locale_str ? locale_str : body); - g_free(locale_str); - } else { - fprintf(prfp, "%s: (none)\n", hdr->name); - } - } - - procheader_header_array_destroy(headers); - fputc('\n', prfp); while (fgets(buf, sizeof(buf), tmpfp) != NULL) @@ -1857,6 +1878,91 @@ void procmsg_print_message_part(MsgInfo *msginfo, MimeInfo *partinfo, g_free(prtmp); } +gint procmsg_save_message_as_text(MsgInfo *msginfo, const gchar *dest, + const gchar *encoding, gboolean all_headers) +{ + MimeInfo *mimeinfo, *partinfo; + FILE *fp; + FILE *tmpfp; + FILE *destfp; + gchar buf[BUFFSIZE]; + + g_return_val_if_fail(msginfo != NULL, -1); + g_return_val_if_fail(dest != NULL, -1); + + mimeinfo = procmime_scan_message(msginfo); + if (!mimeinfo) + return -1; + if ((fp = procmsg_open_message(msginfo)) == NULL) { + procmime_mimeinfo_free_all(mimeinfo); + return -1; + } + if ((destfp = g_fopen(dest, "wb")) == NULL) { + fclose(fp); + procmime_mimeinfo_free_all(mimeinfo); + return -1; + } + procmsg_write_headers(msginfo, mimeinfo, fp, destfp, encoding, all_headers); + fputc('\n', destfp); + + partinfo = mimeinfo; + + while (partinfo != NULL) { + if (fseek(fp, partinfo->fpos, SEEK_SET) < 0) + break; + + if (partinfo->filename || partinfo->name) + g_snprintf(buf, sizeof(buf), "\n[%s %s (%s)]\n", + partinfo->filename ? partinfo->filename : + partinfo->name, + partinfo->content_type, + to_human_readable(partinfo->content_size)); + else + g_snprintf(buf, sizeof(buf), "\n[%s (%s)]\n", + partinfo->content_type, + to_human_readable(partinfo->content_size)); + + if (partinfo->mime_type == MIME_TEXT || + partinfo->mime_type == MIME_TEXT_HTML) { + if (!partinfo->main && + partinfo->parent && + partinfo->parent->children != partinfo) { + fputs(buf, destfp); + } + + if ((tmpfp = procmime_get_text_content(partinfo, fp, encoding)) == NULL) + break; + if (copy_file_stream(tmpfp, destfp) < 0) { + fclose(tmpfp); + break; + } + + fclose(tmpfp); + } else if (partinfo->mime_type == MIME_MESSAGE_RFC822) { + fputs(buf, destfp); + while (fgets(buf, sizeof(buf), fp) != NULL) + if (buf[0] == '\r' || buf[0] == '\n') break; + procmsg_write_headers(msginfo, partinfo, fp, destfp, encoding, all_headers); + fputc('\n', destfp); + } else if (partinfo->mime_type != MIME_MULTIPART) { + fputs(buf, destfp); + } + + if (partinfo->parent && partinfo->parent->content_type && + !g_ascii_strcasecmp(partinfo->parent->content_type, + "multipart/alternative")) + partinfo = partinfo->parent->next; + else + partinfo = procmime_mimeinfo_next(partinfo); + } + + fclose(destfp); + fclose(fp); + procmime_mimeinfo_free_all(mimeinfo); + + return 0; +} + /** * procmsg_concat_partial_messages: * @mlist: list of MsgInfo* including message/partial messages. diff --git a/libsylph/procmsg.h b/libsylph/procmsg.h index 1130c7cb..92a6be8b 100644 --- a/libsylph/procmsg.h +++ b/libsylph/procmsg.h @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2011 Hiroyuki Yamamoto + * Copyright (C) 1999-2013 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -329,6 +329,11 @@ void procmsg_print_message_part (MsgInfo *msginfo, const gchar *cmdline, gboolean all_headers); +gint procmsg_save_message_as_text (MsgInfo *msginfo, + const gchar *dest, + const gchar *encoding, + gboolean all_headers); + gint procmsg_concat_partial_messages (GSList *mlist, const gchar *file); diff --git a/libsylph/utils.c b/libsylph/utils.c index f8431a3e..474d96a6 100644 --- a/libsylph/utils.c +++ b/libsylph/utils.c @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2012 Hiroyuki Yamamoto + * Copyright (C) 1999-2013 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3123,6 +3123,35 @@ gint copy_file_part(FILE *fp, off_t offset, size_t length, const gchar *dest) return 0; } +gint copy_file_stream(FILE *fp, FILE *dest_fp) +{ + gint n_read; + gchar buf[BUFFSIZE]; + + g_return_val_if_fail(fp != NULL, -1); + g_return_val_if_fail(dest_fp != NULL, -1); + + while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) { + if (n_read < sizeof(buf) && ferror(fp)) + break; + if (fwrite(buf, n_read, 1, dest_fp) < 1) { + g_warning("copy_file_stream: writing to file failed.\n"); + return -1; + } + } + + if (ferror(fp)) { + perror("fread"); + return -1; + } + if (fflush(dest_fp) == EOF) { + FILE_OP_ERROR("copy_file_stream", "fflush"); + return -1; + } + + return 0; +} + /* convert line endings into CRLF. If the last line doesn't end with * linebreak, add it. */ diff --git a/libsylph/utils.h b/libsylph/utils.h index a67a807a..79ece425 100644 --- a/libsylph/utils.h +++ b/libsylph/utils.h @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2012 Hiroyuki Yamamoto + * Copyright (C) 1999-2013 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -453,6 +453,7 @@ gint copy_dir (const gchar *src, gint move_file (const gchar *src, const gchar *dest, gboolean overwrite); + gint append_file_part (FILE *fp, off_t offset, size_t length, @@ -462,6 +463,9 @@ gint copy_file_part (FILE *fp, size_t length, const gchar *dest); +gint copy_file_stream (FILE *fp, + FILE *dest_fp); + gchar *canonicalize_str (const gchar *str); gint canonicalize_file (const gchar *src, const gchar *dest); |