on master help sign in
Merge pull request #10 from dalf/master

bug fixes and dailymotion engine

commitff0bbd3566ea126b0cd0cb8b9c60d30c8105e765 authorAdam Tauber <asciimoo@gmail.com> dateMon 30 Dec 2013, 14:04 (13 years ago) parent141b04cd3e272d
4 files changed+39−2
engines.cfg_sample+5 searx/engines/dailymotion.py+32 searx/engines/flickr.py+1−1 searx/engines/xpath.py+1−1
engines.cfg_sample+5
@@ -79,3 +79,8 @@ suggestion_xpath = //div[@id="satat"]//a
7979[youtube]
8080engine = youtube
8181categories = videos
82+
83+[dailymotion]
84+engine = dailymotion
85+categories = videos
86+
searx/engines/dailymotion.pynew file+32
@@ -0,0 +1,32 @@
1+from urllib import urlencode
2+from json import loads
3+from cgi import escape
4+
5+categories = ['videos']
6+localization = 'en'
7+
8+# see http://www.dailymotion.com/doc/api/obj-video.html
9+search_url = 'https://api.dailymotion.com/videos?fields=title,description,duration,url,thumbnail_360_url&sort=relevance&limit=25&page=1&{query}'
10+
11+def request(query, params):
12+ global search_url
13+ params['url'] = search_url.format(query=urlencode({'search': query, 'localization': localization }))
14+ return params
15+
16+
17+def response(resp):
18+ results = []
19+ search_res = loads(resp.text)
20+ if not 'list' in search_res:
21+ return results
22+ for res in search_res['list']:
23+ title = res['title']
24+ url = res['url']
25+ if res['thumbnail_360_url']:
26+ content = '<a href="{0}" title="{0}" ><img src="{1}" /></a><br />'.format(url, res['thumbnail_360_url'])
27+ else:
28+ content = ''
29+ if res['description']:
30+ content += escape(res['description'][:500])
31+ results.append({'url': url, 'title': title, 'content': content})
32+ return results
searx/engines/flickr.py+1−1
@@ -7,7 +7,7 @@ from urlparse import urljoin
77categories = ['images']
88
99url = 'https://secure.flickr.com/'
10−search_url = url+'search/?q={query}'
10+search_url = url+'search/?{query}'
1111
1212def request(query, params):
1313 params['url'] = search_url.format(query=urlencode({'q': query}))
searx/engines/xpath.py+1−1
@@ -28,7 +28,7 @@ def extract_url(xpath_results):
2828 url = xpath_results[0].attrib.get('href')
2929 else:
3030 url = xpath_results.attrib.get('href')
31− if not url.startswith('http://') or not url.startswith('https://'):
31+ if not url.startswith('http://') and not url.startswith('https://'):
3232 url = 'http://'+url
3333 parsed_url = urlparse(url)
3434 if not parsed_url.netloc: