diff --git a/data/interfaces/default/newsletter_config.html b/data/interfaces/default/newsletter_config.html index 8ddf90b1..a4d516d5 100644 --- a/data/interfaces/default/newsletter_config.html +++ b/data/interfaces/default/newsletter_config.html @@ -1,10 +1,14 @@ % if newsletter: <%! - from plexpy import helpers, notifiers + import json + from plexpy import helpers, notifiers, users email_notifiers = [n for n in notifiers.get_notifiers() if n['agent_name'] == 'email'] sorted(email_notifiers, key=lambda k: (k['agent_label'], k['friendly_name'], k['id'])) email_notifiers = [{'id': 0, 'agent_label': 'New Email Configuration', 'friendly_name': ''}] + email_notifiers + + user_emails = [{'user': u['friendly_name'] or u['username'], 'email': u['email']} for u in users.Users().get_users() if u['email']] + sorted(user_emails, key=lambda u: u['user']) %>
@@ -56,7 +60,7 @@
-
+
@@ -76,7 +80,7 @@
-
+
@@ -94,7 +98,7 @@
-
+
@@ -130,7 +134,7 @@
-
+
-

Use an exisiting Email notification agent or enter a new configuration below.

+

Use an existing Email notification agent or enter a new configuration below.

-
+

Optional: Enter a subject line for the email. Leave blank for default.
- Note: You may include {start_date} and {end_date} as parameters. The global date format under Settings > General will be used. + Note: You may include {server_name}, {start_date}, and {end_date} as parameters. The global date format under Settings > General will be used.

@@ -172,7 +176,7 @@
-
+
@@ -192,7 +196,7 @@
-
+
@@ -210,7 +214,7 @@
-
+
@@ -248,7 +252,7 @@

-
+
@@ -284,7 +288,7 @@ maxItems: null }); var incl_libraries = $incl_libraries[0].selectize; - incl_libraries.setValue(${next((c['value'] for c in newsletter['config_options'] if c['name'] == 'recently_added_incl_libraries'), []) | n}); + incl_libraries.setValue(${json.dumps(next((c['value'] for c in newsletter['config_options'] if c['name'] == 'recently_added_incl_libraries'), [])) | n}); $('#email_notifier').change(function () { if ($(this).val() === "0") { @@ -294,6 +298,69 @@ } }); + var REGEX_EMAIL = '([a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@' + + '(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)'; + var $email_selectors = $('#email_to, #email_cc, #email_bcc').selectize({ + plugins: ['remove_button'], + persist: false, + maxItems: null, + valueField: 'email', + labelField: 'user', + searchField: ['user', 'email'], + options: ${json.dumps(user_emails) | n}, + render: { + item: function(item, escape) { + return '
' + + (item.user ? '' + escape(item.user) + '' : '') + + (item.email ? '' : '') + + '
'; + }, + option: function(item, escape) { + var label = item.user || item.email; + var caption = item.user ? item.email : null; + return '
' + + escape(label) + + (caption ? '' + escape(caption) + '' : '') + + '
'; + } + }, + createFilter: function(input) { + var match, regex; + + // email@address.com + regex = new RegExp('^' + REGEX_EMAIL + '$', 'i'); + match = input.match(regex); + if (match) return !this.options.hasOwnProperty(match[0]); + + // user + regex = new RegExp('^([^<]*)\<' + REGEX_EMAIL + '\>$', 'i'); + match = input.match(regex); + if (match) return !this.options.hasOwnProperty(match[2]); + + return false; + }, + create: function(input) { + if ((new RegExp('^' + REGEX_EMAIL + '$', 'i')).test(input)) { + return {email: input}; + } + var match = input.match(new RegExp('^([^<]*)\<' + REGEX_EMAIL + '\>$', 'i')); + if (match) { + return { + email : match[2], + user : $.trim(match[1]) + }; + } + alert('Invalid email address.'); + return false; + } + }); + var email_to = $email_selectors[0].selectize; + var email_cc = $email_selectors[1].selectize; + var email_bcc = $email_selectors[2].selectize; + email_to.setValue(${json.dumps(next((c['value'] for c in newsletter['email_config_options'] if c['name'] == 'email_to'), [])) | n}); + email_cc.setValue(${json.dumps(next((c['value'] for c in newsletter['email_config_options'] if c['name'] == 'email_cc'), [])) | n}); + email_bcc.setValue(${json.dumps(next((c['value'] for c in newsletter['email_config_options'] if c['name'] == 'email_bcc'), [])) | n}); + function reloadModal() { $.ajax({ url: 'get_newsletter_config_modal', diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index 36dea396..6e239f30 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -238,17 +238,18 @@ def serve_template(templatename, **kwargs): class Newsletter(object): NAME = '' _DEFAULT_CONFIG = {} + _DEFAULT_EMAIL_CONFIG = EMAIL().return_default_config() + _DEFAULT_EMAIL_CONFIG['from_name'] = 'Tautulli Newsletter' + _DEFAULT_EMAIL_CONFIG['notifier'] = 0 + _DEFAULT_EMAIL_CONFIG['subject'] = 'Tautulli Newsletter' + _TEMPLATE = '' def __init__(self, config=None, email_config=None): - self._default_email_config = EMAIL().return_default_config() - self._default_email_config['from_name'] = 'Tautulli Newsletter' - self._default_email_config['notifier'] = 0 - self._default_email_config['subject'] = 'Tautulli Newsletter' - self.config = self.set_config(config=config, default=self._DEFAULT_CONFIG) - self.email_config = self.set_config(config=email_config, default=self._default_email_config) + self.email_config = self.set_config(config=email_config, default=self._DEFAULT_EMAIL_CONFIG) - self.parameters = {} + self.parameters = {'server_name': plexpy.CONFIG.PMS_NAME} + self.is_preview = False def set_config(self, config=None, default=None): return self._validate_config(config=config, default=default) @@ -346,7 +347,7 @@ class RecentlyAdded(Newsletter): elif not isinstance(self.config['incl_libraries'], list): self.config['incl_libraries'] = [self.config['incl_libraries']] - self._default_email_config['subject'] = 'Recently Added to Plex! ({end_date})' + self._DEFAULT_EMAIL_CONFIG['subject'] = 'Recently Added to Plex! ({end_date})' date_format = helpers.momentjs_to_arrow(plexpy.CONFIG.DATE_FORMAT) @@ -355,8 +356,8 @@ class RecentlyAdded(Newsletter): self.end_date = arrow.get(self.end_time).format(date_format) self.start_date = arrow.get(self.start_time).format(date_format) - self.parameters = {'start_date': self.start_date, - 'end_date': self.end_date} + self.parameters['start_date'] = self.start_date + self.parameters['end_date'] = self.end_date self.plexpy_config = { 'pms_identifier': plexpy.CONFIG.PMS_IDENTIFIER, @@ -515,7 +516,7 @@ class RecentlyAdded(Newsletter): 'input_type': 'number' }, {'label': 'Included Libraries', - 'value': json.dumps(self.config['incl_libraries']), + 'value': self.config['incl_libraries'], 'description': 'Select the libraries to include in the newsletter.', 'name': 'recently_added_incl_libraries', 'input_type': 'select',