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

Code cleanup

Browse source
This commit is contained in:
tomkat83 2017-07-27 19:58:11 +02:00
parent 04e1fb4ba8
commit 0628b40b8f
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
resources/lib/connect/connectionmanager.py
View file

@ -519,23 +519,11 @@ class ConnectionManager(object):
return 0 return 0
def connectToServer(self, server, options=None): def connectToServer(self, server, options=None):
log.info("begin connectToServer") tests = [
CONNECTIONMODE['Manual'],
tests = [] CONNECTIONMODE['Local'],
CONNECTIONMODE['Remote']
if server.get('LastCONNECTIONMODE') is not None: ]
#tests.append(server['LastCONNECTIONMODE'])
pass
if CONNECTIONMODE['Manual'] not in tests:
tests.append(CONNECTIONMODE['Manual'])
if CONNECTIONMODE['Local'] not in tests:
tests.append(CONNECTIONMODE['Local'])
if CONNECTIONMODE['Remote'] not in tests:
tests.append(CONNECTIONMODE['Remote'])
# TODO: begin to wake server
log.info("beginning connection tests")
return self._testNextCONNECTIONMODE(tests, 0, server, options) return self._testNextCONNECTIONMODE(tests, 0, server, options)
def _stringEqualsIgnoreCase(self, str1, str2): def _stringEqualsIgnoreCase(self, str1, str2):
@ -543,12 +531,12 @@ class ConnectionManager(object):
return (str1 or "").lower() == (str2 or "").lower() return (str1 or "").lower() == (str2 or "").lower()
def _testNextCONNECTIONMODE(self, tests, index, server, options): def _testNextCONNECTIONMODE(self, tests, index, server, options):
if index >= len(tests): if index >= len(tests):
log.info("Tested all connection modes. Failing server connection.") log.info("Tested all connection modes. Failing server connection.")
return self._resolveFailure() return self._resolveFailure()
mode = tests[index] mode = tests[index]
log.debug('Testing connection %s with options %s' % (mode, options))
address = getServerAddress(server, mode) address = getServerAddress(server, mode)
enableRetry = False enableRetry = False
skipTest = False skipTest = False