v2.0.22-beta

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v2.0.22-beta (2018-03-09)
+
+* Notifications:
+  * Fix: Pushover notifications failing with priority 2 is set.
+  * Fix: Expanding selectize box for some notification agent settings.
+* Other:
+  * Fix: Update check failing when an update is available.
+  * Fix: Item count incorrect for photo libraries.
+
+
 ## v2.0.21-beta (2018-03-04)
 
 * Monitoring:

data/interfaces/default/css/tautulli.css

@@ -66,7 +66,6 @@ div.form-control .selectize-input {
     color: #fff;
     border: 0px solid #444;
     background: #555;
-    height: 32px;
     padding: 6px 12px;
     background-color: #555;
     border-radius: 3px;
@@ -92,6 +91,7 @@ div.form-control .selectize-input {
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
     min-height: 32px !important;
+    height: 32px !important;
 }
 .input-group .selectize-control.form-control.selectize-pms-ip .selectize-input > div {
     max-width: 450px;
@@ -1419,7 +1419,7 @@ a .dashboard-activity-metadata-user-thumb:hover {
 }
 .dashboard-stats-info-item .sub-count {
     height: 100%;
-    margin-left: 10px;
+    margin-left: 5px;
     color: #f9be03;
     font-size: 12px;
     text-align: right;
@@ -1430,7 +1430,7 @@ a .dashboard-activity-metadata-user-thumb:hover {
 }
 .dashboard-stats-info-item .sub-divider {
     height: 100%;
-    margin-left: 10px;
+    margin-left: 5px;
     color: #aaa;
     font-size: 12px;
     text-align: left;

data/interfaces/default/index.html

@@ -276,6 +276,7 @@
             async: true,
             error: function (xhr, status, error) {
                 console.log(status + ': ' + error);
+                activity_ready = true;
             },
             complete: function (xhr, status) {
                 $('#dashboard-checking-activity').remove();

data/interfaces/default/js/tables/media_info_table.js

@@ -54,7 +54,7 @@ media_info_table_options = {
                     } else if (rowData['media_type'] === 'album') {
                         expand_details = '<span class="expand-media-info-tooltip" data-toggle="tooltip" title="Show Tracks"><i class="fa fa-plus-circle fa-fw"></i></span>';
                         $(td).html('<div><a href="#"><div style="float: left;">' + expand_details + '&nbsp;' + date + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'photo' && rowData['parent_rating_key'] == '') {
+                    } else if (rowData['media_type'] === 'photo_album') {
                         expand_details = '<span class="expand-media-info-tooltip" data-toggle="tooltip" title="Show Photos"><i class="fa fa-plus-circle fa-fw"></i></span>';
                         $(td).html('<div><a href="#"><div style="float: left;">' + expand_details + '&nbsp;' + date + '</div></a></div>');
                     } else {
@@ -77,32 +77,44 @@ media_info_table_options = {
                     if (rowData['media_type'] === 'movie') {
                         if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; }
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + parent_info + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + parent_info + '</span>';
                         $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'show') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="TV Show"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + '</span>';
                         $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'season') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Season"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + '</span>';
                         $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'episode') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=art" data-height="80" data-width="140">E' + rowData['media_index'] + ' - ' + rowData['title'] + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=art" data-height="80" data-width="140">E' + rowData['media_index'] + ' - ' + rowData['title'] + '</span>';
                         $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left; padding-left: 30px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'artist') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Artist"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + rowData['title'] + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + rowData['title'] + '</span>';
                         $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'album') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Album"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + rowData['title'] + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + rowData['title'] + '</span>';
                         $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'track') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">T' + rowData['media_index'] + ' - ' + rowData['title'] + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">T' + rowData['media_index'] + ' - ' + rowData['title'] + '</span>';
                         $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left; padding-left: 30px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                    } else if (rowData['media_type'] === 'photo_album') {
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Photo Album"><i class="fa fa-camera fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + '</span>';
+                        $(td).html('<div class="history-title"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></div>');
+                    } else if (rowData['media_type'] === 'photo') {
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + '</span>';
+                        $(td).html('<div class="history-title"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></div>');
+                    } else if (rowData['media_type'] === 'clip') {
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Video"><i class="fa fa-video-camera fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=art" data-height="80" data-width="140">' + rowData['title'] + '</span>';
+                        $(td).html('<div class="history-title"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></div>');
                     } else {
                         $(td).html(cellData);
                     }
@@ -335,7 +347,7 @@ function childTableOptionsMedia(rowData) {
         case 'album':
             section_type = 'track';
             break;
-        case 'photo':
+        case 'photo_album':
             section_type = 'picture';
             break;
     }

data/interfaces/default/library_stats.html

@@ -29,7 +29,7 @@ DOCUMENTATION :: END
     headers = {'movie': ('Movie Libraries', ('Movies', '', '')),
                'show': ('TV Show Libraries', ('Shows', 'Seasons', 'Episodes')),
                'artist': ('Music Libraries', ('Artists', 'Albums', 'Tracks')),
-               'photo': ('Photo Libraries', ('Albums', '', 'Photos'))}
+               'photo': ('Photo Libraries', ('Albums', 'Photos', 'Videos'))}
 %>
 % for section_type in types:
 % if section_type in data:

data/interfaces/default/notifier_config.html

@@ -606,6 +606,22 @@
         });
     });
 
+    % elif notifier['agent_name'] == 'pushover':
+    function pushoverPriority() {
+         if ($('#pushover_priority').val() == '2') {
+             $('#pushover_retry').closest('.form-group').show();
+             $('#pushover_expire').closest('.form-group').show();
+         } else {
+             $('#pushover_retry').closest('.form-group').hide();
+             $('#pushover_expire').closest('.form-group').hide();
+         }
+    }
+
+    pushoverPriority();
+    $('#pushover_priority').change( function () {
+        pushoverPriority();
+    });
+
     % endif
 
     function validateLogic() {

plexpy/__init__.py

@@ -1621,8 +1621,11 @@ def upgrade():
 
 def shutdown(restart=False, update=False, checkout=False):
     cherrypy.engine.exit()
-    SCHED.shutdown(wait=False)
-    activity_handler.ACTIVITY_SCHED.shutdown(wait=False)
+
+    if SCHED.running:
+        SCHED.shutdown(wait=False)
+    if activity_handler.ACTIVITY_SCHED.running:
+        activity_handler.ACTIVITY_SCHED.shutdown(wait=False)
 
     # Stop the notification threads
     for i in range(CONFIG.NOTIFICATION_THREADS):

plexpy/libraries.py

@@ -744,7 +744,7 @@ class Libraries(object):
             logger.warn(u"Tautulli Libraries :: Unable to retrieve library %s from database. Requesting library list refresh."
                         % section_id)
             # Let's first refresh the libraries list to make sure the library isn't newly added and not in the db yet
-            pmsconnect.refresh_libraries()
+            refresh_libraries()
 
             library_details = get_library_details(section_id=section_id)
 

plexpy/notifiers.py

@@ -2691,8 +2691,10 @@ class PUSHOVER(Notifier):
     _DEFAULT_CONFIG = {'api_token': '',
                        'key': '',
                        'html_support': 1,
-                       'priority': 0,
                        'sound': '',
+                       'priority': 0,
+                       'retry': 30,
+                       'expire': 3600,
                        'incl_url': 1,
                        'incl_subject': 1,
                        'incl_poster': 0,
@@ -2713,6 +2715,10 @@ class PUSHOVER(Notifier):
         if self.config['incl_subject']:
             data['title'] = subject.encode("utf-8")
 
+        if self.config['priority'] == 2:
+            data['retry'] = max(30, self.config['retry'])
+            data['expire'] = max(30, self.config['expire'])
+
         headers = {'Content-type': 'application/x-www-form-urlencoded'}
 
         files = {}
@@ -2789,6 +2795,13 @@ class PUSHOVER(Notifier):
                           'description': 'Your Pushover user or group key.',
                           'input_type': 'text'
                           },
+                         {'label': 'Sound',
+                          'value': self.config['sound'],
+                          'name': 'pushover_sound',
+                          'description': 'Set the notification sound. Leave blank for the default sound.',
+                          'input_type': 'select',
+                          'select_options': self.get_sounds()
+                          },
                          {'label': 'Priority',
                           'value': self.config['priority'],
                           'name': 'pushover_priority',
@@ -2796,12 +2809,19 @@ class PUSHOVER(Notifier):
                           'input_type': 'select',
                           'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
                           },
-                         {'label': 'Sound',
-                          'value': self.config['sound'],
-                          'name': 'pushover_sound',
-                          'description': 'Set the notification sound. Leave blank for the default sound.',
-                          'input_type': 'select',
-                          'select_options': self.get_sounds()
+                         {'label': 'Retry Interval',
+                          'value': self.config['retry'],
+                          'name': 'pushover_retry',
+                          'description': 'Set the interval in seconds to keep retrying the notification.<br>'
+                                         'Note: For priority 2 only. Minimum 30 seconds.',
+                          'input_type': 'number'
+                          },
+                         {'label': 'Expire Duration',
+                          'value': self.config['expire'],
+                          'name': 'pushover_expire',
+                          'description': 'Set the duration in seconds when the notification will stop retrying.<br>'
+                                         'Note: For priority 2 only. Minimum 30 seconds.',
+                          'input_type': 'number'
                           },
                          {'label': 'Enable HTML Support',
                           'value': self.config['html_support'],

plexpy/pmsconnect.py

@@ -2138,10 +2138,12 @@ class PmsConnect(object):
             sort_type = '&type=10'
         elif section_type == 'photo':
             sort_type = ''
-        elif section_type == 'photoAlbum':
+        elif section_type == 'photo_album':
             sort_type = '&type=14'
         elif section_type == 'picture':
-            sort_type = '&type=13'
+            sort_type = '&type=13&clusterZoomLevel=1'
+        elif section_type == 'clip':
+            sort_type = '&type=12&clusterZoomLevel=1'
         else:
             sort_type = ''
 
@@ -2284,12 +2286,12 @@ class PmsConnect(object):
                             library_stats.update(child_stats)
 
                     if section_type == 'photo':
-                        parent_list = self.get_library_children_details(section_id=section_id, section_type='photoAlbum', count='1')
+                        parent_list = self.get_library_children_details(section_id=section_id, section_type='picture', count='1')
                         if parent_list:
                             parent_stats = {'parent_count': parent_list['library_count']}
                             library_stats.update(parent_stats)
 
-                        child_list = self.get_library_children_details(section_id=section_id, section_type='picture', count='1')
+                        child_list = self.get_library_children_details(section_id=section_id, section_type='clip', count='1')
                         if child_list:
                             child_stats = {'child_count': child_list['library_count']}
                             library_stats.update(child_stats)

plexpy/session.py

@@ -79,7 +79,7 @@ def get_session_library_filters_type(filters, media_type=None):
         filters = filters.get('filter_tv', ())
     elif media_type == 'artist' or media_type == 'album' or media_type == 'track':
         filters = filters.get('filter_music', ())
-    elif media_type == 'photo' or media_type == 'photoAlbum' or media_type == 'picture':
+    elif media_type == 'photo' or media_type == 'photo_album' or media_type == 'picture' or media_type == 'clip':
         filters = filters.get('filter_photos', ())
     else:
         filters = filters.get('filter_all', ())

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "beta"
-PLEXPY_RELEASE_VERSION = "v2.0.21-beta"
+PLEXPY_RELEASE_VERSION = "v2.0.22-beta"

plexpy/webserve.py

@@ -3585,7 +3585,7 @@ class WebInterface(object):
             return {'result': 'success',
                     'update': True,
                     'release': True,
-                    'message': 'A new release (%) of Tautulli is available.' % plexpy.LATEST_RELEASE,
+                    'message': 'A new release (%s) of Tautulli is available.' % plexpy.LATEST_RELEASE,
                     'latest_release': plexpy.LATEST_RELEASE,
                     'release_url': helpers.anon_url(
                         'https://github.com/%s/%s/releases/tag/%s'

plexpy/webstart.py

@@ -122,6 +122,7 @@ def initialize(options):
         '/images': {
             'tools.staticdir.on': True,
             'tools.staticdir.dir': "interfaces/default/images",
+            'tools.staticdir.content_types': {'svg': 'image/svg+xml'},
             'tools.caching.on': True,
             'tools.caching.force': True,
             'tools.caching.delay': 0,