beenull/simple-login
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

move get_email_name, get_email_part to email_utils

Browse source
This commit is contained in:
Son NK 2019-12-15 11:18:01 +02:00
parent 88cef1b90d
commit 62e0ae27a0
3 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/email_utils.py
View file

@ -134,3 +134,25 @@ def send_by_postfix(to_email, subject, plaintext, html):
def notify_admin(subject, html_content=""):
send_by_postfix(ADMIN_EMAIL, subject, html_content, html_content)
def get_email_name(email_from):
"""parse email from header and return the name part
First Last <ab@cd.com> -> First Last
ab@cd.com -> ""
"""
if "<" in email_from:
return email_from[: email_from.find("<")].strip()
return ""
def get_email_part(email_from):
"""parse email from header and return the email part
First Last <ab@cd.com> -> ab@cd.com
ab@cd.com -> ""
"""
if "<" in email_from:
return email_from[email_from.find("<") + 1 : email_from.find(">")].strip()
return email_from

23
email_handler.py
View file

@ -39,6 +39,7 @@ from smtplib import SMTP
from aiosmtpd.controller import Controller
from app.config import EMAIL_DOMAIN, POSTFIX_SERVER, URL
from app.email_utils import get_email_name, get_email_part
from app.extensions import db
from app.log import LOG
from app.models import GenEmail, ForwardEmail, ForwardEmailLog
@ -257,28 +258,6 @@ def add_or_replace_header(msg: EmailMessage, header: str, value: str):
msg.replace_header(header, value)
def get_email_name(email_from):
"""parse email from header and return the name part
First Last <ab@cd.com> -> First Last
ab@cd.com -> ""
"""
if "<" in email_from:
return email_from[: email_from.find("<")].strip()
return ""
def get_email_part(email_from):
"""parse email from header and return the email part
First Last <ab@cd.com> -> ab@cd.com
ab@cd.com -> ""
"""
if "<" in email_from:
return email_from[email_from.find("<") + 1 : email_from.find(">")].strip()
return email_from
if __name__ == "__main__":
controller = Controller(MailHandler(), hostname="0.0.0.0", port=20381)

2
tests/test_email_handler.py → tests/test_email_utils.py
View file

@ -1,4 +1,4 @@
from email_handler import get_email_name, get_email_part
from app.email_utils import get_email_name, get_email_part
def test_get_email_name():