From 1290d7cac405acc4555c1ba97555b20253f26ab3 Mon Sep 17 00:00:00 2001 From: Martin Janco Date: Sun, 7 Sep 2014 17:24:35 +0200 Subject: [PATCH] Fixed extratorrent.cc search engine. --- src/searchengine/nova/helpers.py | 9 ++++++--- src/searchengine/nova3/helpers.py | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/searchengine/nova/helpers.py b/src/searchengine/nova/helpers.py index 7aa53b1d6..31d6a5de5 100644 --- a/src/searchengine/nova/helpers.py +++ b/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.32 +#VERSION: 1.33 # Author: # Christophe DUMEZ (chris@qbittorrent.org) @@ -35,6 +35,9 @@ import socket import socks import re +# Some sites blocks default python User-agent +user_agent = 'Mozilla/5.0' +headers = {'User-Agent': user_agent} # SOCKS5 Proxy support if os.environ.has_key("sock_proxy") and len(os.environ["sock_proxy"].strip()) > 0: proxy_str = os.environ["sock_proxy"].strip() @@ -61,7 +64,7 @@ def htmlentitydecode(s): def retrieve_url(url): """ Return the content of the url page as a string """ - req = urllib2.Request(url) + req = urllib2.Request(url, headers) response = urllib2.urlopen(req) dat = response.read() # Check if it is gzipped @@ -86,7 +89,7 @@ def download_file(url, referer=None): file, path = tempfile.mkstemp() file = os.fdopen(file, "w") # Download url - req = urllib2.Request(url) + req = urllib2.Request(url, headers) if referer is not None: req.add_header('referer', referer) response = urllib2.urlopen(req) diff --git a/src/searchengine/nova3/helpers.py b/src/searchengine/nova3/helpers.py index 64a4e6b5a..b3a27a606 100644 --- a/src/searchengine/nova3/helpers.py +++ b/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.33 +#VERSION: 1.34 # Author: # Christophe DUMEZ (chris@qbittorrent.org) @@ -35,6 +35,9 @@ import socket import socks import re +# Some sites blocks default python User-agent +user_agent = 'Mozilla/5.0' +headers = {'User-Agent': user_agent} # SOCKS5 Proxy support if "sock_proxy" in os.environ and len(os.environ["sock_proxy"].strip()) > 0: proxy_str = os.environ["sock_proxy"].strip() @@ -61,7 +64,8 @@ def htmlentitydecode(s): def retrieve_url(url): """ Return the content of the url page as a string """ - response = urllib.request.urlopen(url) + req = urllib.request.Request(url, headers) + response = urllib.request.urlopen(req) dat = response.read() # Check if it is gzipped if dat[:2] == b'\x1f\x8b': @@ -86,7 +90,7 @@ def download_file(url, referer=None): file, path = tempfile.mkstemp() file = os.fdopen(file, "wb") # Download url - req = urllib.request.Request(url) + req = urllib.request.Request(url, headers) if referer is not None: req.add_header('referer', referer) response = urllib.request.urlopen(req)