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

Allow SSL when verifying server in settings

Browse source
This commit is contained in:
JonnyWong16 2015-12-30 12:59:52 -08:00
parent 0d2666f7d3
commit 1e616fa585
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1422,12 +1422,15 @@ $(document).ready(function() {
function verifyServer(_callback) { function verifyServer(_callback) {
var pms_ip = $("#pms_ip").val() var pms_ip = $("#pms_ip").val()
var pms_port = $("#pms_port").val() var pms_port = $("#pms_port").val()
var pms_identifier = $("#pms_identifier").val()
var pms_ssl = $("#pms_ssl").val()
var pms_is_remote = $("#pms_is_remote").val()
if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) { if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) {
$("#pms-verify").html('<i class="fa fa-refresh fa-spin"></i>'); $("#pms-verify").html('<i class="fa fa-refresh fa-spin"></i>');
$('#pms-verify').fadeIn('fast'); $('#pms-verify').fadeIn('fast');
$.ajax({ $.ajax({
url: 'get_server_id', url: 'get_server_id',
data : { hostname: pms_ip, port: pms_port }, data : { hostname: pms_ip, port: pms_port, identifier: pms_identifier, ssl: pms_ssl, remote: pms_is_remote },
cache: true, cache: true,
async: true, async: true,
timeout: 5000, timeout: 5000,

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

@ -372,12 +372,15 @@ from plexpy import common
$("#verify-plex-server").click(function() { $("#verify-plex-server").click(function() {
var pms_ip = $("#pms_ip").val() var pms_ip = $("#pms_ip").val()
var pms_port = $("#pms_port").val() var pms_port = $("#pms_port").val()
var pms_identifier = $("#pms_identifier").val()
var pms_ssl = $("#pms_ssl").val()
var pms_is_remote = $("#pms_is_remote").val()
if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) { if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) {
$("#pms-verify-status").html('<i class="fa fa-refresh fa-spin"></i> Validating server...'); $("#pms-verify-status").html('<i class="fa fa-refresh fa-spin"></i> Validating server...');
$('#pms-verify-status').fadeIn('fast'); $('#pms-verify-status').fadeIn('fast');
$.ajax({ $.ajax({
url: 'get_server_id', url: 'get_server_id',
data : { hostname: pms_ip, port: pms_port }, data : { hostname: pms_ip, port: pms_port, identifier: pms_identifier, ssl: pms_ssl, remote: pms_is_remote },
cache: true, cache: true,
async: true, async: true,
timeout: 5000, timeout: 5000,

24
plexpy/webserve.py
View file

@ -1335,19 +1335,23 @@ class WebInterface(object):
return serve_template(templatename="plexwatch_import.html", title="Import PlexWatch Database") return serve_template(templatename="plexwatch_import.html", title="Import PlexWatch Database")
@cherrypy.expose @cherrypy.expose
def get_server_id(self, hostname=None, port=None, **kwargs): def get_server_id(self, hostname=None, port=None, identifier=None, ssl=0, remote=0, **kwargs):
from plexpy import http_handler from plexpy import http_handler
if hostname and port: if hostname and port:
request_handler = http_handler.HTTPHandler(host=hostname, # Set PMS attributes to get the real PMS url
port=port, plexpy.CONFIG.__setattr__('PMS_IP', hostname)
token=None) plexpy.CONFIG.__setattr__('PMS_PORT', port)
uri = '/identity' plexpy.CONFIG.__setattr__('PMS_IDENTIFIER', identifier)
request = request_handler.make_request(uri=uri, plexpy.CONFIG.__setattr__('PMS_SSL', ssl)
proto='http', plexpy.CONFIG.__setattr__('PMS_IS_REMOTE', remote)
request_type='GET', plexpy.CONFIG.write()
output_format='',
no_token=True) plextv.get_real_pms_url()
pms_connect = pmsconnect.PmsConnect()
request = pms_connect.get_local_server_identity()
if request: if request:
cherrypy.response.headers['Content-type'] = 'application/xml' cherrypy.response.headers['Content-type'] = 'application/xml'
return request return request