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

Don't open PKC settings if PMS not found

Browse source
This commit is contained in:
tomkat83 2016-08-18 17:28:29 +02:00
parent 8119acfa52
commit 7c1eebaa7e
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
resources/lib/initialsetup.py
View file

@ -137,7 +137,7 @@ class InitialSetup():
answer = False answer = False
return answer return answer
def __getServerList(self): def _getServerList(self):
""" """
Returns a list of servers from GDM and possibly plex.tv Returns a list of servers from GDM and possibly plex.tv
""" """
@ -147,7 +147,7 @@ class InitialSetup():
self.logMsg('PMS serverlist: %s' % serverlist, 2) self.logMsg('PMS serverlist: %s' % serverlist, 2)
return serverlist return serverlist
def __checkServerCon(self, server): def _checkServerCon(self, server):
""" """
Checks for server's connectivity. Returns CheckConnection result Checks for server's connectivity. Returns CheckConnection result
""" """
@ -195,12 +195,12 @@ class InitialSetup():
if not self.server or not self.serverid: if not self.server or not self.serverid:
showDialog = True showDialog = True
if showDialog is True: if showDialog is True:
server = self.__UserPickPMS() server = self._UserPickPMS()
else: else:
server = self.__AutoPickPMS() server = self._AutoPickPMS()
return server return server
def __AutoPickPMS(self): def _AutoPickPMS(self):
""" """
Will try to pick PMS based on machineIdentifier saved in file settings Will try to pick PMS based on machineIdentifier saved in file settings
but only once but only once
@ -212,7 +212,7 @@ class InitialSetup():
server = None server = None
while True: while True:
if httpsUpdated is False: if httpsUpdated is False:
serverlist = self.__getServerList() serverlist = self._getServerList()
for item in serverlist: for item in serverlist:
if item.get('machineIdentifier') == self.serverid: if item.get('machineIdentifier') == self.serverid:
server = item server = item
@ -229,7 +229,7 @@ class InitialSetup():
7000, 7000,
False) False)
return return
chk = self.__checkServerCon(server) chk = self._checkServerCon(server)
if chk == 504 and httpsUpdated is False: if chk == 504 and httpsUpdated is False:
# Not able to use HTTP, try HTTPs for now # Not able to use HTTP, try HTTPs for now
server['scheme'] = 'https' server['scheme'] = 'https'
@ -261,7 +261,7 @@ class InitialSetup():
% server['name'], 1) % server['name'], 1)
return server return server
def __UserPickPMS(self): def _UserPickPMS(self):
""" """
Lets user pick his/her PMS from a list Lets user pick his/her PMS from a list
@ -270,7 +270,7 @@ class InitialSetup():
httpsUpdated = False httpsUpdated = False
while True: while True:
if httpsUpdated is False: if httpsUpdated is False:
serverlist = self.__getServerList() serverlist = self._getServerList()
# Exit if no servers found # Exit if no servers found
if len(serverlist) == 0: if len(serverlist) == 0:
self.logMsg('No plex media servers found!', -1) self.logMsg('No plex media servers found!', -1)
@ -299,7 +299,7 @@ class InitialSetup():
resp = self.dialog.select(self.string(39012), dialoglist) resp = self.dialog.select(self.string(39012), dialoglist)
server = serverlist[resp] server = serverlist[resp]
chk = self.__checkServerCon(server) chk = self._checkServerCon(server)
if chk == 504 and httpsUpdated is False: if chk == 504 and httpsUpdated is False:
# Not able to use HTTP, try HTTPs for now # Not able to use HTTP, try HTTPs for now
serverlist[resp]['scheme'] = 'https' serverlist[resp]['scheme'] = 'https'
@ -413,17 +413,11 @@ class InitialSetup():
server = self.PickPMS() server = self.PickPMS()
if server is not None: if server is not None:
goToSettings = False
# Write our chosen server to Kodi settings file # Write our chosen server to Kodi settings file
self.WritePMStoSettings(server) self.WritePMStoSettings(server)
else:
goToSettings = True
# User already answered the installation questions # User already answered the installation questions
if utils.settings('InstallQuestionsAnswered') == 'true': if utils.settings('InstallQuestionsAnswered') == 'true':
if goToSettings:
xbmc.executebuiltin(
'Addon.OpenSettings(plugin.video.plexkodiconnect)')
return return
# Additional settings where the user needs to choose # Additional settings where the user needs to choose