Add exclude libraries option to newsletter

* Remove individual media type toggles

data/interfaces/default/newsletter_config.html

@@ -12,14 +12,14 @@
             <div class="container-fluid">
                 <div class="row">
                     <ul class="nav nav-tabs list-unstyled" role="tablist">
-                        <li role="presentation" class="active"><a href="#tabs-config" aria-controls="tabs-config" role="tab" data-toggle="tab">Configuration</a></li>
+                        <li role="presentation" class="active"><a href="#tabs-newsletter_config" aria-controls="tabs-newsletter_config" role="tab" data-toggle="tab">Configuration</a></li>
                         <li role="presentation"><a href="#tabs-email_config" aria-controls="tabs-email_config" role="tab" data-toggle="tab">Email Configuration</a></li>
                         <li role="presentation"><a href="#tabs-test_newsletter" aria-controls="tabs-test_newsletter" role="tab" data-toggle="tab">Test Newsletter</a></li>
                     </ul>
                 </div>
                 <form action="set_newsletter_config" method="post" class="form" id="set_newsletter_config" data-parsley-validate>
                     <div class="tab-content">
-                        <div role="tabpanel" class="tab-pane active" id="tabs-config">
+                        <div role="tabpanel" class="tab-pane active" id="tabs-newsletter_config">
                             <div class="row">
                                 <div class="col-md-12">
                                     <div class="checkbox" style="margin-bottom: 20px;">
@@ -91,7 +91,7 @@
                                         <label for="${item['name']}">${item['label']}</label>
                                         <div class="row">
                                             <div class="col-md-8">
-                                                <select class="form-control" id="${item['name']}" name="${item['name']}">
+                                                <select class="form-control" id="${item['name']}" name="${item['name']}" ${'multiple' if item.get('multiple') else ''}>
                                                     % for key, value in sorted(item['select_options'].iteritems()):
                                                     % if key == item['value']:
                                                     <option value="${key}" selected>${value}</option>
@@ -262,6 +262,13 @@
         }
     }); // apply cron with default options
 
+    var $excl_libraries = $('#recently_added_excl_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});
+
     $('#email_notifier').change(function () {
         if ($(this).val() === "0") {
             $('#newsletter-email-config').show();

data/interfaces/default/notifier_config.html

@@ -17,7 +17,7 @@
             <div class="container-fluid">
                 <div class="row">
                     <ul class="nav nav-tabs list-unstyled" role="tablist">
-                        <li role="presentation" class="active"><a href="#tabs-config" aria-controls="tabs-config" role="tab" data-toggle="tab">Configuration</a></li>
+                        <li role="presentation" class="active"><a href="#tabs-notifier_config" aria-controls="tabs-notifier_config" role="tab" data-toggle="tab">Configuration</a></li>
                         <li role="presentation"><a href="#tabs-notify_triggers" aria-controls="tabs-notify_triggers" role="tab" data-toggle="tab">Triggers</a></li>
                         <li role="presentation"><a href="#tabs-notify_conditions" aria-controls="tabs-notify_conditions" role="tab" data-toggle="tab">Conditions</a></li>
                         <li role="presentation"><a href="#tabs-notify_text" aria-controls="tabs-notify_text" role="tab" data-toggle="tab">${'Arguments' if notifier['agent_name'] == 'scripts' else 'Text'}</a></li>
@@ -26,7 +26,7 @@
                 </div>
                 <form action="set_notifier_config" method="post" class="form" id="set_notifier_config" data-parsley-validate>
                     <div class="tab-content">
-                        <div role="tabpanel" class="tab-pane active" id="tabs-config">
+                        <div role="tabpanel" class="tab-pane active" id="tabs-notifier_config">
                             <div class="row">
                                 <div class="col-md-12">
                                     <input type="hidden" id="notifier_id" name="notifier_id" value="${notifier['id']}" />

plexpy/newsletters.py

@@ -28,6 +28,7 @@ import time
 import plexpy
 import database
 import helpers
+import libraries
 import logger
 import notification_handler
 import pmsconnect
@@ -320,9 +321,7 @@ class RecentlyAdded(Newsletter):
     """
     NAME = 'Recently Added'
     _DEFAULT_CONFIG = {'last_days': 7,
-                       'incl_movies': 1,
+                       'excl_libraries': ''
-                       'incl_shows': 1,
-                       'incl_artists': 1
                        }
     _TEMPLATE = 'recently_added.html'
 
@@ -361,10 +360,25 @@ class RecentlyAdded(Newsletter):
 
             recently_added.extend(filtered_items)
 
+        if media_type == 'movie':
+            movie_list = []
+            for item in recently_added:
+                # Filter out excluded libraries
+                if item['section_id'] in self.config['excl_libraries']:
+                    continue
+
+                movie_list.append(item)
+
+            recently_added = movie_list
+
         if media_type == 'show':
             shows_list = []
             show_rating_keys = []
             for item in recently_added:
+                # Filter out excluded libraries
+                if item['section_id'] in self.config['excl_libraries']:
+                    continue
+
                 if item['media_type'] == 'show':
                     show_rating_key = item['rating_key']
                 elif item['media_type'] == 'season':
@@ -408,6 +422,10 @@ 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']:
+                    continue
+
                 if item['media_type'] == 'artist':
                     artist_rating_key = item['rating_key']
                 elif item['media_type'] == 'album':
@@ -441,12 +459,9 @@ class RecentlyAdded(Newsletter):
         return recently_added
 
     def get_recently_added(self):
-        if self.config['incl_movies']:
+        self.recently_added['movie'] = self._get_recently_added('movie')
-            self.recently_added['movie'] = self._get_recently_added('movie')
+        self.recently_added['show'] = self._get_recently_added('show')
-        if self.config['incl_shows']:
+        self.recently_added['artist'] = self._get_recently_added('artist')
-            self.recently_added['show'] = self._get_recently_added('show')
-        if self.config['incl_artists']:
-            self.recently_added['artist'] = self._get_recently_added('artist')
 
         return self.recently_added
 
@@ -538,6 +553,15 @@ class RecentlyAdded(Newsletter):
 
         return self.make_request(self.config['hook'], params=params, headers=headers, json=data)
 
+    def _get_sections(self):
+        sections_list = libraries.Libraries().get_sections()
+
+        section_options = {'': ''}
+        for l in sections_list:
+            section_options[l['section_id']] = l['section_name']
+
+        return section_options
+
     def return_config_options(self):
         config_option = [{'label': 'Number of Days',
                           'value': self.config['last_days'],
@@ -545,23 +569,14 @@ class RecentlyAdded(Newsletter):
                           'description': 'The past number of days to include in the newsletter.',
                           'input_type': 'number'
                           },
-                         {'label': 'Include Movies',
+                         {'label': 'Exclude Libraries',
-                          'value': self.config['incl_movies'],
+                          'value': json.dumps(self.config['excl_libraries']),
-                          'description': 'Include recently added movies in the newsletter.',
+                          'description': 'Select the libraries to exclude from the newsletter.'
-                          'name': 'recently_added_incl_movies',
+                                         'Leave blank to include all libraries in the newsletter.',
-                          'input_type': 'checkbox'
+                          'name': 'recently_added_excl_libraries',
-                          },
+                          'input_type': 'select',
-                         {'label': 'Include TV Shows',
+                          'select_options': self._get_sections(),
-                          'value': self.config['incl_shows'],
+                          'multiple': True
-                          'description': 'Include recently added TV shows in the newsletter.',
-                          'name': 'recently_added_incl_shows',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Music',
-                          'value': self.config['incl_artists'],
-                          'description': 'Include recently added music in the newsletter.',
-                          'name': 'recently_added_incl_artists',
-                          'input_type': 'checkbox'
                           }
                          ]