Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

HTTPS!

Browse source
This commit is contained in:
tomkat83 2016-03-07 17:11:54 +01:00
parent a258f969ab
commit e9e1de6e3d
1 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/lib/initialsetup.py
View file

@ -88,7 +88,9 @@ class InitialSetup():
plexToken = result['token'] plexToken = result['token']
plexid = result['plexid'] plexid = result['plexid']
# Get g_PMS list of servers (saved to plx.g_PMS) # Get g_PMS list of servers (saved to plx.g_PMS)
httpsUpdated = False
while True: while True:
if httpsUpdated is False:
tokenDict = {'MyPlexToken': plexToken} if plexToken else {} tokenDict = {'MyPlexToken': plexToken} if plexToken else {}
# Populate g_PMS variable with the found Plex servers # Populate g_PMS variable with the found Plex servers
self.plx.discoverPMS(clientId, self.plx.discoverPMS(clientId,
@ -96,9 +98,11 @@ class InitialSetup():
xbmc.getIPAddress(), xbmc.getIPAddress(),
tokenDict=tokenDict) tokenDict=tokenDict)
self.logMsg("Result of setting g_PMS variable: %s" self.logMsg("Result of setting g_PMS variable: %s"
% self.plx.g_PMS, 2) % self.plx.g_PMS, 1)
isconnected = False isconnected = False
serverlist = self.plx.returnServerList(clientId, self.plx.g_PMS) serverlist = self.plx.returnServerList(
clientId, self.plx.g_PMS)
self.logMsg('PMS serverlist: %s' % serverlist)
# Let user pick server from a list # Let user pick server from a list
# Get a nicer list # Get a nicer list
dialoglist = [] dialoglist = []
@ -132,7 +136,12 @@ class InitialSetup():
self.logMsg("Setting SSL verify to true, because server is " self.logMsg("Setting SSL verify to true, because server is "
"not local", 1) "not local", 1)
chk = self.plx.CheckConnection(url, server['accesstoken']) chk = self.plx.CheckConnection(url, server['accesstoken'])
# Unauthorized if chk == 504 and httpsUpdated is False:
# Not able to use HTTP, try HTTPs for now
serverlist[resp]['scheme'] = 'https'
httpsUpdated = True
continue
httpsUpdated = False
if chk == 401: if chk == 401:
# Not yet authorized for Plex server # Not yet authorized for Plex server
# Please sign in to plex.tv # Please sign in to plex.tv