From 2ea6ae648c4319c13e78781358fbc0116e4a23e9 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Thu, 8 Oct 2015 23:16:22 -0700
Subject: [PATCH 1/7] Order sync table by State > User > Title

---
 data/interfaces/default/js/tables/sync_table.js | 2 +-
 data/interfaces/default/sync.html               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/default/js/tables/sync_table.js b/data/interfaces/default/js/tables/sync_table.js
index f560eac7..f4b85407 100644
--- a/data/interfaces/default/js/tables/sync_table.js
+++ b/data/interfaces/default/js/tables/sync_table.js
@@ -2,7 +2,7 @@ sync_table_options = {
     "processing": false,
     "serverSide": false,
     "pagingType": "bootstrap",
-    "order": [ 0, 'desc'],
+    "order": [ [ 0, 'desc'], [ 1, 'asc'], [2, 'asc'] ],
     "pageLength": 25,
     "stateSave": true,
     "language": {
diff --git a/data/interfaces/default/sync.html b/data/interfaces/default/sync.html
index bad24c0c..3d541219 100644
--- a/data/interfaces/default/sync.html
+++ b/data/interfaces/default/sync.html
@@ -26,7 +26,7 @@
             <thead>
             <tr>
                 <th align='left' id="state">State</th>
-                <th align='left' id="username">Username</th>
+                <th align='left' id="user">User</th>
                 <th align='left' id="title">Title</th>
                 <th align='left' id="type">Type</th>
                 <th align='left' id="platform">Platform</th>

From 9968f8b6dd3c015e10be47cde5e7cd905f603711 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Sun, 11 Oct 2015 17:53:46 -0700
Subject: [PATCH 2/7] Clean up home_stats code

---
 data/interfaces/default/home_stats.html |  2 +-
 plexpy/datafactory.py                   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html
index 3eeba036..f65871f2 100644
--- a/data/interfaces/default/home_stats.html
+++ b/data/interfaces/default/home_stats.html
@@ -65,7 +65,7 @@ DOCUMENTATION :: END
 %>
 
 % if data:
-% if data[0]['rows'] or data[1]['rows'] or data[2]['rows'] or data[3]['rows'] or data[4]['rows'] or data[5]['rows']:
+% if data[0]['rows']:
 <ul class="list-unstyled">
     % for top_stat in data:
     % if top_stat['stat_id'] == 'top_tv' and top_stat['rows']:
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index d10dc7e0..0fde3150 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -159,7 +159,7 @@ class DataFactory(object):
         home_stats = []
 
         for stat in stats_cards:
-            if 'top_tv' in stat:
+            if stat == 'top_tv':
                 top_tv = []
                 try:
                     query = 'SELECT session_history_metadata.id, ' \
@@ -205,7 +205,7 @@ class DataFactory(object):
                                    'stat_type': sort_type,
                                    'rows': top_tv})
 
-            elif 'popular_tv' in stat:
+            elif stat == 'popular_tv':
                 popular_tv = []
                 try:
                     query = 'SELECT session_history_metadata.id, ' \
@@ -251,7 +251,7 @@ class DataFactory(object):
                 home_stats.append({'stat_id': stat,
                                    'rows': popular_tv})
 
-            elif 'top_movies' in stat:
+            elif stat == 'top_movies':
                 top_movies = []
                 try:
                     query = 'SELECT session_history_metadata.id, ' \
@@ -297,7 +297,7 @@ class DataFactory(object):
                                    'stat_type': sort_type,
                                    'rows': top_movies})
 
-            elif 'popular_movies' in stat:
+            elif stat == 'popular_movies':
                 popular_movies = []
                 try:
                     query = 'SELECT session_history_metadata.id, ' \
@@ -343,7 +343,7 @@ class DataFactory(object):
                 home_stats.append({'stat_id': stat,
                                    'rows': popular_movies})
 
-            elif 'top_music' in stat:
+            elif stat == 'top_music':
                 top_music = []
                 try:
                     query = 'SELECT session_history_metadata.id, ' \
@@ -389,7 +389,7 @@ class DataFactory(object):
                                    'stat_type': sort_type,
                                    'rows': top_music})
 
-            elif 'popular_music' in stat:
+            elif stat == 'popular_music':
                 popular_music = []
                 try:
                     query = 'SELECT session_history_metadata.id, ' \
@@ -435,7 +435,7 @@ class DataFactory(object):
                 home_stats.append({'stat_id': stat,
                                    'rows': popular_music})
 
-            elif 'top_users' in stat:
+            elif stat == 'top_users':
                 top_users = []
                 try:
                     query = 'SELECT session_history.user, ' \
@@ -488,7 +488,7 @@ class DataFactory(object):
                                    'stat_type': sort_type,
                                    'rows': top_users})
 
-            elif 'top_platforms' in stat:
+            elif stat == 'top_platforms':
                 top_platform = []
 
                 try:
@@ -536,7 +536,7 @@ class DataFactory(object):
                                    'stat_type': sort_type,
                                    'rows': top_platform})
 
-            elif 'last_watched' in stat:
+            elif stat == 'last_watched':
                 last_watched = []
                 try:
                     query = 'SELECT session_history_metadata.id, ' \

From c12862ffbaedeb90092c1f35a6127db374909cb4 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Sun, 11 Oct 2015 22:36:00 -0700
Subject: [PATCH 3/7] Add select dropdown to notification agents

* Change priority selections to dropdown
---
 .../default/notification_config.html          | 28 +++++++++++++++----
 plexpy/notifiers.py                           | 15 ++++++----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/data/interfaces/default/notification_config.html b/data/interfaces/default/notification_config.html
index 837f907c..e7fc16f2 100644
--- a/data/interfaces/default/notification_config.html
+++ b/data/interfaces/default/notification_config.html
@@ -44,6 +44,24 @@ from plexpy import helpers
                             <p class="help-block">${item['description']}</p>
                             <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
                         </div>
+                        % elif item['input_type'] == 'select':
+                        <div class="form-group">
+                            <label for="${item['name']}">${item['label']}</label>
+                            <div class="row">
+                                <div class="col-md-5">
+                                    <select class="form-control" id="${item['name']}" name="${item['name']}" >
+                                        % for key, value in sorted(item['select_options'].iteritems()):
+                                        % if key == item['value']:
+                                        <option value="${key}" selected>${value}</option>
+                                        % else:
+                                        <option value="${key}">${value}</option>
+                                        % endif
+                                        % endfor
+                                    </select>
+                                </div>
+                            </div>
+                            <p class="help-block">${item['description']}</p>
+                        </div>
                         % endif
                     % endfor
                     </div>
@@ -68,8 +86,8 @@ from plexpy import helpers
 <script>
     $('#osxnotifyregister').click(function () {
         var osx_notify_app = $("#osx_notify_app").val();
-        $.get("/osxnotifyregister", {'app': osx_notify_app}, function (data) { $('#ajaxMsg').html("<div class='msg'><span class='ui-icon ui-icon-check'></span>"+data+"</div>"); });
-        $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut()
+        $.get("/osxnotifyregister", { 'app': osx_notify_app }, function (data) { $('#ajaxMsg').html("<i class='fa fa-check'></i> " + data); });
+        $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
     })
 
     var notificationConfig = $("#set_notification_config");
@@ -80,17 +98,17 @@ from plexpy import helpers
 
     $('#twitterStep1').click(function () {
         $.get("/twitterStep1", function (data) {window.open(data); })
-        .done(function () { $('#ajaxMsg').html("<div class='msg'><span class='ui-icon ui-icon-check'></span>Confirm Authorization. Check pop-up blocker if no response.</div>"); });
+        .done(function () { $('#ajaxMsg').html("<i class='fa fa-check'></i> Confirm Authorization. Check pop-up blocker if no response."); });
         $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
     });
     $('#twitterStep2').click(function () {
         var twitter_key = $("#twitter_key").val();
-        $.get("/twitterStep2", {'key': twitter_key}, function (data) { $('#ajaxMsg').html("<div class='msg'><span class='ui-icon ui-icon-check'></span>"+data+"</div>"); });
+        $.get("/twitterStep2", { 'key': twitter_key }, function (data) { $('#ajaxMsg').html("<i class='fa fa-check'></i> " + data); });
         $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
     });
     $('#testTwitter').click(function () {
         $.get("/testTwitter",
-            function (data) { $('#ajaxMsg').html("<div class='msg'><span class='ui-icon ui-icon-check'></span>"+data+"</div>"); });
+            function (data) { $('#ajaxMsg').html("<i class='fa fa-check'></i> " + data); });
         $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
     });
 
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 8c17bc32..dd1e42ea 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -467,8 +467,9 @@ class PROWL(object):
                          {'label': 'Priority',
                           'value': self.priority,
                           'name': 'prowl_priority',
-                          'description': 'Set the priority (-2,-1,0,1 or 2).',
-                          'input_type': 'number'
+                          'description': 'Set the priority.',
+                          'input_type': 'select',
+                          'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
                           }
                          ]
 
@@ -695,8 +696,9 @@ class NMA(object):
                          {'label': 'Priority',
                           'value': plexpy.CONFIG.NMA_PRIORITY,
                           'name': 'nma_priority',
-                          'description': 'Set the priority (-2,-1,0,1 or 2).',
-                          'input_type': 'number'
+                          'description': 'Set the priority.',
+                          'input_type': 'select',
+                          'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
                           }
                          ]
 
@@ -913,8 +915,9 @@ class PUSHOVER(object):
                          {'label': 'Priority',
                           'value': self.priority,
                           'name': 'pushover_priority',
-                          'description': 'Set the priority (-2,-1,0,1 or 2).',
-                          'input_type': 'number'
+                          'description': 'Set the priority.',
+                          'input_type': 'select',
+                          'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
                           },
                          {'label': 'Sound',
                           'value': self.sound,

From 7d3d2957c39c26b65d0b6851fde88ed121c3f77a Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Sun, 11 Oct 2015 23:45:58 -0700
Subject: [PATCH 4/7] Add dropdown for Pushover sounds

---
 .../default/notification_config.html          | 13 ++++++-
 plexpy/notifiers.py                           | 37 +++++++++++++++----
 plexpy/webserve.py                            |  2 +-
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/data/interfaces/default/notification_config.html b/data/interfaces/default/notification_config.html
index e7fc16f2..41fcfa93 100644
--- a/data/interfaces/default/notification_config.html
+++ b/data/interfaces/default/notification_config.html
@@ -90,9 +90,18 @@ from plexpy import helpers
         $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
     })
 
-    var notificationConfig = $("#set_notification_config");
     $('#save-notification-item').click(function() {
-        doAjaxCall('set_notification_config',$(this),'tabs',true);
+        doAjaxCall('set_notification_config', $(this), 'tabs', true);
+        // Reload modal to update certain fields
+        $.ajax({
+            url: 'get_notification_agent_config',
+            data: { config_id: '${config_id}' },
+            cache: false,
+            async: true,
+            complete: function (xhr, status) {
+                $("#notification-config-modal").html(xhr.responseText);
+            }
+        });
         return false;
     });
 
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index dd1e42ea..74ee23c9 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -874,9 +874,9 @@ class PUSHOVER(object):
                 'priority': plexpy.CONFIG.PUSHOVER_PRIORITY}
 
         http_handler.request("POST",
-                                "/1/messages.json",
-                                headers={'Content-type': "application/x-www-form-urlencoded"},
-                                body=urlencode(data))
+                             "/1/messages.json",
+                             headers={'Content-type': "application/x-www-form-urlencoded"},
+                             body=urlencode(data))
         response = http_handler.getresponse()
         request_status = response.status
         # logger.debug(u"Pushover response status: %r" % request_status)
@@ -905,11 +905,31 @@ class PUSHOVER(object):
 
         self.notify('Main Screen Activate', 'Test Message')
 
+    def get_sounds(self):
+        http_handler = HTTPSConnection("api.pushover.net")
+        http_handler.request("GET", "/1/sounds.json?token=" + self.application_token)
+        response = http_handler.getresponse()
+        request_status = response.status
+        
+        if request_status == 200:
+            data = json.loads(response.read())
+            sounds = data.get('sounds', {})
+            return sounds
+        elif request_status >= 400 and request_status < 500:
+            logger.info(u"Unable to retrieve Pushover notification sounds: %s" % response.reason)
+            return {}
+        else:
+            logger.info(u"Unable to retrieve Pushover notification sounds.")
+            return {}
+
     def return_config_options(self):
-        config_option = [{'label': 'Pushover API Key',
+        sounds = self.get_sounds()
+        sounds[''] = ''
+
+        config_option = [{'label': 'Pushover User Key',
                           'value': self.keys,
                           'name': 'pushover_keys',
-                          'description': 'Your Pushover API key.',
+                          'description': 'Your Pushover user key.',
                           'input_type': 'text'
                           },
                          {'label': 'Priority',
@@ -922,13 +942,14 @@ class PUSHOVER(object):
                          {'label': 'Sound',
                           'value': self.sound,
                           'name': 'pushover_sound',
-                          'description': 'Set the notification sound (choose from <a href="https://pushover.net/api#sounds" target="_blank">this list</a> or leave blank for default)',
-                          'input_type': 'text'
+                          'description': 'Set the notification sound. Leave blank for the default sound.',
+                          'input_type': 'select',
+                          'select_options': sounds
                           },
                          {'label': 'Pushover API Token',
                           'value': plexpy.CONFIG.PUSHOVER_APITOKEN,
                           'name': 'pushover_apitoken',
-                          'description': 'Your Pushover API toekn. Leave blank to use PlexPy default.',
+                          'description': 'Your Pushover API token. Leave blank to use PlexPy default.',
                           'input_type': 'text'
                           }
                          ]
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 93e0682a..7ba6c176 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1305,7 +1305,7 @@ class WebInterface(object):
         checkboxes = {'email_tls': checked(plexpy.CONFIG.EMAIL_TLS)}
 
         return serve_template(templatename="notification_config.html", title="Notification Configuration",
-                              data=config, checkboxes=checkboxes)
+                              config_id=config_id, data=config, checkboxes=checkboxes)
 
     @cherrypy.expose
     def get_notification_agent_triggers(self, config_id, **kwargs):

From 2680162b674bf5073cd92cbaf308bd9fe2f61e52 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Sun, 11 Oct 2015 23:48:12 -0700
Subject: [PATCH 5/7] Add dropdown for Boxcar sounds

---
 plexpy/config.py    |  1 +
 plexpy/notifiers.py | 39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/plexpy/config.py b/plexpy/config.py
index 5716cd84..f9e65086 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -37,6 +37,7 @@ _CONFIG_DEFINITIONS = {
     'API_KEY': (str, 'General', ''),
     'BOXCAR_ENABLED': (int, 'Boxcar', 0),
     'BOXCAR_TOKEN': (str, 'Boxcar', ''),
+    'BOXCAR_SOUND': (str, 'Boxcar', ''),
     'BOXCAR_ON_PLAY': (int, 'Boxcar', 0),
     'BOXCAR_ON_STOP': (int, 'Boxcar', 0),
     'BOXCAR_ON_PAUSE': (int, 'Boxcar', 0),
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 74ee23c9..afeb4d69 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -1168,6 +1168,7 @@ class BOXCAR(object):
     def __init__(self):
         self.url = 'https://new.boxcar.io/api/notifications'
         self.token = plexpy.CONFIG.BOXCAR_TOKEN
+        self.sound = plexpy.CONFIG.BOXCAR_SOUND
         self.on_play = plexpy.CONFIG.BOXCAR_ON_PLAY
         self.on_stop = plexpy.CONFIG.BOXCAR_ON_STOP
         self.on_watched = plexpy.CONFIG.BOXCAR_ON_WATCHED
@@ -1181,7 +1182,7 @@ class BOXCAR(object):
                 'user_credentials': plexpy.CONFIG.BOXCAR_TOKEN,
                 'notification[title]': title.encode('utf-8'),
                 'notification[long_message]': message.encode('utf-8'),
-                'notification[sound]': "done"
+                'notification[sound]': plexpy.CONFIG.BOXCAR_SOUND
                 })
 
             req = urllib2.Request(self.url)
@@ -1199,6 +1200,42 @@ class BOXCAR(object):
                           'name': 'boxcar_token',
                           'description': 'Your Boxcar access token.',
                           'input_type': 'text'
+                          },
+                         {'label': 'Sound',
+                          'value': self.sound,
+                          'name': 'boxcar_sound',
+                          'description': 'Set the notification sound. Leave blank for the default sound.',
+                          'input_type': 'select',
+                          'select_options': {'': '',
+                                             'beep-crisp': 'Beep (Crisp)',
+                                             'beep-soft': 'Beep (Soft)',
+                                             'bell-modern': 'Bell (Modern)',
+                                             'bell-one-tone': 'Bell (One Tone)',
+                                             'bell-simple': 'Bell (Simple)',
+                                             'bell-triple': 'Bell (Triple)',
+                                             'bird-1': 'Bird (1)',
+                                             'bird-2': 'Bird (2)',
+                                             'boing': 'Boing',
+                                             'cash': 'Cash',
+                                             'clanging': 'Clanging',
+                                             'detonator-charge': 'Detonator Charge',
+                                             'digital-alarm': 'Digital Alarm',
+                                             'done': 'Done',
+                                             'echo': 'Echo',
+                                             'flourish': 'Flourish',
+                                             'harp': 'Harp',
+                                             'light': 'Light',
+                                             'magic-chime':'Magic Chime',
+                                             'magic-coin': 'Magic Coin',
+                                             'no-sound': 'No Sound',
+                                             'notifier-1': 'Notifier (1)',
+                                             'notifier-2': 'Notifier (2)',
+                                             'notifier-3': 'Notifier (3)',
+                                             'orchestral-long': 'Orchestral (Long)',
+                                             'orchestral-short': 'Orchestral (Short)',
+                                             'score': 'Score',
+                                             'success': 'Success',
+                                             'up': 'Up'}
                           }
                          ]
 

From c25c48c1a6de8ee678363b1211d16e64d6b05b34 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Mon, 12 Oct 2015 00:28:05 -0700
Subject: [PATCH 6/7] Add watched percent to history table tooltip

---
 .../default/js/tables/history_table.js        | 21 ++++++++++---------
 plexpy/datafactory.py                         |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index 6ff1d674..1cafd218 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -214,13 +214,13 @@ history_table_options = {
         {
             "targets": [11],
             "data": "watched_status",
-            "render": function (data, type, full) {
-                if (data == 1) {
-                    return '<span class="watched-tooltip" data-toggle="tooltip" title="Watched"><i class="fa fa-lg fa-circle"></i></span>'
-                } else if (data == 0.5) {
-                    return '<span class="watched-tooltip" data-toggle="tooltip" title="Partial"><i class="fa fa-lg fa-adjust fa-rotate-180"></i></span>'
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData == 1) {
+                    $(td).html('<span class="watched-tooltip" data-toggle="tooltip" title="' + rowData['percent_complete'] + '%"><i class="fa fa-lg fa-circle"></i></span>');
+                } else if (cellData == 0.5) {
+                    $(td).html('<span class="watched-tooltip" data-toggle="tooltip" title="' + rowData['percent_complete'] + '%"><i class="fa fa-lg fa-adjust fa-rotate-180"></i></span>');
                 } else {
-                    return '<span class="watched-tooltip" data-toggle="tooltip" title="Unwatched"><i class="fa fa-lg fa-circle-o"></i></span>'
+                    $(td).html('<span class="watched-tooltip" data-toggle="tooltip" title="' + rowData['percent_complete'] + '%"><i class="fa fa-lg fa-circle-o"></i></span>');
                 }
             },
             "searchable": false,
@@ -236,12 +236,13 @@ history_table_options = {
 
         // Create the tooltips.
         $('.expand-history-tooltip').tooltip({ container: 'body' });
-        $('.external-ip-tooltip').tooltip();
-        $('.transcode-tooltip').tooltip();
-        $('.media-type-tooltip').tooltip();
-        $('.watched-tooltip').tooltip();
+        $('.external-ip-tooltip').tooltip({ container: 'body' });
+        $('.transcode-tooltip').tooltip({ container: 'body' });
+        $('.media-type-tooltip').tooltip({ container: 'body' });
+        $('.watched-tooltip').tooltip({ container: 'body' });
         $('.thumb-tooltip').popover({
             html: true,
+            container: 'body',
             trigger: 'hover',
             placement: 'right',
             content: function () {
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 0fde3150..f09ae30c 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -136,6 +136,7 @@ class DataFactory(object):
                    "thumb": thumb,
                    "video_decision": item["video_decision"],
                    "audio_decision": item["audio_decision"],
+                   "percent_complete": int(round(item['percent_complete'])),
                    "watched_status": watched_status,
                    "group_count": item["group_count"],
                    "group_ids": item["group_ids"]

From 3299ec7c82e02133fb7b5a4dd4f11bf0b3310c94 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Mon, 12 Oct 2015 00:54:26 -0700
Subject: [PATCH 7/7] Clean up Pushover sound code

---
 plexpy/notifiers.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index afeb4d69..6f3e879b 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -914,18 +914,16 @@ class PUSHOVER(object):
         if request_status == 200:
             data = json.loads(response.read())
             sounds = data.get('sounds', {})
+            sounds.update({'': ''})
             return sounds
         elif request_status >= 400 and request_status < 500:
-            logger.info(u"Unable to retrieve Pushover notification sounds: %s" % response.reason)
-            return {}
+            logger.info(u"Unable to retrieve Pushover notification sounds list: %s" % response.reason)
+            return {'': ''}
         else:
-            logger.info(u"Unable to retrieve Pushover notification sounds.")
-            return {}
+            logger.info(u"Unable to retrieve Pushover notification sounds list.")
+            return {'': ''}
 
     def return_config_options(self):
-        sounds = self.get_sounds()
-        sounds[''] = ''
-
         config_option = [{'label': 'Pushover User Key',
                           'value': self.keys,
                           'name': 'pushover_keys',
@@ -944,7 +942,7 @@ class PUSHOVER(object):
                           'name': 'pushover_sound',
                           'description': 'Set the notification sound. Leave blank for the default sound.',
                           'input_type': 'select',
-                          'select_options': sounds
+                          'select_options': self.get_sounds()
                           },
                          {'label': 'Pushover API Token',
                           'value': plexpy.CONFIG.PUSHOVER_APITOKEN,