oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return dict object, not single None value

Browse source
This commit is contained in:
Ivanq 2018-01-14 09:38:55 +03:00
parent 6318c0889a
commit 5d7b8cfd48
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/File/FileServer.py
View file

@ -90,7 +90,7 @@ class FileServer(ConnectionServer):
if not port: if not port:
port = self.port port = self.port
back = self.testOpenportPortchecker(port) back = self.testOpenportPortchecker(port)
if back["result"] is not True and use_alternative: # If no success try alternative checker if (back["result"] is not True and use_alternative) or back["result"] is None: # If no success try alternative checker
back = self.testOpenportCanyouseeme(port) back = self.testOpenportCanyouseeme(port)
if self.ui_server: if self.ui_server:
@ -143,8 +143,7 @@ class FileServer(ConnectionServer):
message = re.match('.*<div id="results-wrapper">(.*?)</div>', data, re.DOTALL).group(1) message = re.match('.*<div id="results-wrapper">(.*?)</div>', data, re.DOTALL).group(1)
message = re.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ").strip()) # Strip http tags message = re.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ").strip()) # Strip http tags
except Exception, err: except Exception, err:
self.log.info("portchecker.co down") return {"result": None, "message": Debug.formatException(err)}
return None
if "open" not in message: if "open" not in message:
if config.tor != "always": if config.tor != "always":
@ -177,8 +176,7 @@ class FileServer(ConnectionServer):
message = re.match('.*<p style="padding-left:15px">(.*?)</p>', data, re.DOTALL).group(1) message = re.match('.*<p style="padding-left:15px">(.*?)</p>', data, re.DOTALL).group(1)
message = re.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ")) # Strip http tags message = re.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ")) # Strip http tags
except Exception, err: except Exception, err:
self.log.info("canyouseeme.org down") return {"result": None, "message": Debug.formatException(err)}
return None
if "Success" not in message: if "Success" not in message:
if config.tor != "always": if config.tor != "always":