Merge pull request #289 from shalin24999/master

Update msg parser

Author: frikky

email/1.2.0/requirements.txt

@@ -1,8 +1,8 @@
 requests==2.25.1
 glom==20.11.0
-requests==2.25.1
 eml-parser==1.17.0
 msg-parser==1.2.0
 mail-parser==3.15.0
-extract-msg==0.23.1
+extract-msg==0.30.9
 jsonpickle==2.0.0
+

email/1.2.0/src/app.py

@@ -7,7 +7,6 @@
 import base64
 import imaplib
 import smtplib
-import eml_parser
 import time
 import random
 import eml_parser
@@ -398,11 +397,25 @@ def parse_email_file(self, file_id, file_extension):
         elif file_extension.lower() == 'msg':
             print('working with .msg file')
             try:
+                result = {}
                 msg = MsOxMessage(file_path['data'])
                 msg_properties_dict = msg.get_properties()
-                print(msg_properties_dict)
-                frozen = jsonpickle.encode(msg_properties_dict)
-                return frozen
+                frozen = jsonpickle.encode(msg_properties_dict, unpicklable = False)
+                json_response = json.loads(frozen)
+                if json_response.get("attachments"):
+                    for i in json_response["attachments"]:
+                        if isinstance(i,dict):
+                            if i.get('data') and 'text' in i.get('AttachMimeTag'):
+                                value = i.get('data').get('py/b64')
+                                i['data']['content'] = base64.b64decode(value).decode()
+                result['attachments'] = json_response['attachments']
+                ep = eml_parser.EmlParser()
+                temp = ep.decode_email_bytes(bytes(msg.get_email_mime_content(),'utf-8'))
+                result['body'] = temp['body']
+                msg1 = extract_msg.openMsg(file_path['data'])
+                result["header"] = dict(msg1.header.items())
+                result['body_data'] = msg.body
+                return result
             except Exception as e:
                 return {"Success":"False","Message":f"Exception occured: {e}"}    
         else: