logo

searx

My custom branche(s) on searx, a meta-search engine
commit: b3513aa3a6db41420e311bf5fc169f11564bc4e5
parent: 59a65d0bdc98a76f03235055f214747f699923a9
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Sat,  2 May 2015 13:39:13 -0400

Merge pull request #307 from dalf/master

[fix] Flickr engine

Diffstat:

Msearx/engines/flickr_noapi.py4++--
Msearx/utils.py11+++++------
2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/searx/engines/flickr_noapi.py b/searx/engines/flickr_noapi.py @@ -20,8 +20,8 @@ logger = logger.getChild('flickr-noapi') categories = ['images'] -url = 'https://secure.flickr.com/' -search_url = url + 'search/?{query}&page={page}' +url = 'https://www.flickr.com/' +search_url = url + 'search?{query}&page={page}' photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL) image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's') diff --git a/searx/utils.py b/searx/utils.py @@ -17,17 +17,16 @@ from searx import logger logger = logger.getChild('utils') -ua_versions = ('31.0', - '32.0', - '33.0', +ua_versions = ('33.0', '34.0', - '35.0') + '35.0', + '36.0', + '37.0') ua_os = ('Windows NT 6.3; WOW64', 'X11; Linux x86_64', 'X11; Linux x86') - -ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}" +ua = "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}" blocked_tags = ('script', 'style')