@@ -2274,25 +2260,6 @@
}
});
- if ($("#boxcar").is(":checked"))
- {
- $("#boxcar_options").show();
- }
- else
- {
- $("#boxcar_options").hide();
- }
-
- $("#boxcar").click(function(){
- if ($("#boxcar").is(":checked"))
- {
- $("#boxcar_options").slideDown();
- }
- else
- {
- $("#boxcar_options").slideUp();
- }
- });
if ($("#subsonic").is(":checked"))
{
@@ -2603,11 +2570,6 @@
$('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
});
- $('#osxnotifyregister').click(function () {
- var osx_notify_app = $("#osx_notify_reg").val();
- $.get("/osxnotifyregister", {'app': osx_notify_app}, function (data) { $('#ajaxMsg').html("
"+data+"
"); });
- $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut()
- })
}
$(document).ready(function() {
diff --git a/headphones/config.py b/headphones/config.py
index b86ae80f..9693a321 100644
--- a/headphones/config.py
+++ b/headphones/config.py
@@ -54,9 +54,6 @@ _CONFIG_DEFINITIONS = {
'BITRATE': (int, 'General', 192),
'BLACKHOLE': (int, 'General', 0),
'BLACKHOLE_DIR': (path, 'General', ''),
- 'BOXCAR_ENABLED': (int, 'Boxcar', 0),
- 'BOXCAR_ONSNATCH': (int, 'Boxcar', 0),
- 'BOXCAR_TOKEN': (str, 'Boxcar', ''),
'CACHE_DIR': (path, 'General', ''),
'CACHE_SIZEMB': (int, 'Advanced', 32),
'CHECK_GITHUB': (int, 'General', 1),
diff --git a/headphones/notifiers.py b/headphones/notifiers.py
index 64a8eba3..bee6b653 100644
--- a/headphones/notifiers.py
+++ b/headphones/notifiers.py
@@ -849,35 +849,6 @@ class OSX_NOTIFY(object):
return False
-class BOXCAR(object):
- def __init__(self):
- self.url = 'https://new.boxcar.io/api/notifications'
-
- def notify(self, title, message, rgid=None):
- try:
- if rgid:
- message += '
MusicBrainz' % rgid
-
- data = urllib.parse.urlencode({
- 'user_credentials': headphones.CONFIG.BOXCAR_TOKEN,
- 'notification[title]': title.encode('utf-8'),
- 'notification[long_message]': message.encode('utf-8'),
- 'notification[sound]': "done",
- 'notification[icon_url]': "https://raw.githubusercontent.com/rembo10/headphones/master/data/images"
- "/headphoneslogo.png"
- })
-
- req = urllib.request.Request(self.url)
- handle = urllib.request.urlopen(req, data)
- handle.close()
- return True
-
- except urllib.error.URLError as e:
- logger.warn('Error sending Boxcar2 Notification: %s' % e)
- return False
-
-
class SubSonicNotifier(object):
def __init__(self):
self.host = headphones.CONFIG.SUBSONIC_HOST
diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py
index eafb255f..974b7d92 100755
--- a/headphones/postprocessor.py
+++ b/headphones/postprocessor.py
@@ -627,12 +627,6 @@ def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list,
osx = notifiers.OSX_NOTIFY()
osx.notify(f"Headphones Processed", f"{pushmessage}\n{statusmessage}")
- if headphones.CONFIG.BOXCAR_ENABLED:
- logger.info("Sending Boxcar2 notification")
- boxcar = notifiers.BOXCAR()
- boxcar.notify('Headphones processed: ' + pushmessage,
- statusmessage, release['AlbumID'])
-
if headphones.CONFIG.SUBSONIC_ENABLED:
logger.info("Sending Subsonic update")
subsonic = notifiers.SubSonicNotifier()
diff --git a/headphones/searcher.py b/headphones/searcher.py
index c7dedb7b..2440f317 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -1234,11 +1234,6 @@ def send_to_downloader(data, result, album):
osx = notifiers.OSX_NOTIFY()
osx.notify(f"Headphones Snatched", f"{artist} - {albumname}\nFrom {provider}, {name}")
- if headphones.CONFIG.BOXCAR_ENABLED and headphones.CONFIG.BOXCAR_ONSNATCH:
- logger.info("Sending Boxcar2 notification")
- b2msg = 'From ' + provider + '
' + name
- boxcar = notifiers.BOXCAR()
- boxcar.notify('Headphones snatched: ' + title, b2msg, rgid)
if headphones.CONFIG.EMAIL_ENABLED and headphones.CONFIG.EMAIL_ONSNATCH:
logger.info("Sending Email notification")
email = notifiers.Email()
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 57cc856e..0351b2f0 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -1369,9 +1369,6 @@ class WebInterface(object):
"twitter_onsnatch": checked(headphones.CONFIG.TWITTER_ONSNATCH),
"osx_notify_enabled": checked(headphones.CONFIG.OSX_NOTIFY_ENABLED),
"osx_notify_onsnatch": checked(headphones.CONFIG.OSX_NOTIFY_ONSNATCH),
- "boxcar_enabled": checked(headphones.CONFIG.BOXCAR_ENABLED),
- "boxcar_onsnatch": checked(headphones.CONFIG.BOXCAR_ONSNATCH),
- "boxcar_token": headphones.CONFIG.BOXCAR_TOKEN,
"mirrorlist": headphones.MIRRORLIST,
"mirror": headphones.CONFIG.MIRROR,
"customhost": headphones.CONFIG.CUSTOMHOST,
@@ -1479,7 +1476,7 @@ class WebInterface(object):
"pushover_onsnatch", "pushbullet_enabled", "pushbullet_onsnatch", "subsonic_enabled",
"twitter_enabled", "twitter_onsnatch",
"telegram_enabled", "telegram_onsnatch",
- "osx_notify_enabled", "osx_notify_onsnatch", "boxcar_enabled", "boxcar_onsnatch",
+ "osx_notify_enabled", "osx_notify_onsnatch",
"songkick_enabled", "songkick_filter_enabled",
"mpc_enabled", "email_enabled", "email_ssl", "email_tls", "email_onsnatch",
"customauth", "idtag", "deluge_paused",