git.iko.soy/searx
on master help sign in
Merge pull request #672 from kvch/self-info-paging

Self information on later pages

commit7591c8bfe314b82262c49373e7c26fe5c333d671 authorAdam Tauber <asciimoo@gmail.com> dateSat 27 Aug 2016, 22:10 (10 years ago) parent3043c40aa22718
2 files changed+22−4
compare with master
unifiedsplit
searx/plugins/self_info.py+2 tests/unit/test_plugins.py+20−4
searx/plugins/self_info.py+2
@@ -29,6 +29,8 @@ p = re.compile('.*user[ -]agent.*', re.IGNORECASE)
2929# request: flask request object
3030# ctx: the whole local context of the pre search hook
3131def post_search(request, ctx):
32+ if ctx['search'].pageno > 1:
33+ return True
3234 if ctx['search'].query == 'ip':
3335 x_forwarded_for = request.headers.getlist("X-Forwarded-For")
3436 if x_forwarded_for:
tests/unit/test_plugins.py+20−4
@@ -52,23 +52,39 @@ class SelfIPTest(SearxTestCase):
5252 request = Mock(user_plugins=store.plugins,
5353 remote_addr='127.0.0.1')
5454 request.headers.getlist.return_value = []
55− ctx = get_search_mock(query='ip')
55+ ctx = get_search_mock(query='ip', pageno=1)
5656 store.call('post_search', request, ctx)
5757 self.assertTrue('127.0.0.1' in ctx['search'].result_container.answers)
5858
59+ ctx = get_search_mock(query='ip', pageno=2)
60+ store.call('post_search', request, ctx)
61+ self.assertFalse('127.0.0.1' in ctx['search'].result_container.answers)
62+
5963 # User agent test
6064 request = Mock(user_plugins=store.plugins,
6165 user_agent='Mock')
6266 request.headers.getlist.return_value = []
6367
64− ctx = get_search_mock(query='user-agent')
68+ ctx = get_search_mock(query='user-agent', pageno=1)
6569 store.call('post_search', request, ctx)
6670 self.assertTrue('Mock' in ctx['search'].result_container.answers)
6771
68− ctx = get_search_mock(query='user-agent')
72+ ctx = get_search_mock(query='user-agent', pageno=2)
73+ store.call('post_search', request, ctx)
74+ self.assertFalse('Mock' in ctx['search'].result_container.answers)
75+
76+ ctx = get_search_mock(query='user-agent', pageno=1)
6977 store.call('post_search', request, ctx)
7078 self.assertTrue('Mock' in ctx['search'].result_container.answers)
7179
72− ctx = get_search_mock(query='What is my User-Agent?')
80+ ctx = get_search_mock(query='user-agent', pageno=2)
81+ store.call('post_search', request, ctx)
82+ self.assertFalse('Mock' in ctx['search'].result_container.answers)
83+
84+ ctx = get_search_mock(query='What is my User-Agent?', pageno=1)
7385 store.call('post_search', request, ctx)
7486 self.assertTrue('Mock' in ctx['search'].result_container.answers)
87+
88+ ctx = get_search_mock(query='What is my User-Agent?', pageno=2)
89+ store.call('post_search', request, ctx)
90+ self.assertFalse('Mock' in ctx['search'].result_container.answers)