git.iko.soy/searx
on master help sign in
Merge branch 'featured_result' of https://github.com/pw3t/searx
commitbfdd6ebb9292f544736ed264a8d8ab04ca8d0296 authorasciimoo <asciimoo@gmail.com> dateSun 19 Jan 2014, 22:39 (13 years ago) parentdcbf17f380b440
15 files changed+52−7
compare with master
unifiedsplit
searx/engines/mediawiki.py+2 searx/engines/vimeo.py+7−3 searx/engines/youtube.py+9−2 searx/static/css/style.css+1 searx/static/img/icon_github.ico searx/static/img/icon_soundcloud.ico searx/static/img/icon_stackoverflow.ico searx/static/img/icon_twitter.ico searx/static/img/icon_vimeo.ico searx/static/img/icon_wikipedia.ico searx/static/img/icon_youtube.ico searx/templates/result_templates/default.html+10−1 searx/templates/result_templates/videos.html+13 searx/templates/results.html+3 searx/webapp.py+7−1
searx/engines/mediawiki.py+2
@@ -14,5 +14,7 @@ def request(query, params):
1414def response(resp):
1515 search_results = loads(resp.text)
1616 res = search_results.get('query', {}).get('search', [])
17+
1718 return [{'url': url + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')),
1819 'title': result['title']} for result in res[:int(number_of_results)]]
20+
searx/engines/vimeo.py+7−3
@@ -35,7 +35,11 @@ def response(resp):
3535 for result in dom.xpath(results_xpath):
3636 url = base_url + result.xpath(url_xpath)[0]
3737 title = p.unescape(extract_text(result.xpath(title_xpath)))
38− content = '<a href="{0}"> <img src="{2}"/> </a>'.format(url, title, extract_text(result.xpath(content_xpath)[0]))
39− results.append({'url': url, 'title': title, 'content': content})
40−
38+ thumbnail = extract_text(result.xpath(content_xpath)[0])
39+ content = '<a href="{0}"> <img src="{2}"/> </a>'.format(url, title, thumbnail)
40+ results.append({'url': url
41+ , 'title': title
42+ , 'content': content
43+ , 'template':'videos.html'
44+ , 'thumbnail': thumbnail})
4145 return results
searx/engines/youtube.py+9−2
@@ -26,14 +26,21 @@ def response(resp):
2626 url = url[:-1]
2727 title = result['title']['$t']
2828 content = ''
29+
30+ thumbnail = ''
2931 if len(result['media$group']['media$thumbnail']):
30− content += '<a href="{0}" title="{0}" ><img src="{1}" /></a>'.format(url, result['media$group']['media$thumbnail'][0]['url'])
32+ thumbnail = result['media$group']['media$thumbnail'][0]['url']
33+ content += '<a href="{0}" title="{0}" ><img src="{1}" /></a>'.format(url, thumbnail)
3134 if len(content):
3235 content += '<br />' + result['content']['$t']
3336 else:
3437 content = result['content']['$t']
3538
36− results.append({'url': url, 'title': title, 'content': content})
39+ results.append({'url': url
40+ , 'title': title
41+ , 'content': content
42+ , 'template':'videos.html'
43+ , 'thumbnail':thumbnail})
3744
3845 return results
3946
searx/static/css/style.css+1
@@ -79,6 +79,7 @@ a { text-decoration: none; color: #1a11be; }
7979a:visited { color: #7b11be; }
8080
8181.result { margin: 19px 0 18px 0; padding: 0; max-width: 55em; clear: both; }
82+.result:hover { background: #e8e7e6; }
8283.result_title { margin-bottom: 0; }
8384.result h3 { font-size: 1em; word-wrap:break-word; margin: 5px 0 1px 0; padding: 0 }
8485.result .content { font-size: 0.8em; margin: 0; padding: 0; max-width: 54em; word-wrap:break-word; line-height: 1.24; }
searx/static/img/icon_github.iconew file

Binary file not shown.

searx/static/img/icon_soundcloud.iconew file

Binary file not shown.

searx/static/img/icon_stackoverflow.iconew file

Binary file not shown.

searx/static/img/icon_twitter.iconew file

Binary file not shown.

searx/static/img/icon_vimeo.iconew file

Binary file not shown.

searx/static/img/icon_wikipedia.iconew file

Binary file not shown.

searx/static/img/icon_youtube.iconew file

Binary file not shown.

searx/templates/result_templates/default.html+10−1
@@ -1,5 +1,14 @@
11<div class="result {{ result.class }}">
2− <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
2+
3+ {% if result['favicon'] %}
4+ <div style="float:left; margin:2px;">
5+ <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" />
6+ </div>
7+ {% endif %}
8+
9+ <div>
10+ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3></br>
311 <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
412 <p class="url">{{ result.pretty_url }}</p>
13+ </div>
514</div>
searx/templates/result_templates/videos.htmlnew file+13
@@ -0,0 +1,13 @@
1+<div class="result">
2+ {% if result['favicon'] %}
3+ <div style="float:left; margin:2px;">
4+ <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" />
5+ </div>
6+ {% endif %}
7+
8+ <p>
9+ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
10+ <a href="{{ result.url }}"><img width="300" height="170" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
11+ <p class="url">{{ result.url }}</p>
12+ </p>
13+</div>
searx/templates/results.html+3
@@ -9,9 +9,12 @@
99 {% if suggestions %}
1010 <div id="suggestions"><span>Suggestions: </span>{% for suggestion in suggestions %}<form method="post" action="/"><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div>
1111 {% endif %}
12+
13+
1214 <div id ="result_count">
1315 Number of results: {{ number_of_results }}
1416 </div>
17+
1518 {% for result in results %}
1619 {% if result['template'] %}
1720 {% include 'result_templates/'+result['template'] %}
searx/webapp.py+7−1
@@ -120,6 +120,7 @@ def index():
120120
121121 results, suggestions = search(query, request, selected_engines)
122122
123+ featured_results = []
123124 for result in results:
124125 if request_data.get('format', 'html') == 'html':
125126 if 'content' in result:
@@ -134,6 +135,10 @@ def index():
134135 else:
135136 result['pretty_url'] = result['url']
136137
138+ for engine in result['engines']:
139+ if engine in ['wikipedia', 'youtube', 'vimeo', 'soundcloud', 'twitter', 'stackoverflow', 'github']:
140+ result['favicon'] = engine
141+
137142 if request_data.get('format') == 'json':
138143 return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')
139144 elif request_data.get('format') == 'csv':
@@ -162,7 +167,8 @@ def index():
162167 ,results=results
163168 ,q=request_data['q']
164169 ,selected_categories=selected_categories
165− ,number_of_results=len(results)
170+ ,number_of_results=len(results)+len(featured_results)
171+ ,featured_results=featured_results
166172 ,suggestions=suggestions
167173 )
168174