diff --git a/CHANGES.txt b/CHANGES.txt index cff3666..834b3fc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +## Version 4.1.0 du 03/03/2016-11:02 + +4024b2a pyulib/umail: possibilité de spécifier le type de contenu + ## Version 4.0.0 du 01/03/2016-19:08 c46626c ldif: support de dumpcsv et printcsv dans get_transform_cmd() diff --git a/VERSION.txt b/VERSION.txt index fcdb2e1..ee74734 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -4.0.0 +4.1.0 diff --git a/lib/pyulib/src/uapps/umail.py b/lib/pyulib/src/uapps/umail.py index 47ae1bf..310554a 100755 --- a/lib/pyulib/src/uapps/umail.py +++ b/lib/pyulib/src/uapps/umail.py @@ -57,6 +57,7 @@ def run_umail(): ('c:', 'cc=', "Destinataires en copie"), ('b:', 'bcc=', "Destinataires en copie cachée"), ('a:', 'attach=', "Attacher un fichier"), + ('t:', 'content-type=', "Spécifier le type de contenu du fichier"), ('f:', 'body=', "Spécifier un fichier contenant le corps du message"), ]) options, args = get_args(None, options, longoptions) @@ -68,6 +69,7 @@ def run_umail(): body = None bodyfile = None afiles = [] + amimetypes = [] for option, value in options: if option in ('-h', '--help'): display_help() @@ -80,6 +82,8 @@ def run_umail(): mbccs.extend(value.split(',')) elif option in ('-a', '--attach'): afiles.append(value) + elif option in ('-t', '--content-type'): + amimetypes.append(value) elif option in ('-f', '--body'): bodyfile = value if bodyfile == "-": @@ -117,9 +121,14 @@ def run_umail(): body = MIMEText('\n'.join(lines), 'plain') body.set_charset('utf-8') msg.attach(body) + i = 0 for afile in afiles: if not path.isfile(afile): die("%s: Fichier introuvable" % afile) - mimetype, encoding = mimetypes.guess_type(afile) + mimetype = amimetypes[i:i + 1] and amimetypes[i] or None + encoding = None + i += 1 + if mimetype is None: + mimetype, encoding = mimetypes.guess_type(afile) if mimetype is None or encoding is not None: mimetype = 'application/octet-stream' maintype, subtype = mimetype.split('/', 1)