diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index d1c392d5..9413d587 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -871,7 +871,22 @@ - +
+

Pushalot

+
+ +
+
+
+ +
+
+ + + Separate multiple api keys with commas +
+
+

Synology NAS

@@ -1190,6 +1205,27 @@ $("#nmaoptions").slideUp(); } }); + + if ($("#pushalot").is(":checked")) + { + $("#pushalotoptions").show(); + } + else + { + $("#pushalotoptions").hide(); + } + + $("#pushalot").click(function(){ + if ($("#pushalot").is(":checked")) + { + $("#pushalotoptions").slideDown(); + } + else + { + $("#pushalotoptions").slideUp(); + } + }); + if ($("#pushover").is(":checked")) { $("#pushoveroptions").show(); diff --git a/headphones/__init__.py b/headphones/__init__.py index b3c7bcc5..94eeb545 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -240,6 +240,9 @@ NMA_ENABLED = False NMA_APIKEY = None NMA_PRIORITY = None NMA_ONSNATCH = None +PUSHALOT_ENABLED = False +PUSHALOT_APIKEY = None +PUSHALOT_ONSNATCH = None SYNOINDEX_ENABLED = False PUSHOVER_ENABLED = True PUSHOVER_PRIORITY = 1 @@ -332,7 +335,11 @@ def initialize(): MIRROR, CUSTOMHOST, CUSTOMPORT, CUSTOMSLEEP, HPUSER, HPPASS, XBMC_ENABLED, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, XBMC_UPDATE, \ XBMC_NOTIFY, NMA_ENABLED, NMA_APIKEY, NMA_PRIORITY, NMA_ONSNATCH, SYNOINDEX_ENABLED, ALBUM_COMPLETION_PCT, PREFERRED_BITRATE_HIGH_BUFFER, \ PREFERRED_BITRATE_LOW_BUFFER, PREFERRED_BITRATE_ALLOW_LOSSLESS, CACHE_SIZEMB, JOURNAL_MODE, UMASK, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \ +<<<<<<< HEAD PLEX_ENABLED, PLEX_SERVER_HOST, PLEX_CLIENT_HOST, PLEX_USERNAME, PLEX_PASSWORD, PLEX_UPDATE, PLEX_NOTIFY +======= + PUSHALOT_ENABLED, PUSHALOT_APIKEY, PUSHALOT_ONSNATCH +>>>>>>> echel0n/pushalot if __INITIALIZED__: return False @@ -356,6 +363,7 @@ def initialize(): CheckSection('XBMC') CheckSection('Plex') CheckSection('NMA') + CheckSection('Pushalot') CheckSection('Synoindex') CheckSection('Twitter') CheckSection('Advanced') @@ -544,6 +552,10 @@ def initialize(): NMA_PRIORITY = check_setting_int(CFG, 'NMA', 'nma_priority', 0) NMA_ONSNATCH = bool(check_setting_int(CFG, 'NMA', 'nma_onsnatch', 0)) + PUSHALOT_ENABLED = bool(check_setting_int(CFG, 'Pushalot', 'pushalot_enabled', 0)) + PUSHALOT_APIKEY = check_setting_str(CFG, 'Pushalot', 'pushalot_apikey', '') + PUSHALOT_ONSNATCH = bool(check_setting_int(CFG, 'Pushalot', 'pushalot_onsnatch', 0)) + SYNOINDEX_ENABLED = bool(check_setting_int(CFG, 'Synoindex', 'synoindex_enabled', 0)) PUSHOVER_ENABLED = bool(check_setting_int(CFG, 'Pushover', 'pushover_enabled', 0)) @@ -924,7 +936,12 @@ def config_write(): new_config['NMA']['nma_enabled'] = int(NMA_ENABLED) new_config['NMA']['nma_apikey'] = NMA_APIKEY new_config['NMA']['nma_priority'] = NMA_PRIORITY - new_config['NMA']['nma_onsnatch'] = int(PROWL_ONSNATCH) + new_config['NMA']['nma_onsnatch'] = int(NMA_ONSNATCH) + + new_config['Pushalot'] = {} + new_config['Pushalot']['pushalot_enabled'] = int(PUSHALOT_ENABLED) + new_config['Pushalot']['pushalot_apikey'] = PUSHALOT_APIKEY + new_config['Pushalot']['pushalot_onsnatch'] = int(PUSHALOT_ONSNATCH) new_config['Pushover'] = {} new_config['Pushover']['pushover_enabled'] = int(PUSHOVER_ENABLED) diff --git a/headphones/notifiers.py b/headphones/notifiers.py index d4921f62..a3a344a3 100644 --- a/headphones/notifiers.py +++ b/headphones/notifiers.py @@ -324,6 +324,44 @@ class NMA: if not request: logger.warn('Error sending notification request to NotifyMyAndroid') +class PUSHALOT: + + def notify(self, message, event): + if not headphones.PUSHALOT_ENABLED: + return + + pushalot_authorizationtoken = headphones.PUSHALOT_APIKEY + + logger.debug(u"Pushalot event: " + event) + logger.debug(u"Pushalot message: " + message) + logger.debug(u"Pushalot api: " + pushalot_authorizationtoken) + + http_handler = HTTPSConnection("pushalot.com") + + data = {'AuthorizationToken': pushalot_authorizationtoken, + 'Title': event.encode('utf-8'), + 'Body': message.encode("utf-8") } + + http_handler.request("POST", + "/api/sendmessage", + headers = {'Content-type': "application/x-www-form-urlencoded"}, + body = urlencode(data)) + response = http_handler.getresponse() + request_status = response.status + + logger.debug(u"Pushalot response status: %r" % request_status) + logger.debug(u"Pushalot response headers: %r" % response.getheaders()) + logger.debug(u"Pushalot response body: %r" % response.read()) + + if request_status == 200: + logger.info(u"Pushalot notifications sent.") + return True + elif request_status == 410: + logger.info(u"Pushalot auth failed: %s" % response.reason) + return False + else: + logger.info(u"Pushalot notification failed.") + return False class Synoindex: def __init__(self, util_loc='/usr/syno/bin/synoindex'): diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index 18c8cbb6..d9ada20e 100644 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -431,6 +431,12 @@ def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, nma = notifiers.NMA() nma.notify(release['ArtistName'], release['AlbumTitle']) + if headphones.PUSHALOT_ENABLED: + pushmessage = release['ArtistName'] + ' - ' + release['AlbumTitle'] + logger.info(u"Pushalot request") + pushalot = notifiers.PUSHALOT() + pushalot.notify(pushmessage,"Download and Postprocessing completed") + if headphones.SYNOINDEX_ENABLED: syno = notifiers.Synoindex() for albumpath in albumpaths: diff --git a/headphones/sab.py b/headphones/sab.py index c49d1202..f7587fcd 100644 --- a/headphones/sab.py +++ b/headphones/sab.py @@ -135,6 +135,10 @@ def sendNZB(nzb): logger.debug(u"Sending NMA notification") nma = notifiers.NMA() nma.notify(snatched_nzb=nzb.name) + if headphones.PUSHALOT_ENABLED and headphones.PUSHALOT_ONSNATCH: + logger.info(u"Sending Pushalot notification") + pushalot = notifiers.PUSHALOT() + pushalot.notify(nzb.name,"Download started") return True elif sabText == "Missing authentication": diff --git a/headphones/transmission.py b/headphones/transmission.py index eb25ce56..5f54ec67 100644 --- a/headphones/transmission.py +++ b/headphones/transmission.py @@ -56,6 +56,10 @@ def addTorrent(link): logger.debug(u"Sending NMA notification") nma = notifiers.NMA() nma.notify(snatched_nzb=name) + if headphones.PUSHALOT_ENABLED and headphones.PUSHALOT_ONSNATCH: + logger.info(u"Sending Pushalot notification") + pushalot = notifiers.PUSHALOT() + pushalot.notify(name,"Download started") return response['arguments']['torrent-added']['id'] diff --git a/headphones/webserve.py b/headphones/webserve.py index 8f10d58b..7d5277e4 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -944,6 +944,9 @@ class WebInterface(object): "nma_apikey": headphones.NMA_APIKEY, "nma_priority": int(headphones.NMA_PRIORITY), "nma_onsnatch": checked(headphones.NMA_ONSNATCH), + "pushalot_enabled": checked(headphones.PUSHALOT_ENABLED), + "pushalot_apikey": headphones.PUSHALOT_APIKEY, + "pushalot_onsnatch": checked(headphones.PUSHALOT_ONSNATCH), "synoindex_enabled": checked(headphones.SYNOINDEX_ENABLED), "pushover_enabled": checked(headphones.PUSHOVER_ENABLED), "pushover_onsnatch": checked(headphones.PUSHOVER_ONSNATCH), @@ -992,7 +995,7 @@ class WebInterface(object): remix=0, spokenword=0, audiobook=0, autowant_upcoming=False, autowant_all=False, keep_torrent_files=False, interface=None, log_dir=None, cache_dir=None, music_encoder=0, encoder=None, xldprofile=None, bitrate=None, samplingfrequency=None, encoderfolder=None, advancedencoder=None, encoderoutputformat=None, encodervbrcbr=None, encoderquality=None, encoderlossless=0, delete_lossless_files=0, prowl_enabled=0, prowl_onsnatch=0, prowl_keys=None, prowl_priority=0, xbmc_enabled=0, xbmc_host=None, xbmc_username=None, xbmc_password=None, - xbmc_update=0, xbmc_notify=0, nma_enabled=False, nma_apikey=None, nma_priority=0, nma_onsnatch=0, synoindex_enabled=False, + xbmc_update=0, xbmc_notify=0, nma_enabled=False, nma_apikey=None, nma_priority=0, nma_onsnatch=0, pushalot_enabled=False, pushalot_apikey=None, pushalot_onsnatch=0, synoindex_enabled=False, pushover_enabled=0, pushover_onsnatch=0, pushover_keys=None, pushover_priority=0, twitter_enabled=0, twitter_onsnatch=0, mirror=None, customhost=None, customport=None, customsleep=None, hpuser=None, hppass=None, preferred_bitrate_high_buffer=None, preferred_bitrate_low_buffer=None, preferred_bitrate_allow_lossless=0, cache_sizemb=None, enable_https=0, https_cert=None, https_key=None, file_permissions=None, folder_permissions=None, plex_enabled=0, plex_server_host=None, plex_client_host=None, plex_username=None, @@ -1126,6 +1129,9 @@ class WebInterface(object): headphones.NMA_APIKEY = nma_apikey headphones.NMA_PRIORITY = nma_priority headphones.NMA_ONSNATCH = nma_onsnatch + headphones.PUSHALOT_ENABLED = pushalot_enabled + headphones.PUSHALOT_APIKEY = pushalot_apikey + headphones.PUSHALOT_ONSNATCH = pushalot_onsnatch headphones.SYNOINDEX_ENABLED = synoindex_enabled headphones.PUSHOVER_ENABLED = pushover_enabled headphones.PUSHOVER_ONSNATCH = pushover_onsnatch