vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[fix] image parsing in email

Browse source
This commit is contained in:
Rushabh Mehta 2016-03-08 11:30:40 +05:30
parent bb827d799f
commit 3248bdb1dd
3 changed files with 5940 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/email/doctype/email_account/email_account.py
View file

@ -8,7 +8,7 @@ import re
import socket
from frappe import _
from frappe.model.document import Document
from frappe.utils import validate_email_add, cint, get_datetime, DATE_FORMAT, strip, comma_or
from frappe.utils import validate_email_add, cint, get_datetime, DATE_FORMAT, strip, comma_or, sanitize_html
from frappe.utils.user import is_system_user
from frappe.utils.jinja import render_template
from frappe.email.smtp import SMTPServer
@ -222,16 +222,19 @@ class EmailAccount(Document):
communication._attachments = email.save_attachments_in_doc(communication)
# replace inline images
dirty = False
for file in communication._attachments:
if file.name in email.cid_map and email.cid_map[file.name]:
dirty = True
communication.content = communication.content.replace("cid:{0}".format(email.cid_map[file.name]),
email.content = email.content.replace("cid:{0}".format(email.cid_map[file.name]),
file.file_url)
if dirty:
# not sure if using save() will trigger anything
communication.db_set("content", communication.content)
communication.db_set("content", sanitize_html(email.content))
# notify all participants of this thread
if self.enable_auto_reply and getattr(communication, "is_first", False):

5923
frappe/tests/data/email_with_image.txt Normal file
View file

File diff suppressed because it is too large Load diff

11
frappe/tests/test_email.py
View file

@ -84,6 +84,17 @@ class TestEmail(unittest.TestCase):
reference_doctype = "User", reference_name="Administrator",
subject='Testing Bulk', message='This is a bulk mail!')
def test_image_parsing(self):
import re
email_account = frappe.get_doc('Email Account', '_Test Email Account 1')
with open(frappe.get_app_path('frappe', 'tests', 'data', 'email_with_image.txt'), 'r') as raw:
communication = email_account.insert_communication(raw.read())
#print communication.content
self.assertTrue(re.search('''<img[^>]*src=["']/private/files/rtco1.png[^>]*>''', communication.content))
self.assertTrue(re.search('''<img[^>]*src=["']/private/files/rtco2.png[^>]*>''', communication.content))
if __name__=='__main__':
frappe.connect()