diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 73acd5e1..60aeaf99 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -740,22 +740,6 @@ -
-

Boxcar.IO

-
- -
-
-
-
- -
- - -
-
-
-

Pushbullet

@@ -1479,25 +1463,6 @@ $("#pushbulletoptions").hide(); } - if ($("#boxcar").is(":checked")) - { - $("#boxcaroptions").show(); - } - else - { - $("#boxcaroptions").hide(); - } - - $("#boxcar").click(function(){ - if ($("#boxcar").is(":checked")) - { - $("#boxcaroptions").slideDown(); - } - else - { - $("#boxcaroptions").slideUp(); - } - }); $("#pushbullet").click(function(){ if ($("#pushbullet").is(":checked")) diff --git a/headphones/__init__.py b/headphones/__init__.py index 7e2a6201..b354291b 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -258,10 +258,6 @@ PUSHOVER_PRIORITY = 1 PUSHOVER_KEYS = None PUSHOVER_ONSNATCH = True PUSHOVER_APITOKEN = None -BOXCAR_ENABLED = False -BOXCAR_USERNAME = None -BOXCAR_ONSNATCH = False - PUSHBULLET_ENABLED = True PUSHBULLET_APIKEY = None PUSHBULLET_DEVICEID = None @@ -608,10 +604,6 @@ def initialize(): PUSHOVER_PRIORITY = check_setting_int(CFG, 'Pushover', 'pushover_priority', 0) PUSHOVER_APITOKEN = check_setting_str(CFG, 'Pushover', 'pushover_apitoken', '') - BOXCAR_ENABLED = bool(check_setting_int(CFG, 'BOXCAR', 'boxcar_enabled', 0)) - BOXCAR_USERNAME = check_setting_str(CFG, 'BOXCAR', 'boxcar_username', '') - BOXCAR_ONSNATCH = bool(check_setting_int(CFG, 'BOXCAR', 'boxcar_onsnatch', 0)) - PUSHBULLET_ENABLED = bool(check_setting_int(CFG, 'PushBullet', 'pushbullet_enabled', 0)) PUSHBULLET_APIKEY = check_setting_str(CFG, 'PushBullet', 'pushbullet_apikey', '') PUSHBULLET_DEVICEID = check_setting_str(CFG, 'PushBullet', 'pushbullet_deviceid', '') @@ -1033,11 +1025,6 @@ def config_write(): new_config['Pushover']['pushover_priority'] = int(PUSHOVER_PRIORITY) new_config['Pushover']['pushover_apitoken'] = PUSHOVER_APITOKEN - new_config['BOXCAR'] = {} - new_config['BOXCAR']['boxcar_enabled'] = int(BOXCAR_ENABLED) - new_config['BOXCAR']['boxcar_username'] = BOXCAR_USERNAME - new_config['BOXCAR']['boxcar_onsnatch'] = int(BOXCAR_ONSNATCH) - new_config['PushBullet'] = {} new_config['PushBullet']['pushbullet_enabled'] = int(PUSHBULLET_ENABLED) new_config['PushBullet']['pushbullet_apikey'] = PUSHBULLET_APIKEY diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index 684c2f70..d1ccbee4 100644 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -479,12 +479,6 @@ def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, pushover = notifiers.PUSHOVER() pushover.notify(pushmessage,"Headphones") - if headphones.BOXCAR_ENABLED: - pushmessage = release['ArtistName'] + ' - ' + release['AlbumTitle'] - logger.info(u"Boxcar request") - boxcar = notifiers.BOXCAR() - boxcar.notify(artist=release['ArtistName'], album=release['AlbumTitle']) - if headphones.PUSHBULLET_ENABLED: pushmessage = release['ArtistName'] + ' - ' + release['AlbumTitle'] logger.info(u"PushBullet request") diff --git a/headphones/webserve.py b/headphones/webserve.py index c9288310..517104ab 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -1060,9 +1060,6 @@ class WebInterface(object): "pushover_keys": headphones.PUSHOVER_KEYS, "pushover_apitoken": headphones.PUSHOVER_APITOKEN, "pushover_priority": headphones.PUSHOVER_PRIORITY, - "boxcar_enabled": helpers.checked(headphones.BOXCAR_ENABLED), - "boxcar_username": headphones.BOXCAR_USERNAME, - "boxcar_onsnatch": helpers.checked(headphones.BOXCAR_ONSNATCH), "pushbullet_enabled": checked(headphones.PUSHBULLET_ENABLED), "pushbullet_onsnatch": checked(headphones.PUSHBULLET_ONSNATCH), "pushbullet_apikey": headphones.PUSHBULLET_APIKEY, @@ -1275,9 +1272,6 @@ class WebInterface(object): headphones.PUSHOVER_KEYS = pushover_keys headphones.PUSHOVER_PRIORITY = pushover_priority headphones.PUSHOVER_APITOKEN = pushover_apitoken - headphones.BOXCAR_ENABLED = boxcar_enabled - headphones.BOXCAR_USERNAME = boxcar_username - headphones.BOXCAR_ONSNATCH = boxcar_onsnatch headphones.PUSHBULLET_ENABLED = pushbullet_enabled headphones.PUSHBULLET_ONSNATCH = pushbullet_onsnatch headphones.PUSHBULLET_APIKEY = pushbullet_apikey