Merge pull request #2670 from DoumanAsh/safe_url_retrieve

[search engine] Exception free url_retrieve

src/searchengine/nova/helpers.py

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-#VERSION: 1.34
+#VERSION: 1.40
 
 # Author:
 #  Christophe DUMEZ (chris@qbittorrent.org)
@@ -65,7 +65,11 @@ def htmlentitydecode(s):
 def retrieve_url(url):
     """ Return the content of the url page as a string """
     req = urllib2.Request(url, headers = headers)
-    response = urllib2.urlopen(req)
+    try:
+        response = urllib2.urlopen(req)
+    except urllib2.URLError as errno:
+        print(" ".join(("Connection error:", str(errno.reason))))
+        return ""
     dat = response.read()
     # Check if it is gzipped
     if dat[:2] == '\037\213':

src/searchengine/nova3/helpers.py

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-#VERSION: 1.35
+#VERSION: 1.40
 
 # Author:
 #  Christophe DUMEZ (chris@qbittorrent.org)
@@ -65,7 +65,11 @@ def htmlentitydecode(s):
 def retrieve_url(url):
     """ Return the content of the url page as a string """
     req = urllib.request.Request(url, headers = headers)
-    response = urllib.request.urlopen(req)
+    try:
+        response = urllib.request.urlopen(req)
+    except urllib.error.URLError as errno:
+        print(" ".join(("Connection error:", str(errno.reason))))
+        return ""
     dat = response.read()
     # Check if it is gzipped
     if dat[:2] == b'\x1f\x8b':