Hardcode Pushover sounds list (Fixes Tautulli/Tautulli-Issues#65)

This commit is contained in:
JonnyWong16 2018-04-28 20:07:36 -07:00
parent 30bc3f8a66
commit 5710bcb43c

View file

@ -2796,24 +2796,53 @@ class PUSHOVER(Notifier):
return self.make_request('https://api.pushover.net/1/messages.json', headers=headers, data=data, files=files) return self.make_request('https://api.pushover.net/1/messages.json', headers=headers, data=data, files=files)
def get_sounds(self): def get_sounds(self):
if self.config['api_token']: sounds = {
params = {'token': self.config['api_token']} '': '',
'alien': 'Alien Alarm (long)',
'bike': 'Bike',
'bugle': 'Bugle',
'cashregister': 'Cash Register',
'classical': 'Classical',
'climb': 'Climb (long)',
'cosmic': 'Cosmic',
'echo': 'Pushover Echo (long)',
'falling': 'Falling',
'gamelan': 'Gamelan',
'incoming': 'Incoming',
'intermission': 'Intermission',
'magic': 'Magic',
'mechanical': 'Mechanical',
'none': 'None (silent)',
'persistent': 'Persistent (long)',
'pianobar': 'Piano Bar',
'pushover': 'Pushover (default)',
'siren': 'Siren',
'spacealarm': 'Space Alarm',
'tugboat': 'Tug Boat',
'updown': 'Up Down (long)'
}
r = requests.get('https://api.pushover.net/1/sounds.json', params=params) return sounds
if r.status_code == 200: # if self.config['api_token']:
response_data = r.json() # params = {'token': self.config['api_token']}
sounds = response_data.get('sounds', {}) #
sounds.update({'': ''}) # r = requests.get('https://api.pushover.net/1/sounds.json', params=params)
return sounds #
else: # if r.status_code == 200:
logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} sounds list: " # response_data = r.json()
u"[{r.status_code}] {r.reason}".format(name=self.NAME, r=r)) # sounds = response_data.get('sounds', {})
logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True))) # sounds.update({'': ''})
return {'': ''} # print sounds
# return sounds
else: # else:
return {'': ''} # logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} sounds list: "
# u"[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
# logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
# return {'': ''}
#
# else:
# return {'': ''}
def return_config_options(self): def return_config_options(self):
config_option = [{'label': 'Pushover API Token', config_option = [{'label': 'Pushover API Token',