From 2d864007ca1667ca869b8a8afab045416deef35e Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 9 Nov 2019 20:38:28 +0000 Subject: [PATCH] Try to split text from image data --- daemon.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/daemon.py b/daemon.py index e0126004f..05baf42b2 100644 --- a/daemon.py +++ b/daemon.py @@ -2655,9 +2655,16 @@ class PubServer(BaseHTTPRequestHandler): # email style encoding message/rfc822 print('messageFields1: '+str(msg.get_payload(decode=False))) print('messageFields2: '+str(msg.get_payload(decode=True))) - messageFields=msg.get_payload(decode=True).decode('utf-8').split(boundary) - print('messageFields3') - print('messageFields4: '+str(messageFields)) + imageBoundary="Content-Disposition: form-data" + if imageBoundary in str(msg.get_payload(decode=True)): + msg=msg.get_payload(decode=True).split(imageBoundary,1)[0] + print('messageFields3.1') + messageFields=msg.decode('utf-8').split(boundary) + print('messageFields3.2') + else: + messageFields=msg.get_payload(decode=True).decode('utf-8').split(boundary) + print('messageFields4') + print('messageFields5: '+str(messageFields)) fields={} filename=None attachmentMediaType=None