ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #307 from dalf/master 

[fix] Flickr engine
This commit is contained in:
Adam Tauber 2015-05-02 13:39:13 -04:00
parent 59a65d0bdc 6cd9a045f8
commit b3513aa3a6
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
searx/engines/flickr_noapi.py
View File

@ -20,8 +20,8 @@ logger = logger.getChild('flickr-noapi')
categories = ['images'] categories = ['images']
url = 'https://secure.flickr.com/' url = 'https://www.flickr.com/'
search_url = url + 'search/?{query}&page={page}' search_url = url + 'search?{query}&page={page}'
photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}'
regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL) regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL)
image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's') image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's')

11
searx/utils.py
View File

@ -17,17 +17,16 @@ from searx import logger
logger = logger.getChild('utils') logger = logger.getChild('utils')
ua_versions = ('31.0', ua_versions = ('33.0',
'32.0',
'33.0',
'34.0', '34.0',
'35.0') '35.0',
'36.0',
'37.0')
ua_os = ('Windows NT 6.3; WOW64', ua_os = ('Windows NT 6.3; WOW64',
'X11; Linux x86_64', 'X11; Linux x86_64',
'X11; Linux x86') 'X11; Linux x86')
ua = "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}"
ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}"
blocked_tags = ('script', blocked_tags = ('script',
'style') 'style')