mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 04:18:08 +01:00
minor cleanup to printmimestructure
make the source slightly easier to read. no functional change.
This commit is contained in:
parent
8ca911d13b
commit
0a3dff7b8a
1 changed files with 18 additions and 3 deletions
|
@ -24,7 +24,7 @@ from __future__ import print_function
|
|||
import email
|
||||
import sys
|
||||
|
||||
def test(z, prefix=''):
|
||||
def print_part(z, prefix):
|
||||
fname = '' if z.get_filename() is None else ' [' + z.get_filename() + ']'
|
||||
cset = '' if z.get_charset() is None else ' (' + z.get_charset() + ')'
|
||||
disp = z.get_params(None, header='Content-Disposition')
|
||||
|
@ -35,8 +35,23 @@ def test(z, prefix=''):
|
|||
for d in disp:
|
||||
if d[0] in [ 'attachment', 'inline' ]:
|
||||
disposition = ' ' + d[0]
|
||||
if z.is_multipart():
|
||||
nbytes = len(z.as_string())
|
||||
else:
|
||||
nbytes = len(z.get_payload())
|
||||
|
||||
print('{}{}{}{}{} {:d} bytes'.format(
|
||||
prefix,
|
||||
z.get_content_type(),
|
||||
cset,
|
||||
disposition,
|
||||
fname,
|
||||
nbytes,
|
||||
))
|
||||
|
||||
def test(z, prefix=''):
|
||||
if (z.is_multipart()):
|
||||
print(prefix + '┬╴' + z.get_content_type() + cset + disposition + fname, z.as_string().__len__().__str__() + ' bytes')
|
||||
print_part(z, prefix+'┬╴')
|
||||
if prefix.endswith('└'):
|
||||
prefix = prefix.rpartition('└')[0] + ' '
|
||||
if prefix.endswith('├'):
|
||||
|
@ -49,6 +64,6 @@ def test(z, prefix=''):
|
|||
test(parts[i], prefix + '└')
|
||||
# FIXME: show epilogue?
|
||||
else:
|
||||
print(prefix + '─╴'+ z.get_content_type() + cset + disposition + fname, z.get_payload().__len__().__str__(), 'bytes')
|
||||
print_part(z, prefix+'─╴')
|
||||
|
||||
test(email.message_from_file(sys.stdin), '└')
|
||||
|
|
Loading…
Reference in a new issue