From 6318c0889ad69bbbdb9f44633e8bd34919b4a482 Mon Sep 17 00:00:00 2001
From: Ivanq <imachug@yandex.ru>
Date: Sun, 14 Jan 2018 09:35:03 +0300
Subject: [PATCH 1/2] Don't check error message for 'open' when checking port

---
 src/File/FileServer.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/File/FileServer.py b/src/File/FileServer.py
index b75d539a..426299d8 100644
--- a/src/File/FileServer.py
+++ b/src/File/FileServer.py
@@ -143,8 +143,8 @@ class FileServer(ConnectionServer):
             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
         except Exception, err:
-            message = "Error: %s" % Debug.formatException(err)
-            data = ""
+            self.log.info("portchecker.co down")
+            return None
 
         if "open" not in message:
             if config.tor != "always":
@@ -177,7 +177,8 @@ class FileServer(ConnectionServer):
             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
         except Exception, err:
-            message = "Error: %s" % Debug.formatException(err)
+            self.log.info("canyouseeme.org down")
+            return None
 
         if "Success" not in message:
             if config.tor != "always":

From 5d7b8cfd485efb18e0d05383ee979267a0295226 Mon Sep 17 00:00:00 2001
From: Ivanq <imachug@yandex.ru>
Date: Sun, 14 Jan 2018 09:38:55 +0300
Subject: [PATCH 2/2] Return dict object, not single None value

---
 src/File/FileServer.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/File/FileServer.py b/src/File/FileServer.py
index 426299d8..6db818f9 100644
--- a/src/File/FileServer.py
+++ b/src/File/FileServer.py
@@ -90,7 +90,7 @@ class FileServer(ConnectionServer):
         if not port:
             port = self.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)
 
         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.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " ").strip())  # Strip http tags
         except Exception, err:
-            self.log.info("portchecker.co down")
-            return None
+            return {"result": None, "message": Debug.formatException(err)}
 
         if "open" not in message:
             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.sub("<.*?>", "", message.replace("<br>", " ").replace("&nbsp;", " "))  # Strip http tags
         except Exception, err:
-            self.log.info("canyouseeme.org down")
-            return None
+            return {"result": None, "message": Debug.formatException(err)}
 
         if "Success" not in message:
             if config.tor != "always":