sjs/imapbackup
1
0
Fork 0
mirror of https://github.com/samsonjs/imapbackup.git synced 2026-03-25 08:45:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #40 from samsonjs/fix/mbox-from-quoting

Browse source 
Perform >From quoting as described by RFC 4155 (closes #37)
This commit is contained in:
Rui Carmo 2022-01-08 10:59:14 +00:00 committed by GitHub
commit 7cccc9d92d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
imapbackup.py
View file

@ -167,6 +167,7 @@ def download_messages(server, filename, messages, config):
spinner = Spinner("Downloading %s new messages to %s" % (len(messages), filename),
config['nospinner'])
total = biggest = 0
from_re = re.compile("\n(>*)From ")
# each new message
for msg_id in messages.keys():
@ -190,6 +191,11 @@ def download_messages(server, filename, messages, config):
# This avoids Thunderbird mistaking a line starting "From " as the start
# of a new message. _Might_ also apply to other mail lients - unknown
text = text.replace("\nFrom ", "\n From ")
else:
# Perform >From quoting as described by RFC 4155 and the qmail docs.
# https://www.rfc-editor.org/rfc/rfc4155.txt
# http://qmail.org/qmail-manual-html/man5/mbox.html
text = from_re.sub("\n>\\1From ", text)
mbox.write(text)
mbox.write('\n\n')

6
imapbackup38.py
View file

@ -155,6 +155,7 @@ def download_messages(server, filename, messages, overwrite, nospinner, thunderb
spinner = Spinner("Downloading %s new messages to %s" % (len(messages), filename),
nospinner)
total = biggest = 0
from_re = re.compile(b"\n(>*)From ")
# each new message
for msg_id in messages.keys():
@ -183,6 +184,11 @@ def download_messages(server, filename, messages, overwrite, nospinner, thunderb
# This avoids Thunderbird mistaking a line starting "From " as the start
# of a new message. _Might_ also apply to other mail lients - unknown
text_bytes = text_bytes.replace(b"\nFrom ", b"\n From ")
else:
# Perform >From quoting as described by RFC 4155 and the qmail docs.
# https://www.rfc-editor.org/rfc/rfc4155.txt
# http://qmail.org/qmail-manual-html/man5/mbox.html
text_bytes = from_re.sub(b"\n>\\1From ", text_bytes)
mbox.write(text_bytes)
mbox.write(b'\n\n')