diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css index 881b23a7..16320f06 100644 --- a/data/interfaces/default/css/tautulli.css +++ b/data/interfaces/default/css/tautulli.css @@ -125,8 +125,10 @@ div.form-control .selectize-input { padding-bottom: 2px !important; transition: background-color .3s; } -.react-selectize.root-node .simple-value span { +.react-selectize.root-node .simple-value span, +.selectize-control.multi .selectize-input > div { padding-bottom: 2px !important; + padding-left: 5px !important; } .react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values .value-wrapper:not(:first-child):before { content: "or"; diff --git a/data/interfaces/default/newsletter_config.html b/data/interfaces/default/newsletter_config.html index 47f045e0..a08bc130 100644 --- a/data/interfaces/default/newsletter_config.html +++ b/data/interfaces/default/newsletter_config.html @@ -1,7 +1,11 @@ -<%! - from plexpy import helpers -%> % if newsletter: +<%! + from plexpy import helpers, notifiers + + 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 +%>
@@ -91,7 +95,7 @@
- % for key, value in sorted(item['select_options'].iteritems()): % if key == item['value']: @@ -128,14 +132,14 @@
@@ -262,12 +266,12 @@ } }); // apply cron with default options - var $excl_libraries = $('#recently_added_excl_libraries').selectize({ + var $incl_libraries = $('#recently_added_incl_libraries').selectize({ plugins: ['remove_button'], maxItems: null }); - var excl_libraries = $excl_libraries[0].selectize; - excl_libraries.setValue(${next((c['value'] for c in newsletter['config_options'] if c['name'] == 'recently_added_excl_libraries'), []) | n}); + 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}); $('#email_notifier').change(function () { if ($(this).val() === "0") { diff --git a/data/interfaces/default/notifier_config.html b/data/interfaces/default/notifier_config.html index 87107c52..5d62a6c4 100644 --- a/data/interfaces/default/notifier_config.html +++ b/data/interfaces/default/notifier_config.html @@ -1,3 +1,4 @@ +% if notifier: <%! import json from plexpy import helpers, notifiers, users @@ -6,7 +7,6 @@ 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']) %> -% if notifier:
diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html index 0278ebb4..b37255cc 100644 --- a/data/interfaces/newsletters/recently_added.html +++ b/data/interfaces/newsletters/recently_added.html @@ -1,5 +1,4 @@ -% if recently_added: - + @@ -1035,5 +1034,4 @@ - -% endif \ No newline at end of file + \ No newline at end of file diff --git a/plexpy/libraries.py b/plexpy/libraries.py index 190eaab9..d5178c4b 100644 --- a/plexpy/libraries.py +++ b/plexpy/libraries.py @@ -911,7 +911,7 @@ class Libraries(object): monitor_db = database.MonitorDatabase() try: - query = 'SELECT section_id, section_name FROM library_sections WHERE deleted_section = 0' + query = 'SELECT section_id, section_name, section_type FROM library_sections WHERE deleted_section = 0' result = monitor_db.select(query=query) except Exception as e: logger.warn(u"Tautulli Libraries :: Unable to execute database query for get_sections: %s." % e) @@ -920,7 +920,8 @@ class Libraries(object): libraries = [] for item in result: library = {'section_id': item['section_id'], - 'section_name': item['section_name'] + 'section_name': item['section_name'], + 'section_type': item['section_type'] } libraries.append(library) diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index af6e4716..62e45697 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -33,7 +33,7 @@ import logger import notification_handler import pmsconnect import request -from notifiers import get_notifiers, EMAIL +from notifiers import EMAIL AGENT_IDS = { @@ -123,21 +123,9 @@ def get_newsletter_config(newsletter_id=None): logger.error(u"Tautulli Newsletters :: Failed to get newsletter config options: %s." % e) return - notifiers = [] - for n in get_notifiers(): - if n['agent_name'] == 'email': - notifiers.append({ - 'id': n['id'], - 'agent_label': n['agent_label'], - 'friendly_name': n['friendly_name'] - }) - sorted(notifiers, key=lambda k: (k['agent_label'], k['friendly_name'], k['id'])) - email_notifiers = [{'id': 0, 'agent_label': 'New Email Configuration', 'friendly_name': ''}] + notifiers - result['config'] = config result['config_options'] = newsletter_config result['email_config_options'] = newsletter_email_config - result['email_notifiers'] = email_notifiers return result @@ -321,13 +309,18 @@ class RecentlyAdded(Newsletter): """ NAME = 'Recently Added' _DEFAULT_CONFIG = {'last_days': 7, - 'excl_libraries': '' + 'incl_libraries': None } _TEMPLATE = 'recently_added.html' def __init__(self, config=None, email_config=None): super(RecentlyAdded, self).__init__(config=config, email_config=email_config) + if self.config['incl_libraries'] is None: + self.config['incl_libraries'] = [] + elif not isinstance(self.config['incl_libraries'], list): + self.config['incl_libraries'] = [self.config['incl_libraries']] + date_format = helpers.momentjs_to_arrow(plexpy.CONFIG.DATE_FORMAT) self.end_time = int(time.time()) @@ -363,8 +356,8 @@ class RecentlyAdded(Newsletter): if media_type == 'movie': movie_list = [] for item in recently_added: - # Filter out excluded libraries - if item['section_id'] in self.config['excl_libraries']: + # Filter included libraries + if item['section_id'] not in self.config['incl_libraries']: continue movie_list.append(item) @@ -375,8 +368,8 @@ class RecentlyAdded(Newsletter): shows_list = [] show_rating_keys = [] for item in recently_added: - # Filter out excluded libraries - if item['section_id'] in self.config['excl_libraries']: + # Filter included libraries + if item['section_id'] not in self.config['incl_libraries']: continue if item['media_type'] == 'show': @@ -422,8 +415,8 @@ class RecentlyAdded(Newsletter): artists_list = [] artist_rating_keys = [] for item in recently_added: - # Filter out excluded libraries - if item['section_id'] in self.config['excl_libraries']: + # Filter included libraries + if item['section_id'] not in self.config['incl_libraries']: continue if item['media_type'] == 'artist': @@ -459,9 +452,11 @@ class RecentlyAdded(Newsletter): return recently_added def get_recently_added(self): - self.recently_added['movie'] = self._get_recently_added('movie') - self.recently_added['show'] = self._get_recently_added('show') - self.recently_added['artist'] = self._get_recently_added('artist') + media_types = {s['section_type'] for s in self._get_sections() + if str(s['section_id']) in self.config['incl_libraries']} + + for media_type in media_types: + self.recently_added[media_type] = self._get_recently_added(media_type) return self.recently_added @@ -478,89 +473,19 @@ class RecentlyAdded(Newsletter): ) def send(self, **kwargs): - if not subject or not body: - return + self.get_recently_added() - if self.config['incl_subject']: - text = subject.encode('utf-8') + '\r\n' + body.encode("utf-8") - else: - text = body.encode("utf-8") - - data = {'content': text} - if self.config['username']: - data['username'] = self.config['username'] - if self.config['avatar_url']: - data['avatar_url'] = self.config['avatar_url'] - if self.config['tts']: - data['tts'] = True - - if self.config['incl_card'] and kwargs.get('parameters', {}).get('media_type'): - # Grab formatted metadata - pretty_metadata = PrettyMetadata(kwargs['parameters']) - - if pretty_metadata.media_type == 'movie': - provider = self.config['movie_provider'] - elif pretty_metadata.media_type in ('show', 'season', 'episode'): - provider = self.config['tv_provider'] - elif pretty_metadata.media_type in ('artist', 'album', 'track'): - provider = self.config['music_provider'] - else: - provider = None - - poster_url = pretty_metadata.get_poster_url() - provider_name = pretty_metadata.get_provider_name(provider) - provider_link = pretty_metadata.get_provider_link(provider) - title = pretty_metadata.get_title('\xc2\xb7'.decode('utf8')) - description = pretty_metadata.get_description() - plex_url = pretty_metadata.get_plex_url() - - # Build Discord post attachment - attachment = {'title': title - } - - if self.config['color']: - hex_match = re.match(r'^#([0-9a-fA-F]{3}){1,2}$', self.config['color']) - if hex_match: - hex = hex_match.group(0).lstrip('#') - hex = ''.join(h * 2 for h in hex) if len(hex) == 3 else hex - attachment['color'] = helpers.hex_to_int(hex) - - if self.config['incl_thumbnail']: - attachment['thumbnail'] = {'url': poster_url} - else: - attachment['image'] = {'url': poster_url} - - if self.config['incl_description'] or pretty_metadata.media_type in ('artist', 'album', 'track'): - attachment['description'] = description - - fields = [] - if provider_link: - attachment['url'] = provider_link - fields.append({'name': 'View Details', - 'value': '[%s](%s)' % (provider_name, provider_link.encode('utf-8')), - 'inline': True}) - if self.config['incl_pmslink']: - fields.append({'name': 'View Details', - 'value': '[Plex Web](%s)' % plex_url.encode('utf-8'), - 'inline': True}) - if fields: - attachment['fields'] = fields - - data['embeds'] = [attachment] - - headers = {'Content-type': 'application/json'} - params = {'wait': True} - - return self.make_request(self.config['hook'], params=params, headers=headers, json=data) + return def _get_sections(self): - sections_list = libraries.Libraries().get_sections() + return libraries.Libraries().get_sections() - section_options = {'': ''} - for l in sections_list: - section_options[l['section_id']] = l['section_name'] - - return section_options + def _get_sections_options(self): + sections = {'': ''} + for s in self._get_sections(): + if s['section_type'] != 'photo': + sections[s['section_id']] = s['section_name'] + return sections def return_config_options(self): config_option = [{'label': 'Number of Days', @@ -569,14 +494,12 @@ class RecentlyAdded(Newsletter): 'description': 'The past number of days to include in the newsletter.', 'input_type': 'number' }, - {'label': 'Exclude Libraries', - 'value': json.dumps(self.config['excl_libraries']), - 'description': 'Select the libraries to exclude from the newsletter.' - 'Leave blank to include all libraries in the newsletter.', - 'name': 'recently_added_excl_libraries', + {'label': 'Included Libraries', + 'value': json.dumps(self.config['incl_libraries']), + 'description': 'Select the libraries to include in the newsletter.', + 'name': 'recently_added_incl_libraries', 'input_type': 'select', - 'select_options': self._get_sections(), - 'multiple': True + 'select_options': self._get_sections_options() } ] diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 284a6bc9..549429dc 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -443,9 +443,9 @@ class WebInterface(object): Returns: json: - [{"section_id": 1, "section_name": "Movies"}, - {"section_id": 7, "section_name": "Music"}, - {"section_id": 2, "section_name": "TV Shows"}, + [{"section_id": 1, "section_name": "Movies", "section_type": "movie"}, + {"section_id": 7, "section_name": "Music", "section_type": "artist"}, + {"section_id": 2, "section_name": "TV Shows", "section_type": "show"}, {...} ] ```