mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-09 22:38:19 +02:00
Code Activity

Merge pull request #273 from martinmanzo/master

Browse source 
Close attachments
This commit is contained in:
Pietro 2023-12-23 21:01:28 +01:00 • committed by GitHub
commit dd37322a61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -14,3 +14,4 @@ dummy_project/*
messages messages
*.sqlite3 *.sqlite3
.idea/ .idea/
venv/

36
django_mailbox/models.py
View file

@ -688,7 +688,6 @@ class Message(models.Model):
def _rehydrate(self, msg): def _rehydrate(self, msg):
new = EmailMessage() new = EmailMessage()
settings = utils.get_settings() settings = utils.get_settings()
if msg.is_multipart(): if msg.is_multipart():
for header, value in msg.items(): for header, value in msg.items():
new[header] = value new[header] = value
@ -707,24 +706,24 @@ class Message(models.Model):
if encoding and encoding.lower() == 'quoted-printable': if encoding and encoding.lower() == 'quoted-printable':
# Cannot use `email.encoders.encode_quopri due to # Cannot use `email.encoders.encode_quopri due to
# bug 14360: http://bugs.python.org/issue14360 # bug 14360: http://bugs.python.org/issue14360
output = BytesIO() with open(attachment.document.path, 'rb') as f:
encode_quopri( output = BytesIO()
BytesIO( encode_quopri(
attachment.document.read() BytesIO(
), f.read()
output, ),
quotetabs=True, output,
header=False, quotetabs=True,
) header=False,
new.set_payload( )
output.getvalue().decode().replace(' ', '=20') new.set_payload(
) output.getvalue().decode().replace(' ', '=20')
)
del new['Content-Transfer-Encoding'] del new['Content-Transfer-Encoding']
new['Content-Transfer-Encoding'] = 'quoted-printable' new['Content-Transfer-Encoding'] = 'quoted-printable'
else: else:
new.set_payload( with open(attachment.document.path, 'rb') as f:
attachment.document.read() new.set_payload(f.read())
)
del new['Content-Transfer-Encoding'] del new['Content-Transfer-Encoding']
encode_base64(new) encode_base64(new)
except MessageAttachment.DoesNotExist: except MessageAttachment.DoesNotExist:
@ -788,9 +787,8 @@ class Message(models.Model):
if self.eml.name.endswith('.gz'): if self.eml.name.endswith('.gz'):
body = gzip.GzipFile(fileobj=self.eml).read() body = gzip.GzipFile(fileobj=self.eml).read()
else: else:
self.eml.open() with self.eml.open():
body = self.eml.file.read() body = self.eml.file.read()
self.eml.close()
else: else:
body = self.get_body() body = self.get_body()
flat = email.message_from_bytes(body) flat = email.message_from_bytes(body)