mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-15 09:42:57 -07:00
Update Plex Home Theater and XBMC notification agents
This commit is contained in:
JonnyWong16
parent
5f28ead6e9
commit
cb5252b8d4
2 changed files with 68 additions and 14 deletions
|
|
@ -32,7 +32,7 @@
|
||||||
<label>${item['label']}</label>
|
<label>${item['label']}</label>
|
||||||
<p class="help-block">${item['description'] | n}</p>
|
<p class="help-block">${item['description'] | n}</p>
|
||||||
</div>
|
</div>
|
||||||
% elif item['input_type'] == 'text' or item['input_type'] == 'number' or item['input_type'] == 'password':
|
% elif item['input_type'] == 'text' or item['input_type'] == 'password':
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="${item['name']}">${item['label']}</label>
|
<label for="${item['name']}">${item['label']}</label>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
@ -45,6 +45,16 @@
|
||||||
</div>
|
</div>
|
||||||
<p class="help-block">${item['description'] | n}</p>
|
<p class="help-block">${item['description'] | n}</p>
|
||||||
</div>
|
</div>
|
||||||
|
% elif item['input_type'] == 'number':
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="${item['name']}">${item['label']}</label>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-3">
|
||||||
|
<input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="help-block">${item['description'] | n}</p>
|
||||||
|
</div>
|
||||||
% elif item['input_type'] == 'button':
|
% elif item['input_type'] == 'button':
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="${item['name']}">${item['label']}</label>
|
<label for="${item['name']}">${item['label']}</label>
|
||||||
|
|
|
||||||
|
|
@ -1756,7 +1756,9 @@ class PLEX(Notifier):
|
||||||
"""
|
"""
|
||||||
_DEFAULT_CONFIG = {'hosts': '',
|
_DEFAULT_CONFIG = {'hosts': '',
|
||||||
'username': '',
|
'username': '',
|
||||||
'password': ''
|
'password': '',
|
||||||
|
'display_time': 5,
|
||||||
|
'image': ''
|
||||||
}
|
}
|
||||||
|
|
||||||
def _sendhttp(self, host, command):
|
def _sendhttp(self, host, command):
|
||||||
|
|
@ -1788,7 +1790,15 @@ class PLEX(Notifier):
|
||||||
|
|
||||||
hosts = [x.strip() for x in self.config['hosts'].split(',')]
|
hosts = [x.strip() for x in self.config['hosts'].split(',')]
|
||||||
|
|
||||||
display_time = "3000" # in ms
|
if self.config['display_time'] > 0:
|
||||||
|
display_time = 1000 * self.config['display_time'] # in ms
|
||||||
|
else:
|
||||||
|
display_time = 5000
|
||||||
|
|
||||||
|
if self.config['image']:
|
||||||
|
image = self.config['image']
|
||||||
|
else:
|
||||||
|
image = os.path.join(plexpy.DATA_DIR, os.path.abspath("data/interfaces/default/images/favicon.png"))
|
||||||
|
|
||||||
for host in hosts:
|
for host in hosts:
|
||||||
logger.info(u"PlexPy Notifiers :: Sending notification command to Plex Home Theater @ " + host)
|
logger.info(u"PlexPy Notifiers :: Sending notification command to Plex Home Theater @ " + host)
|
||||||
|
|
@ -1796,12 +1806,12 @@ class PLEX(Notifier):
|
||||||
version = self._sendjson(host, 'Application.GetProperties', {'properties': ['version']})['version']['major']
|
version = self._sendjson(host, 'Application.GetProperties', {'properties': ['version']})['version']['major']
|
||||||
|
|
||||||
if version < 12: # Eden
|
if version < 12: # Eden
|
||||||
notification = subject + "," + body + "," + display_time
|
notification = subject + "," + body + "," + str(display_time)
|
||||||
notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'}
|
notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'}
|
||||||
request = self._sendhttp(host, notifycommand)
|
request = self._sendhttp(host, notifycommand)
|
||||||
|
|
||||||
else: # Frodo
|
else: # Frodo
|
||||||
params = {'title': subject, 'message': body, 'displaytime': int(display_time)}
|
params = {'title': subject, 'message': body, 'displaytime': display_time, 'image': image}
|
||||||
request = self._sendjson(host, 'GUI.ShowNotification', params)
|
request = self._sendjson(host, 'GUI.ShowNotification', params)
|
||||||
|
|
||||||
if not request:
|
if not request:
|
||||||
|
|
@ -1809,8 +1819,8 @@ class PLEX(Notifier):
|
||||||
else:
|
else:
|
||||||
logger.info(u"PlexPy Notifiers :: Plex Home Theater notification sent.")
|
logger.info(u"PlexPy Notifiers :: Plex Home Theater notification sent.")
|
||||||
|
|
||||||
except Exception:
|
except Exception as e:
|
||||||
logger.warn(u"PlexPy Notifiers :: Plex Home Theater notification failed.")
|
logger.warn(u"PlexPy Notifiers :: Plex Home Theater notification failed: %s." % e)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
@ -1833,6 +1843,18 @@ class PLEX(Notifier):
|
||||||
'name': 'plex_password',
|
'name': 'plex_password',
|
||||||
'description': 'Password of your Plex Home Theater client API (blank for none).',
|
'description': 'Password of your Plex Home Theater client API (blank for none).',
|
||||||
'input_type': 'password'
|
'input_type': 'password'
|
||||||
|
},
|
||||||
|
{'label': 'Notification Duration',
|
||||||
|
'value': self.config['display_time'],
|
||||||
|
'name': 'plex_display_time',
|
||||||
|
'description': 'The duration (in seconds) for the notification to stay on screen.',
|
||||||
|
'input_type': 'number'
|
||||||
|
},
|
||||||
|
{'label': 'Notification Icon',
|
||||||
|
'value': self.config['image'],
|
||||||
|
'name': 'plex_image',
|
||||||
|
'description': 'Full path or URL to an image to display with the notification. Leave blank for the default.',
|
||||||
|
'input_type': 'text'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
@ -2221,7 +2243,7 @@ class SCRIPTS(Notifier):
|
||||||
cwd=self.config['script_folder'])
|
cwd=self.config['script_folder'])
|
||||||
|
|
||||||
if self.config['timeout']:
|
if self.config['timeout']:
|
||||||
timer = threading.Timer(self.script_timeout, kill_script, (process,))
|
timer = threading.Timer(self.config['timeout'], kill_script, (process,))
|
||||||
else:
|
else:
|
||||||
timer = None
|
timer = None
|
||||||
|
|
||||||
|
|
@ -2712,7 +2734,9 @@ class XBMC(Notifier):
|
||||||
"""
|
"""
|
||||||
_DEFAULT_CONFIG = {'hosts': '',
|
_DEFAULT_CONFIG = {'hosts': '',
|
||||||
'username': '',
|
'username': '',
|
||||||
'password': ''
|
'password': '',
|
||||||
|
'display_time': 5,
|
||||||
|
'image': ''
|
||||||
}
|
}
|
||||||
|
|
||||||
def _sendhttp(self, host, command):
|
def _sendhttp(self, host, command):
|
||||||
|
|
@ -2744,7 +2768,15 @@ class XBMC(Notifier):
|
||||||
|
|
||||||
hosts = [x.strip() for x in self.config['hosts'].split(',')]
|
hosts = [x.strip() for x in self.config['hosts'].split(',')]
|
||||||
|
|
||||||
display_time = "3000" # in ms
|
if self.config['display_time'] > 0:
|
||||||
|
display_time = 1000 * self.config['display_time'] # in ms
|
||||||
|
else:
|
||||||
|
display_time = 5000
|
||||||
|
|
||||||
|
if self.config['image']:
|
||||||
|
image = self.config['image']
|
||||||
|
else:
|
||||||
|
image = os.path.join(plexpy.DATA_DIR, os.path.abspath("data/interfaces/default/images/favicon.png"))
|
||||||
|
|
||||||
for host in hosts:
|
for host in hosts:
|
||||||
logger.info(u"PlexPy Notifiers :: Sending notification command to XMBC @ " + host)
|
logger.info(u"PlexPy Notifiers :: Sending notification command to XMBC @ " + host)
|
||||||
|
|
@ -2752,12 +2784,12 @@ class XBMC(Notifier):
|
||||||
version = self._sendjson(host, 'Application.GetProperties', {'properties': ['version']})['version']['major']
|
version = self._sendjson(host, 'Application.GetProperties', {'properties': ['version']})['version']['major']
|
||||||
|
|
||||||
if version < 12: # Eden
|
if version < 12: # Eden
|
||||||
notification = subject + "," + body + "," + display_time
|
notification = subject + "," + body + "," + str(display_time)
|
||||||
notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'}
|
notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'}
|
||||||
request = self._sendhttp(host, notifycommand)
|
request = self._sendhttp(host, notifycommand)
|
||||||
|
|
||||||
else: # Frodo
|
else: # Frodo
|
||||||
params = {'title': subject, 'message': body, 'displaytime': int(display_time)}
|
params = {'title': subject, 'message': body, 'displaytime': display_time, 'image': image}
|
||||||
request = self._sendjson(host, 'GUI.ShowNotification', params)
|
request = self._sendjson(host, 'GUI.ShowNotification', params)
|
||||||
|
|
||||||
if not request:
|
if not request:
|
||||||
|
|
@ -2765,8 +2797,8 @@ class XBMC(Notifier):
|
||||||
else:
|
else:
|
||||||
logger.info(u"PlexPy Notifiers :: XBMC notification sent.")
|
logger.info(u"PlexPy Notifiers :: XBMC notification sent.")
|
||||||
|
|
||||||
except Exception:
|
except Exception as e:
|
||||||
logger.warn(u"PlexPy Notifiers :: XBMC notification failed.")
|
logger.warn(u"PlexPy Notifiers :: Plex Home Theater notification failed: %s." % e)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
@ -2789,6 +2821,18 @@ class XBMC(Notifier):
|
||||||
'name': 'xbmc_password',
|
'name': 'xbmc_password',
|
||||||
'description': 'Password of your XBMC client API (blank for none).',
|
'description': 'Password of your XBMC client API (blank for none).',
|
||||||
'input_type': 'password'
|
'input_type': 'password'
|
||||||
|
},
|
||||||
|
{'label': 'Notification Duration',
|
||||||
|
'value': self.config['display_time'],
|
||||||
|
'name': 'xbmc_display_time',
|
||||||
|
'description': 'The duration (in seconds) for the notification to stay on screen.',
|
||||||
|
'input_type': 'number'
|
||||||
|
},
|
||||||
|
{'label': 'Notification Icon',
|
||||||
|
'value': self.config['image'],
|
||||||
|
'name': 'xbmc_image',
|
||||||
|
'description': 'Full path or URL to an image to display with the notification. Leave blank for the default.',
|
||||||
|
'input_type': 'text'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue