github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-22 14:13:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Hide debug stuff, and make the event customizable

Browse source
This commit is contained in:
rossdargan 2015-10-11 22:07:35 +01:00
commit 937d114125
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plexpy/config.py
View file

@ -182,6 +182,7 @@ _CONFIG_DEFINITIONS = {
'PUSHBULLET_ON_BUFFER': (int, 'PushBullet', 0), 'PUSHBULLET_ON_BUFFER': (int, 'PushBullet', 0),
'PUSHBULLET_ON_WATCHED': (int, 'PushBullet', 0), 'PUSHBULLET_ON_WATCHED': (int, 'PushBullet', 0),
'IFTTT_KEY': (str, 'Ifttt', ''), 'IFTTT_KEY': (str, 'Ifttt', ''),
'IFTTT_EVENT': (str, 'Ifttt', 'plextv'),
'IFTTT_ENABLED': (int, 'IFTTT', 0), 'IFTTT_ENABLED': (int, 'IFTTT', 0),
'IFTTT_ON_PLAY': (int, 'IFTTT', 0), 'IFTTT_ON_PLAY': (int, 'IFTTT', 0),
'IFTTT_ON_STOP': (int, 'IFTTT', 0), 'IFTTT_ON_STOP': (int, 'IFTTT', 0),

26
plexpy/notifiers.py
View file

@ -1277,6 +1277,7 @@ class IFTTT(object):
def __init__(self): def __init__(self):
self.apikey = plexpy.CONFIG.IFTTT_KEY self.apikey = plexpy.CONFIG.IFTTT_KEY
self.event = plexpy.CONFIG.IFTTT_EVENT
self.on_play = plexpy.CONFIG.IFTTT_ON_PLAY self.on_play = plexpy.CONFIG.IFTTT_ON_PLAY
self.on_stop = plexpy.CONFIG.IFTTT_ON_STOP self.on_stop = plexpy.CONFIG.IFTTT_ON_STOP
self.on_watched = plexpy.CONFIG.IFTTT_ON_WATCHED self.on_watched = plexpy.CONFIG.IFTTT_ON_WATCHED
@ -1285,25 +1286,26 @@ class IFTTT(object):
def notify(self, message, subject): def notify(self, message, subject):
if not message or not subject: if not message or not subject:
return return
# This should be the contex we use, but it isn't working as it casues an SSL validation error
context = ssl.create_default_context() # Unfortunately this is beyond my phython ability!
#context = ssl._create_unverified_context() #context = ssl.create_default_context()
context = ssl._create_unverified_context()
http_handler = HTTPSConnection("maker.ifttt.com", context=context) http_handler = HTTPSConnection("maker.ifttt.com", context=context)
data = {'value1': subject.encode("utf-8"), data = {'value1': subject.encode("utf-8"),
'value2': message.encode("utf-8")} 'value2': message.encode("utf-8")}
logger.debug("Ifttt SENDING: %s" % json.dumps(data)) #logger.debug("Ifttt SENDING: %s" % json.dumps(data))
http_handler.request("POST", http_handler.request("POST",
"/trigger/plextv/with/key/%s" % plexpy.CONFIG.IFTTT_KEY, "/trigger/%s/with/key/%s" % (plexpy.CONFIG.IFTTT_EVENT, plexpy.CONFIG.IFTTT_KEY),
headers={'Content-type': "application/json"}, headers={'Content-type': "application/json"},
body=json.dumps(data)) body=json.dumps(data))
response = http_handler.getresponse() response = http_handler.getresponse()
request_status = response.status request_status = response.status
logger.debug(u"Ifttt response status: %r" % request_status) #logger.debug(u"Ifttt response status: %r" % request_status)
logger.debug(u"Ifttt response headers: %r" % response.getheaders()) #logger.debug(u"Ifttt response headers: %r" % response.getheaders())
logger.debug(u"Ifttt response body: %r" % response.read()) #logger.debug(u"Ifttt response body: %r" % response.read())
if request_status == 200: if request_status == 200:
logger.info(u"Ifttt notifications sent.") logger.info(u"Ifttt notifications sent.")
@ -1326,7 +1328,13 @@ class IFTTT(object):
config_option = [{'label': 'Ifttt Maker Channel Key', config_option = [{'label': 'Ifttt Maker Channel Key',
'value': self.apikey, 'value': self.apikey,
'name': 'ifttt_key', 'name': 'ifttt_key',
'description': 'Your Pushbullet key.', 'description': 'Your Ifttt key. You can get a key from here https://ifttt.com/maker',
'input_type': 'text'
},
{'label': 'Ifttt event',
'value': self.apikey,
'name': 'ifttt_event',
'description': 'The Ifttt maker event to fire.',
'input_type': 'text' 'input_type': 'text'
} }
] ]