-

+
Welcome!
@@ -469,9 +469,9 @@
function getServerOptions(token) {
/* Set token and returns server options */
$.ajax({
- url: "discover/" + token + '?include_cloud=false',
+ url: "discover/" + token,
success: function (result) {
- $('#pms_ip').html("")
+ $('#pms_ip').html("");
// Add all servers to the "combobox"
$select_pms[0].selectize.addOption(result);
}
diff --git a/plexpy/plextv.py b/plexpy/plextv.py
index 2360b2c6..ed6597cb 100644
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -121,18 +121,19 @@ class PlexTV(object):
self.timeout = plexpy.CONFIG.PMS_TIMEOUT
self.ssl_verify = plexpy.CONFIG.VERIFY_SSL_CERT
- if not self.token:
- # Check if we should use the admin token, or the guest server token
- if session.get_session_user_id():
- user_data = users.Users()
- user_tokens = user_data.get_tokens(user_id=session.get_session_user_id())
- self.token = user_tokens['server_token']
- else:
- self.token = plexpy.CONFIG.PMS_TOKEN
+ if self.username is None and self.password is None:
+ if not self.token:
+ # Check if we should use the admin token, or the guest server token
+ if session.get_session_user_id():
+ user_data = users.Users()
+ user_tokens = user_data.get_tokens(user_id=session.get_session_user_id())
+ self.token = user_tokens['server_token']
+ else:
+ self.token = plexpy.CONFIG.PMS_TOKEN
- if not self.token:
- logger.error(u"Tautulli PlexTV :: PlexTV called, but no token provided.")
- return
+ if not self.token:
+ logger.error(u"Tautulli PlexTV :: PlexTV called, but no token provided.")
+ return
self.request_handler = http_handler.HTTPHandler(urls=self.urls,
token=self.token,
@@ -606,7 +607,8 @@ class PlexTV(object):
helpers.get_xml_attr(d, 'owned') == '1' and \
helpers.get_xml_attr(d, 'provides') == 'server':
- if not include_cloud and helpers.get_xml_attr(d, 'platform').lower() == 'cloud':
+ is_cloud = (helpers.get_xml_attr(d, 'platform').lower() == 'cloud')
+ if not include_cloud and is_cloud:
continue
connections = d.getElementsByTagName('Connection')
@@ -623,7 +625,7 @@ class PlexTV(object):
helpers.get_xml_attr(c, 'local') == '0':
continue
- server = {'httpsRequired': helpers.get_xml_attr(d, 'httpsRequired'),
+ server = {'httpsRequired': '1' if is_cloud else 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'),
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 48a7d0d8..42322078 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -148,7 +148,7 @@ class WebInterface(object):
plexpy.CONFIG.write()
include_cloud = not (include_cloud == 'false')
- all_servers = all_servers == 'true'
+ all_servers = (all_servers == 'true')
plex_tv = plextv.PlexTV()
servers_list = plex_tv.discover(include_cloud=include_cloud,