b3513aa · searx · git.iko.soy

Merge pull request #307 from dalf/master

[fix] Flickr engine

commitb3513aa3a6db41420e311bf5fc169f11564bc4e5 authorAdam Tauber <asciimoo@gmail.com> dateSat 2 May 2015, 13:39 (11 years ago) parent59a65d0 6cd9a04

2 files changed+7−8

unifiedsplit

searx/engines/flickr_noapi.py+2−2

@@ -20,8 +20,8 @@ logger = logger.getChild('flickr-noapi')

2020

2121categories = ['images']

2222

23−url = 'https://secure.flickr.com/'

24−search_url = url + 'search/?{query}&page={page}'

23+url = 'https://www.flickr.com/'

24+search_url = url + 'search?{query}&page={page}'

2525photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}'

2626regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL)

2727image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's')

searx/utils.py+5−6

@@ -17,17 +17,16 @@ from searx import logger

1717

1818logger = logger.getChild('utils')

1919

20−ua_versions = ('31.0',

21− '32.0',

22− '33.0',

20+ua_versions = ('33.0',

2321 '34.0',

24− '35.0')

22+ '35.0',

23+ '36.0',

24+ '37.0')

2525

2626ua_os = ('Windows NT 6.3; WOW64',

2727 'X11; Linux x86_64',

2828 'X11; Linux x86')

29−

30−ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}"

29+ua = "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}"

3130

3231blocked_tags = ('script',

3332 'style')