parse attachments' name and filename

glacjay · glacjay · commit 596edc538549 · 2015-07-10T09:56:48.000+08:00
diff --git a/Net/src/MailMessage.cpp b/Net/src/MailMessage.cpp
@@ -98,28 +98,27 @@ namespace
 				NameValueCollection::ConstIterator end = header.end();
 				PartSource* pPS = _pMsg->createPartStore(tmp, 
 					header[MailMessage::HEADER_CONTENT_TYPE], 
-					getFileNameFromDisp(it->second));
+					getAttrFromHeader(header[MailMessage::HEADER_CONTENT_DISPOSITION], "filename"));
 				poco_check_ptr (pPS);
 				for (; it != end; ++it)
 				{
 					if (MailMessage::HEADER_CONTENT_DISPOSITION == it->first)
 					{
 						if (it->second == "inline") _pMsg->addContent(pPS, cte);
-						else _pMsg->addAttachment("", pPS, cte);
+						else _pMsg->addAttachment(getAttrFromHeader(header[MailMessage::HEADER_CONTENT_TYPE], "name"), pPS, cte);
 					}
-					
 					pPS->headers().set(it->first, it->second);
 				}
 			}
 		}
 		
 	private:
-		std::string getFileNameFromDisp(const std::string& str)
+		std::string getAttrFromHeader(const std::string& str, const std::string& attrName)
 		{
 			StringTokenizer st(str, ";=", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
 			StringTokenizer::Iterator it = st.begin();
 			StringTokenizer::Iterator end = st.end();
-			for (; it != end; ++it) { if (*it == "filename") break; }
+			for (; it != end; ++it) { if (*it == attrName) break; }
 			if (it != end)
 			{
 				++it;

Original file line number	Diff line number	Diff line change
`@@ -98,28 +98,27 @@ namespace`
`98`	`98`	`NameValueCollection::ConstIterator end = header.end();`
`99`	`99`	`PartSource* pPS = _pMsg->createPartStore(tmp,`
`100`	`100`	`header[MailMessage::HEADER_CONTENT_TYPE],`
`101`		`- getFileNameFromDisp(it->second));`
	`101`	`+ getAttrFromHeader(header[MailMessage::HEADER_CONTENT_DISPOSITION], "filename"));`
`102`	`102`	`poco_check_ptr (pPS);`
`103`	`103`	`for (; it != end; ++it)`
`104`	`104`	`{`
`105`	`105`	`if (MailMessage::HEADER_CONTENT_DISPOSITION == it->first)`
`106`	`106`	`{`
`107`	`107`	`if (it->second == "inline") _pMsg->addContent(pPS, cte);`
`108`		`- else _pMsg->addAttachment("", pPS, cte);`
	`108`	`+ else _pMsg->addAttachment(getAttrFromHeader(header[MailMessage::HEADER_CONTENT_TYPE], "name"), pPS, cte);`
`109`	`109`	`}`
`110`		`-`
`111`	`110`	`pPS->headers().set(it->first, it->second);`
`112`	`111`	`}`
`113`	`112`	`}`
`114`	`113`	`}`
`115`	`114`
`116`	`115`	`private:`
`117`		`- std::string getFileNameFromDisp(const std::string& str)`
	`116`	`+ std::string getAttrFromHeader(const std::string& str, const std::string& attrName)`
`118`	`117`	`{`
`119`	`118`	`StringTokenizer st(str, ";=", StringTokenizer::TOK_IGNORE_EMPTY \| StringTokenizer::TOK_TRIM);`
`120`	`119`	`StringTokenizer::Iterator it = st.begin();`
`121`	`120`	`StringTokenizer::Iterator end = st.end();`
`122`		`- for (; it != end; ++it) { if (*it == "filename") break; }`
	`121`	`+ for (; it != end; ++it) { if (*it == attrName) break; }`
`123`	`122`	`if (it != end)`
`124`	`123`	`{`
`125`	`124`	`++it;`