Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Improve port input error handling

Browse Source
This commit is contained in:
Etoh 2014-04-10 13:21:20 +01:00
parent 8866dab928
commit 997e68f2c2
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
syncplay/ui/ConfigurationGetter.py
View File

@ -90,6 +90,18 @@ class ConfigurationGetter(object):
self._playerFactory = PlayerFactory() self._playerFactory = PlayerFactory()
def _validateArguments(self): def _validateArguments(self):
def _isPortValid(varToTest):
try:
if (varToTest == "" or varToTest is None):
return False
if (str(varToTest).isdigit() == False):
return False
varToTest = int(varToTest)
if (varToTest > 65535 or varToTest < 1):
return False
return True
except:
return False
for key in self._boolean: for key in self._boolean:
if(self._config[key] == "True"): if(self._config[key] == "True"):
self._config[key] = True self._config[key] = True
@ -108,9 +120,11 @@ class ConfigurationGetter(object):
elif(key == "host"): elif(key == "host"):
self._config["host"], self._config["port"] = self._splitPortAndHost(self._config["host"]) self._config["host"], self._config["port"] = self._splitPortAndHost(self._config["host"])
hostNotValid = (self._config["host"] == "" or self._config["host"] is None) hostNotValid = (self._config["host"] == "" or self._config["host"] is None)
portNotValid = (self._config["port"] == "" or self._config["port"] is None) portNotValid = (_isPortValid(self._config["port"]) == False)
if(hostNotValid or portNotValid): if(hostNotValid):
raise InvalidConfigValue("Hostname can't be empty") raise InvalidConfigValue("Hostname can't be empty")
elif(portNotValid):
raise InvalidConfigValue("Port must be valid")
elif(self._config[key] == "" or self._config[key] is None): elif(self._config[key] == "" or self._config[key] is None):
raise InvalidConfigValue("{} can't be empty".format(key.capitalize())) raise InvalidConfigValue("{} can't be empty".format(key.capitalize()))
@ -136,7 +150,11 @@ class ConfigurationGetter(object):
if(host): if(host):
if ':' in host: if ':' in host:
host, port = host.split(':', 1) host, port = host.split(':', 1)
return host, int(port) try:
port = int(port)
except ValueError:
pass
return host, port
def _checkForPortableFile(self): def _checkForPortableFile(self):
path = utils.findWorkingDir() path = utils.findWorkingDir()