git.iko.soy/searx
on master help sign in
Merge pull request #220 from pointhi/safesearch

Safesearch

commit67df3c516fc380d000f32d43ecb90c0fc32ca46a authorAdam Tauber <asciimoo@gmail.com> dateMon 9 Feb 2015, 10:47 (12 years ago) parent5f801d77ac6361
10 files changed+75−3
compare with master
unifiedsplit
searx/engines/bing_images.py+8−1 searx/engines/blekko_images.py+12 searx/engines/google_images.py+9−2 searx/search.py+5 searx/templates/courgette/preferences.html+10 searx/templates/default/preferences.html+10 searx/templates/oscar/preferences.html+11 searx/tests/engines/test_bing_images.py+1 searx/tests/engines/test_blekko_images.py+1 searx/webapp.py+8
searx/engines/bing_images.py+8−1
@@ -21,12 +21,18 @@ import re
2121# engine dependent config
2222categories = ['images']
2323paging = True
24+safesearch = True
2425
2526# search-url
2627base_url = 'https://www.bing.com/'
2728search_string = 'images/search?{query}&count=10&first={offset}'
2829thumb_url = "http://ts1.mm.bing.net/th?id={ihk}"
2930
31+# safesearch definitions
32+safesearch_types = {2: 'STRICT',
33+ 1: 'DEMOTE',
34+ 0: 'OFF'}
35+
3036
3137# do search-request
3238def request(query, params):
@@ -43,7 +49,8 @@ def request(query, params):
4349 offset=offset)
4450
4551 params['cookies']['SRCHHPGUSR'] = \
46− 'NEWWND=0&NRSLT=-1&SRCHLANG=' + language.split('-')[0]
52+ 'NEWWND=0&NRSLT=-1&SRCHLANG=' + language.split('-')[0] +\
53+ '&ADLT=' + safesearch_types.get(params['safesearch'], 'DEMOTE')
4754
4855 params['url'] = base_url + search_path
4956
searx/engines/blekko_images.py+12
@@ -14,11 +14,17 @@ from urllib import urlencode
1414# engine dependent config
1515categories = ['images']
1616paging = True
17+safesearch = True
1718
1819# search-url
1920base_url = 'https://blekko.com'
2021search_url = '/api/images?{query}&c={c}'
2122
23+# safesearch definitions
24+safesearch_types = {2: '1',
25+ 1: '',
26+ 0: '0'}
27+
2228
2329# do search-request
2430def request(query, params):
@@ -31,6 +37,12 @@ def request(query, params):
3137 if params['pageno'] != 1:
3238 params['url'] += '&page={pageno}'.format(pageno=(params['pageno']-1))
3339
40+ # let Blekko know we wan't have profiling
41+ params['cookies']['tag_lesslogging'] = '1'
42+
43+ # parse safesearch argument
44+ params['cookies']['safesearch'] = safesearch_types.get(params['safesearch'], '')
45+
3446 return params
3547
3648
searx/engines/google_images.py+9−2
@@ -15,18 +15,25 @@ from json import loads
1515# engine dependent config
1616categories = ['images']
1717paging = True
18+safesearch = True
1819
1920# search-url
2021url = 'https://ajax.googleapis.com/'
21−search_url = url + 'ajax/services/search/images?v=1.0&start={offset}&rsz=large&safe=off&filter=off&{query}'
22+search_url = url + 'ajax/services/search/images?v=1.0&start={offset}&rsz=large&safe={safesearch}&filter=off&{query}'
2223
2324
2425# do search-request
2526def request(query, params):
2627 offset = (params['pageno'] - 1) * 8
2728
29+ if params['safesearch'] == 0:
30+ safesearch = 'off'
31+ else:
32+ safesearch = 'on'
33+
2834 params['url'] = search_url.format(query=urlencode({'q': query}),
29− offset=offset)
35+ offset=offset,
36+ safesearch=safesearch)
3037
3138 return params
3239
searx/search.py+5
@@ -457,6 +457,11 @@ class Search(object):
457457 request_params['started'] = time()
458458 request_params['pageno'] = self.pageno
459459 request_params['language'] = self.lang
460+ try:
461+ # 0 = None, 1 = Moderate, 2 = Strict
462+ request_params['safesearch'] = int(request.cookies.get('safesearch', 1))
463+ except ValueError:
464+ request_params['safesearch'] = 1
460465
461466 # update request parameters dependent on
462467 # search-engine (contained in engines folder)
searx/templates/courgette/preferences.html+10
@@ -59,6 +59,16 @@
5959 </select>
6060 </p>
6161 </fieldset>
62+ <fieldset>
63+ <legend>{{ _('SafeSearch') }}</legend>
64+ <p>
65+ <select name='safesearch'>
66+ <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
67+ <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
68+ <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
69+ </select>
70+ </p>
71+ </fieldset>
6272 <fieldset>
6373 <legend>{{ _('Themes') }}</legend>
6474 <p>
searx/templates/default/preferences.html+10
@@ -60,6 +60,16 @@
6060 </select>
6161 </p>
6262 </fieldset>
63+ <fieldset>
64+ <legend>{{ _('SafeSearch') }}</legend>
65+ <p>
66+ <select name='safesearch'>
67+ <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
68+ <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
69+ <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
70+ </select>
71+ </p>
72+ </fieldset>
6373 <fieldset>
6474 <legend>{{ _('Themes') }}</legend>
6575 <p>
searx/templates/oscar/preferences.html+11
@@ -87,6 +87,17 @@
8787 </div>
8888 <span class="col-sm-5 col-md-6 help-block">{{ _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') }}</span>
8989 </div>
90+ <div class="row form-group">
91+ <label class="col-sm-3 col-md-2">{{ _('SafeSearch') }}</label>
92+ <div class="col-sm-4 col-md-4">
93+ <select class="form-control" name='safesearch'>
94+ <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
95+ <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
96+ <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
97+ </select>
98+ </div>
99+ <span class="col-sm-5 col-md-6 help-block">{{ _('Filter explicite content') }}</span>
100+ </div>
90101 <div class="row form-group">
91102 <label class="col-sm-3 col-md-2">{{ _('Themes') }}</label>
92103 <div class="col-sm-4 col-md-4">
searx/tests/engines/test_bing_images.py+1
@@ -12,6 +12,7 @@ class TestBingImagesEngine(SearxTestCase):
1212 dicto = defaultdict(dict)
1313 dicto['pageno'] = 1
1414 dicto['language'] = 'fr_FR'
15+ dicto['safesearch'] = 1
1516 params = bing_images.request(query, dicto)
1617 self.assertTrue('url' in params)
1718 self.assertTrue(query in params['url'])
searx/tests/engines/test_blekko_images.py+1
@@ -10,6 +10,7 @@ class TestBlekkoImagesEngine(SearxTestCase):
1010 query = 'test_query'
1111 dicto = defaultdict(dict)
1212 dicto['pageno'] = 0
13+ dicto['safesearch'] = 1
1314 params = blekko_images.request(query, dicto)
1415 self.assertTrue('url' in params)
1516 self.assertTrue(query in params['url'])
searx/webapp.py+8
@@ -267,6 +267,8 @@ def render(template_name, override_theme=None, **kwargs):
267267
268268 kwargs['method'] = request.cookies.get('method', 'POST')
269269
270+ kwargs['safesearch'] = request.cookies.get('safesearch', '1')
271+
270272 # override url_for function in templates
271273 kwargs['url_for'] = url_for_theme
272274
@@ -471,6 +473,8 @@ def preferences():
471473 locale = None
472474 autocomplete = ''
473475 method = 'POST'
476+ safesearch = '1'
477+
474478 for pd_name, pd in request.form.items():
475479 if pd_name.startswith('category_'):
476480 category = pd_name[9:]
@@ -489,6 +493,8 @@ def preferences():
489493 lang = pd
490494 elif pd_name == 'method':
491495 method = pd
496+ elif pd_name == 'safesearch':
497+ safesearch = pd
492498 elif pd_name.startswith('engine_'):
493499 if pd_name.find('__') > -1:
494500 engine_name, category = pd_name.replace('engine_', '', 1).split('__', 1)
@@ -530,6 +536,8 @@ def preferences():
530536
531537 resp.set_cookie('method', method, max_age=cookie_max_age)
532538
539+ resp.set_cookie('safesearch', safesearch, max_age=cookie_max_age)
540+
533541 resp.set_cookie('image_proxy', image_proxy, max_age=cookie_max_age)
534542
535543 resp.set_cookie('theme', theme, max_age=cookie_max_age)