From f389afb2172992e2c8d05c267ded419d1345562c Mon Sep 17 00:00:00 2001 From: Jacob Daniel Bennett Date: Fri, 16 Oct 2020 09:49:13 -0400 Subject: [PATCH] Reply-from-user subject key added to the reply from user dictionary --- api/ECNQueue.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/api/ECNQueue.py b/api/ECNQueue.py index e5afa24..51a8139 100644 --- a/api/ECNQueue.py +++ b/api/ECNQueue.py @@ -617,6 +617,7 @@ def __userReplyParsing(self, replyContent: list, lineNumber: int) -> dict: replyFromInfo["type"] = "reply_from_user" + replyFromHeaders = [] newLineCounter = 0 endingDelimiterCount = 0 @@ -644,6 +645,18 @@ def __userReplyParsing(self, replyContent: list, lineNumber: int) -> dict: replyFromInfo["from_name"] = emailList[0][0] replyFromInfo["from_email"] = emailList[0][1] + linesToRemove.append(lineNum) + elif line.startswith("Subject: ") and newLineCounter == 1: + # Matches everything after "Subject: " + try: + subjectStr = (re.search("(?<=Subject: )(.*)", line)).group() + except: + errorMessage = "Expeted syntax of \"Subject: [subject]\"" + return self.__errorParsing(line, lineNumber + lineNum + 1, errorMessage) + + # Formatts the date to UTC + replyFromInfo["subject"] = subjectStr + linesToRemove.append(lineNum) elif line.startswith("Date: ") and newLineCounter == 1: @@ -938,10 +951,4 @@ def getQueues() -> list: if isDirectory and isValid: queues.append(Queue(file)) - return queues -if __name__ == "__main__": - item = Item("ce", 100) - print() -# for queue in getQueues(): -# for item in queue.items: -# print(f"${item.queue} ${item.number}") \ No newline at end of file + return queues \ No newline at end of file