github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 07:46:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add CC and BCC and multiple email recipients

Browse source
This commit is contained in:
Jonathan Wong 2015-12-13 15:08:43 -08:00
parent c6cc2b8831
commit 49b6965e8e
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/config.py
View file

@ -63,6 +63,8 @@ _CONFIG_DEFINITIONS = {
'EMAIL_ENABLED': (int, 'Email', 0), 'EMAIL_ENABLED': (int, 'Email', 0),
'EMAIL_FROM': (str, 'Email', ''), 'EMAIL_FROM': (str, 'Email', ''),
'EMAIL_TO': (str, 'Email', ''), 'EMAIL_TO': (str, 'Email', ''),
'EMAIL_CC': (str, 'Email', ''),
'EMAIL_BCC': (str, 'Email', ''),
'EMAIL_SMTP_SERVER': (str, 'Email', ''), 'EMAIL_SMTP_SERVER': (str, 'Email', ''),
'EMAIL_SMTP_USER': (str, 'Email', ''), 'EMAIL_SMTP_USER': (str, 'Email', ''),
'EMAIL_SMTP_PASSWORD': (str, 'Email', ''), 'EMAIL_SMTP_PASSWORD': (str, 'Email', ''),

24
plexpy/notifiers.py
View file

@ -1357,6 +1357,12 @@ class Email(object):
message['Subject'] = subject message['Subject'] = subject
message['From'] = email.utils.formataddr(('PlexPy', plexpy.CONFIG.EMAIL_FROM)) message['From'] = email.utils.formataddr(('PlexPy', plexpy.CONFIG.EMAIL_FROM))
message['To'] = plexpy.CONFIG.EMAIL_TO message['To'] = plexpy.CONFIG.EMAIL_TO
message['CC'] = plexpy.CONFIG.EMAIL_CC
recipients = [x.strip() for x in plexpy.CONFIG.EMAIL_TO.split(';')] \
+ [x.strip() for x in plexpy.CONFIG.EMAIL_CC.split(';')] \
+ [x.strip() for x in plexpy.CONFIG.EMAIL_BCC.split(';')]
recipients = filter(None, recipients)
try: try:
mailserver = smtplib.SMTP(plexpy.CONFIG.EMAIL_SMTP_SERVER, plexpy.CONFIG.EMAIL_SMTP_PORT) mailserver = smtplib.SMTP(plexpy.CONFIG.EMAIL_SMTP_SERVER, plexpy.CONFIG.EMAIL_SMTP_PORT)
@ -1369,7 +1375,7 @@ class Email(object):
if plexpy.CONFIG.EMAIL_SMTP_USER: if plexpy.CONFIG.EMAIL_SMTP_USER:
mailserver.login(plexpy.CONFIG.EMAIL_SMTP_USER, plexpy.CONFIG.EMAIL_SMTP_PASSWORD) mailserver.login(plexpy.CONFIG.EMAIL_SMTP_USER, plexpy.CONFIG.EMAIL_SMTP_PASSWORD)
mailserver.sendmail(plexpy.CONFIG.EMAIL_FROM, plexpy.CONFIG.EMAIL_TO, message.as_string()) mailserver.sendmail(plexpy.CONFIG.EMAIL_FROM, recipients, message.as_string())
mailserver.quit() mailserver.quit()
logger.info(u"Email notifications sent.") logger.info(u"Email notifications sent.")
@ -1383,13 +1389,25 @@ class Email(object):
config_option = [{'label': 'From', config_option = [{'label': 'From',
'value': plexpy.CONFIG.EMAIL_FROM, 'value': plexpy.CONFIG.EMAIL_FROM,
'name': 'email_from', 'name': 'email_from',
'description': 'Who should the sender be.', 'description': 'The email address of the sender.',
'input_type': 'text' 'input_type': 'text'
}, },
{'label': 'To', {'label': 'To',
'value': plexpy.CONFIG.EMAIL_TO, 'value': plexpy.CONFIG.EMAIL_TO,
'name': 'email_to', 'name': 'email_to',
'description': 'Who should the recipient be.', 'description': 'The email address(es) of the recipients, separated by semicolons (;).',
'input_type': 'text'
},
{'label': 'CC',
'value': plexpy.CONFIG.EMAIL_CC,
'name': 'email_cc',
'description': 'The email address(es) to CC, separated by semicolons (;).',
'input_type': 'text'
},
{'label': 'BCC',
'value': plexpy.CONFIG.EMAIL_BCC,
'name': 'email_bcc',
'description': 'The email address(es) to BCC, separated by semicolons (;).',
'input_type': 'text' 'input_type': 'text'
}, },
{'label': 'SMTP Server', {'label': 'SMTP Server',