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

Clean up for welcome page

Browse source
This commit is contained in:
Jonathan Wong 2016-01-15 20:30:10 -08:00
parent 381c3da31c
commit 002cb93187
7 changed files with 124 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/interfaces/default/css/plexpy.css
View file

@ -2702,4 +2702,7 @@ table[id^='media_info_child'] table[id^='media_info_child'] thead th {
color: #444; color: #444;
text-align: center; text-align: center;
background-color: #2f2f2f; background-color: #2f2f2f;
}
.selectize-input input[type='text'] {
height: 20px;
} }

2
data/interfaces/default/settings.html
View file

@ -837,11 +837,9 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<input class="form-control" type="text" id="notify_scripts_args_text" name="notify_scripts_args_text" value="${config['notify_scripts_args_text']}" data-parsley-trigger="change"> <input class="form-control" type="text" id="notify_scripts_args_text" name="notify_scripts_args_text" value="${config['notify_scripts_args_text']}" data-parsley-trigger="change">
<p class="help-block">Set custom arguments passed to the scripts.</p> <p class="help-block">Set custom arguments passed to the scripts.</p>
</div> </div>
</li> </li>
</ul> </ul>
</li> </li>
</ul> </ul>
<p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p> <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
</div> </div>

87
data/interfaces/default/welcome.html
View file

@ -372,41 +372,43 @@ from plexpy import common
var pms_verified = false; var pms_verified = false;
var authenticated = false; var authenticated = false;
$("#verify-plex-server").click(function() { $("#verify-plex-server").click(function () {
var pms_ip = $("#pms_ip").val() if (!(pms_verified)) {
var pms_port = $("#pms_port").val() var pms_ip = $("#pms_ip").val().trim();
var pms_identifier = $("#pms_identifier").val() var pms_port = $("#pms_port").val().trim();
var pms_ssl = $("#pms_ssl").val() var pms_identifier = $("#pms_identifier").val();
var pms_is_remote = $("#pms_is_remote").val() var pms_ssl = $("#pms_ssl").val();
if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) { var pms_is_remote = $("#pms_is_remote").val();
$("#pms-verify-status").html('<i class="fa fa-refresh fa-spin"></i> Validating server...'); if ((pms_ip !== '') || (pms_port !== '')) {
$('#pms-verify-status').fadeIn('fast'); $("#pms-verify-status").html('<i class="fa fa-refresh fa-spin"></i> Validating server...');
$.ajax({ $('#pms-verify-status').fadeIn('fast');
url: 'get_server_id', $.ajax({
data : { hostname: pms_ip, port: pms_port, identifier: pms_identifier, ssl: pms_ssl, remote: pms_is_remote }, url: 'get_server_id',
cache: true, data: { hostname: pms_ip, port: pms_port, identifier: pms_identifier, ssl: pms_ssl, remote: pms_is_remote },
async: true, cache: true,
timeout: 5000, async: true,
error: function(jqXHR, textStatus, errorThrown) { timeout: 5000,
$("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> This is not a Plex Server!'); error: function (jqXHR, textStatus, errorThrown) {
$('#pms-verify-status').fadeIn('fast');
},
success: function (xml) {
if ( $(xml).find('MediaContainer').attr('machineIdentifier') ) {
$("#pms_identifier").val($(xml).find('MediaContainer').attr('machineIdentifier'));
$("#pms-verify-status").html('<i class="fa fa-check"></i> Server found!');
$('#pms-verify-status').fadeIn('fast');
pms_verified = true;
$("#pms_valid").val("valid");
} else {
$("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> This is not a Plex Server!'); $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> This is not a Plex Server!');
$('#pms-verify-status').fadeIn('fast'); $('#pms-verify-status').fadeIn('fast');
},
success: function (xml) {
if ($(xml).find('MediaContainer').attr('machineIdentifier')) {
$("#pms_identifier").val($(xml).find('MediaContainer').attr('machineIdentifier'));
$("#pms-verify-status").html('<i class="fa fa-check"></i> Server found!');
$('#pms-verify-status').fadeIn('fast');
pms_verified = true;
$("#pms_valid").val("valid");
} else {
$("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> This is not a Plex Server!');
$('#pms-verify-status').fadeIn('fast');
}
} }
} });
}); } else {
} else { $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> Please enter both fields.');
$("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> Please enter both fields.'); $('#pms-verify-status').fadeIn('fast');
$('#pms-verify-status').fadeIn('fast'); }
} }
}); });
@ -426,20 +428,23 @@ from plexpy import common
$("#pms-authenticate").click(function() { $("#pms-authenticate").click(function() {
$("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i> Fetching token...'); $("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i> Fetching token...');
$('#pms-token-status').fadeIn('fast'); $('#pms-token-status').fadeIn('fast');
if (($("#pms_username").val() !== '') || ($("#pms_password").val() !== '')) { var pms_username = $("#pms_username").val().trim();
var pms_password = $("#pms_password").val().trim();
if ((pms_username !== '') || (pms_password !== '')) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "https://plex.tv/users/sign_in.xml", url: "https://plex.tv/users/sign_in.xml",
dataType: 'xml', dataType: 'xml',
async: true, async: true,
headers: {'Content-Type': 'application/xml; charset=utf-8', headers: {
'X-Plex-Device-Name': 'PlexPy', 'Content-Type': 'application/xml; charset=utf-8',
'X-Plex-Product': 'PlexPy', 'X-Plex-Device-Name': 'PlexPy',
'X-Plex-Version': '${common.VERSION_NUMBER}', 'X-Plex-Product': 'PlexPy',
'X-Plex-Platform': '${common.PLATFORM}', 'X-Plex-Version': '${common.VERSION_NUMBER}',
'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}', 'X-Plex-Platform': '${common.PLATFORM}',
'X-Plex-Client-Identifier': '${config['pms_uuid']}', 'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}',
'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val()) 'X-Plex-Client-Identifier': '${config["pms_uuid"]}',
'Authorization': 'Basic ' + btoa(pms_username + ':' + pms_password)
}, },
error: function(jqXHR, textStatus, errorThrown) { error: function(jqXHR, textStatus, errorThrown) {
$("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i> Authentation failed!'); $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i> Authentation failed!');

18
plexpy/notifiers.py
View file

@ -2044,7 +2044,7 @@ class FacebookNotifier(object):
self._post_facebook(subject + ': ' + message) self._post_facebook(subject + ': ' + message)
def test_notify(self): def test_notify(self):
return self._post_facebook("This is a test notification from PlexPy at " + helpers.now()) return self._post_facebook(u"PlexPy Notifiers :: This is a test notification from PlexPy at " + helpers.now())
def _get_authorization(self): def _get_authorization(self):
return facebook.auth_url(app_id=self.app_id, return facebook.auth_url(app_id=self.app_id,
@ -2052,7 +2052,7 @@ class FacebookNotifier(object):
perms=['user_managed_groups','publish_actions']) perms=['user_managed_groups','publish_actions'])
def _get_credentials(self, code): def _get_credentials(self, code):
logger.info('Requesting access token from Facebook') logger.info(u"PlexPy Notifiers :: Requesting access token from Facebook")
try: try:
# Request user access token # Request user access token
@ -2072,7 +2072,7 @@ class FacebookNotifier(object):
plexpy.CONFIG.FACEBOOK_TOKEN = access_token plexpy.CONFIG.FACEBOOK_TOKEN = access_token
plexpy.CONFIG.write() plexpy.CONFIG.write()
except Exception as e: except Exception as e:
logger.info(u"Error requesting Facebook access token: %s" % e) logger.info(u"PlexPy Notifiers :: Error requesting Facebook access token: %s" % e)
return False return False
return True return True
@ -2086,21 +2086,23 @@ class FacebookNotifier(object):
try: try:
api.put_wall_post(profile_id=group_id, message=message) api.put_wall_post(profile_id=group_id, message=message)
logger.info(u"Facebook notifications sent.") logger.info(u"PlexPy Notifiers :: Facebook notifications sent.")
except Exception as e: except Exception as e:
logger.info(u"Error sending Facebook post: %s" % e) logger.info(u"PlexPy Notifiers :: Error sending Facebook post: %s" % e)
return False return False
return True return True
else: else:
logger.info('Error sending Facebook post: No Facebook Group ID provided.') logger.info(u"PlexPy Notifiers :: Error sending Facebook post: No Facebook Group ID provided.")
return False return False
def return_config_options(self): def return_config_options(self):
config_option = [{'label': 'Instructions', config_option = [{'label': 'Instructions',
'description': '<strong>Facebook notifications are currently experimental!</strong><br><br> \ 'description': '<strong>Facebook notifications are currently experimental!</strong><br><br> \
Step 1: Visit <a href="https://developers.facebook.com/apps/" target="_blank">Facebook Developers</a> to create a new app using <strong>advanced setup</strong>.<br>\ Step 1: Visit <a href="https://developers.facebook.com/apps/" target="_blank"> \
Step 2: Go to <strong>Settings > Advanced</strong> and fill in <strong>Valid OAuth redirect URIs</strong> with your PlexPy URL (i.e. http://localhost:8181).<br>\ Facebook Developers</a> to create a new app using <strong>advanced setup</strong>.<br>\
Step 2: Go to <strong>Settings > Advanced</strong> and fill in \
<strong>Valid OAuth redirect URIs</strong> with your PlexPy URL (i.e. http://localhost:8181).<br>\
Step 3: Fill in the <strong>App ID</strong> and <strong>App Secret</strong> below.<br>\ Step 3: Fill in the <strong>App ID</strong> and <strong>App Secret</strong> below.<br>\
Step 4: Click the <strong>Request Authorization</strong> button below.', Step 4: Click the <strong>Request Authorization</strong> button below.',
'input_type': 'help' 'input_type': 'help'

104
plexpy/plextv.py
View file

@ -139,13 +139,16 @@ class PlexTV(object):
plextv_response = self.get_plex_auth(output_format='xml') plextv_response = self.get_plex_auth(output_format='xml')
if plextv_response: if plextv_response:
xml_head = plextv_response.getElementsByTagName('user') try:
if not xml_head: xml_head = plextv_response.getElementsByTagName('user')
logger.warn("Error parsing XML for Plex.tv token") if xml_head:
auth_token = xml_head[0].getAttribute('authenticationToken')
else:
logger.warn(u"PlexPy PlexTV :: Could not get Plex authentication token.")
except Exception as e:
logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_token: %s." % e)
return [] return []
auth_token = xml_head[0].getAttribute('authenticationToken')
return auth_token return auth_token
else: else:
return [] return []
@ -214,15 +217,15 @@ class PlexTV(object):
try: try:
xml_parse = minidom.parseString(own_account) xml_parse = minidom.parseString(own_account)
except Exception as e: except Exception as e:
logger.warn("Error parsing XML for Plex account details: %s" % e) logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list own account: %s" % e)
return [] return []
except: except:
logger.warn("Error parsing XML for Plex account details.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list own account.")
return [] return []
xml_head = xml_parse.getElementsByTagName('user') xml_head = xml_parse.getElementsByTagName('user')
if not xml_head: if not xml_head:
logger.warn("Error parsing XML for Plex account details.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list.")
else: else:
for a in xml_head: for a in xml_head:
own_details = {"user_id": helpers.get_xml_attr(a, 'id'), own_details = {"user_id": helpers.get_xml_attr(a, 'id'),
@ -239,13 +242,15 @@ class PlexTV(object):
try: try:
xml_parse = minidom.parseString(friends_list) xml_parse = minidom.parseString(friends_list)
except Exception as e: except Exception as e:
logger.warn("Error parsing XML for Plex friends list: %s" % e) logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list friends list: %s" % e)
return []
except: except:
logger.warn("Error parsing XML for Plex friends list.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list friends list.")
return []
xml_head = xml_parse.getElementsByTagName('User') xml_head = xml_parse.getElementsByTagName('User')
if not xml_head: if not xml_head:
logger.warn("Error parsing XML for Plex friends list.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list.")
else: else:
for a in xml_head: for a in xml_head:
friend = {"user_id": helpers.get_xml_attr(a, 'id'), friend = {"user_id": helpers.get_xml_attr(a, 'id'),
@ -270,16 +275,16 @@ class PlexTV(object):
try: try:
xml_parse = minidom.parseString(sync_list) xml_parse = minidom.parseString(sync_list)
except Exception as e: except Exception as e:
logger.warn("Error parsing XML for Plex sync lists: %s" % e) logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_synced_items: %s" % e)
return [] return []
except: except:
logger.warn("Error parsing XML for Plex sync lists.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_synced_items.")
return [] return []
xml_head = xml_parse.getElementsByTagName('SyncList') xml_head = xml_parse.getElementsByTagName('SyncList')
if not xml_head: if not xml_head:
logger.warn("Error parsing XML for Plex sync lists.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_synced_items.")
else: else:
for a in xml_head: for a in xml_head:
client_id = helpers.get_xml_attr(a, 'id') client_id = helpers.get_xml_attr(a, 'id')
@ -375,7 +380,7 @@ class PlexTV(object):
if plexpy.CONFIG.PMS_IDENTIFIER: if plexpy.CONFIG.PMS_IDENTIFIER:
server_id = plexpy.CONFIG.PMS_IDENTIFIER server_id = plexpy.CONFIG.PMS_IDENTIFIER
else: else:
logger.error('PlexPy PlexTV connector :: Unable to retrieve server identity.') logger.error(u"PlexPy PlexTV :: Unable to retrieve server identity.")
return [] return []
plextv_resources = self.get_plextv_resources(include_https=include_https) plextv_resources = self.get_plextv_resources(include_https=include_https)
@ -384,16 +389,16 @@ class PlexTV(object):
try: try:
xml_parse = minidom.parseString(plextv_resources) xml_parse = minidom.parseString(plextv_resources)
except Exception as e: except Exception as e:
logger.warn("Error parsing XML for Plex resources: %s" % e) logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_server_urls: %s" % e)
return [] return []
except: except:
logger.warn("Error parsing XML for Plex resources.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_server_urls.")
return [] return []
try: try:
xml_head = xml_parse.getElementsByTagName('Device') xml_head = xml_parse.getElementsByTagName('Device')
except: except Exception as e:
logger.warn("Error parsing XML for Plex resources.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_server_urls: %s." % e)
return [] return []
for a in xml_head: for a in xml_head:
@ -436,8 +441,8 @@ class PlexTV(object):
try: try:
xml_head = servers.getElementsByTagName('Server') xml_head = servers.getElementsByTagName('Server')
except: except Exception as e:
logger.warn("Error parsing XML for Plex servers.") logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_server_times: %s." % e)
return [] return []
for a in xml_head: for a in xml_head:
@ -451,35 +456,38 @@ class PlexTV(object):
def discover(self): def discover(self):
""" Query plex for all servers online. Returns the ones you own in a selectize format """ """ Query plex for all servers online. Returns the ones you own in a selectize format """
result = self.get_plextv_resources(include_https=True, output_format='raw') servers = self.get_plextv_resources(include_https=True, output_format='xml')
servers = xmltodict.parse(result, process_namespaces=True, attr_prefix='')
clean_servers = [] clean_servers = []
try: try:
if servers: xml_head = servers.getElementsByTagName('MediaContainer')
# Fix if its only one "device"
if int(servers['MediaContainer']['size']) == 1:
servers['MediaContainer']['Device'] = [servers['MediaContainer']['Device']]
for server in servers['MediaContainer']['Device']:
# Only grab servers online and own
if server.get('presence', None) == '1' and server.get('owned', None) == '1' and server.get('provides', None) == 'server':
# If someone only has one connection..
if isinstance(server['Connection'], dict):
server['Connection'] = [server['Connection']]
for s in server['Connection']:
# to avoid circular ref
d = {}
d.update(s)
d.update(server)
d['label'] = d['name']
d['value'] = d['address']
del d['Connection']
clean_servers.append(d)
except Exception as e: except Exception as e:
logger.warn('Failed to get servers from plex %s' % e) logger.warn(u"PlexPy PlexTV :: Failed to get servers from plex: %s." % e)
return clean_servers return []
return json.dumps(clean_servers, indent=4) for a in xml_head:
if a.getAttribute('size'):
if a.getAttribute('size') == '0':
return []
if a.getElementsByTagName('Device'):
devices = a.getElementsByTagName('Device')
for d in devices:
if helpers.get_xml_attr(d, 'presence') == '1' and \
helpers.get_xml_attr(d, 'owned') == '1' and \
helpers.get_xml_attr(d, 'provides') == 'server':
connections = d.getElementsByTagName('Connection')
for c in connections:
server = {'httpsRequired': helpers.get_xml_attr(d, 'httpsRequired'),
'clientIdentifier': helpers.get_xml_attr(d, 'clientIdentifier'),
'label': helpers.get_xml_attr(d, 'name'),
'ip': helpers.get_xml_attr(c, 'address'),
'port': helpers.get_xml_attr(c, 'port'),
'local': helpers.get_xml_attr(c, 'local'),
'value': helpers.get_xml_attr(c, 'address')
}
clean_servers.append(server)
return clean_servers

2
plexpy/pmsconnect.py
View file

@ -39,6 +39,8 @@ def get_server_friendly_name():
return server_name return server_name
def refresh_libraries(): def refresh_libraries():
from plexpy import activity_pinger
logger.info(u"PlexPy Pmsconnect :: Requesting libraries list refresh...") logger.info(u"PlexPy Pmsconnect :: Requesting libraries list refresh...")
library_sections = PmsConnect().get_library_details() library_sections = PmsConnect().get_library_details()

13
plexpy/webserve.py
View file

@ -106,15 +106,16 @@ class WebInterface(object):
Returns the servers that you own as a Returns the servers that you own as a
list of dicts (formatted for selectize) list of dicts (formatted for selectize)
""" """
# Need to set token so result dont return http 401 # Need to set token so result doesn't return http 401
plexpy.CONFIG.__setattr__('PMS_TOKEN', token) plexpy.CONFIG.__setattr__('PMS_TOKEN', token)
plexpy.CONFIG.write() plexpy.CONFIG.write()
result = plextv.PlexTV() plex_tv = plextv.PlexTV()
servers = result.discover() servers = plex_tv.discover()
if servers: if servers:
cherrypy.response.headers['Content-type'] = 'application/json' cherrypy.response.headers['Content-type'] = 'application/json'
return servers return json.dumps(servers)
##### Home ##### ##### Home #####
@ -1235,7 +1236,7 @@ class WebInterface(object):
if this_agent: if this_agent:
logger.debug(u"Sending test %s notification." % this_agent['name']) logger.debug(u"Sending test %s notification." % this_agent['name'])
notifiers.send_notification(this_agent['id'], subject, body) notifiers.send_notification(this_agent['id'], subject, body, **kwargs)
return "Notification sent." return "Notification sent."
else: else:
logger.debug(u"Unable to send test notification, invalid notification agent ID %s." % config_id) logger.debug(u"Unable to send test notification, invalid notification agent ID %s." % config_id)
@ -1378,7 +1379,7 @@ class WebInterface(object):
@cherrypy.expose @cherrypy.expose
def generateAPI(self): def generateAPI(self):
apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32] apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32]
logger.info(u"New API generated") logger.info(u"New API key generated.")
return apikey return apikey
@cherrypy.expose @cherrypy.expose