Changeset c504199e7e127458fff243397776ee854e62b7a3

Timestamp:

09/02/10 20:10:07 (21 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

e7bbf3c6b857df8ad33c4d39396d693b48a48461

Parents:

62231ec0359b34f6a82b6688a7af97f2eb2ede10

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (09/02/10 20:10:07)

Message:

Support multipart entities

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Location:

msg

Files:

• entity.cc (modified) (5 diffs)
• entity.hh (modified) (3 diffs)
• multipart.cc (added)
• multipart.hh (added)

msg/entity.cc

@@ -21 +21 @@
 #include "entity.hh"
 #include "format_violation.hh"
+#include "multipart.hh"
 #include "text_plain.hh"
 
@@ -56 +57 @@
 {
         entity::entity(const entity &ent)
-                : field_content(ent.field_content)
+                : default_ct(ent.default_ct)
+                , field_content(ent.field_content)
                 , body(ent.body)
         {
@@ -70 +72 @@
         }
 
-        entity::entity(std::string msgstr)
+        entity::entity(std::string msgstr,
+                       std::string default_ct)
+                : default_ct(default_ct)
         {
                 parse_headers(msgstr);
@@ -229 +233 @@
         content_type entity::get_content_type() const
         {
-                return content_type(get_field("content-type", false));
+                return content_type(has_field("content-type")
+                                    ? get_field("content-type", false)
+                                    : default_ct);
         }
 
@@ -235 +241 @@
         {
                 boost::shared_ptr<mime_entity> rv;
-                // use text/plain as a fallback for now
-                rv.reset(new text_plain(*this));
+                content_type ct = get_content_type();
+                switch (ct.get_type())
+                {
+                case content_type::MULTIPART:
+                        rv.reset(new multipart(*this));
+                        break;
+                case content_type::TEXT: default:
+                        rv.reset(new text_plain(*this));
+                        break;
+                }
                 return rv;
         }

msg/entity.hh

@@ -39 +39 @@
                 typedef std::list<std::string>::const_iterator field_iterator;
 
-                explicit entity(std::string msgstr);
+                explicit entity(std::string msgstr,
+                                std::string default_ct = 
+                                "text/plain; charset=\"US-ASCII\"");
 
                 virtual ~entity() {}
@@ -59 +61 @@
 
 
-                bool has_field(std::string s) {
+                bool has_field(std::string s) const{
                         boost::to_lower(s);
                         return fields.find(s) != fields.end();
@@ -82 +84 @@
 
         private:
+                std::string default_ct;
                 // this split is to both provide a fast name lookup
                 // and to preserve the field ordering