Merge self_ip and self_useragent into one plugin

This commit is contained in:
Luc Didry 2015-06-15 10:22:37 +02:00
parent 538029dc14
commit 41fd748cdf
4 changed files with 18 additions and 45 deletions

View File

@ -20,8 +20,7 @@ from searx import logger
logger = logger.getChild('plugins') logger = logger.getChild('plugins')
from searx.plugins import (https_rewrite, from searx.plugins import (https_rewrite,
self_ip, self,
self_useragent,
search_on_category_select) search_on_category_select)
required_attrs = (('name', str), required_attrs = (('name', str),
@ -72,6 +71,5 @@ class PluginStore():
plugins = PluginStore() plugins = PluginStore()
plugins.register(https_rewrite) plugins.register(https_rewrite)
plugins.register(self_ip) plugins.register(self)
plugins.register(self_useragent)
plugins.register(search_on_category_select) plugins.register(search_on_category_select)

View File

@ -15,11 +15,16 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com> (C) 2015 by Adam Tauber, <asciimoo@gmail.com>
''' '''
from flask.ext.babel import gettext from flask.ext.babel import gettext
name = "Self IP" import re
description = gettext('Display your source IP address if the query expression is "ip"') name = "Self Informations"
description = gettext('Correct Duckduckgo instant answers with your own informations (IP and User Agent)')
default_on = True default_on = True
# Self User Agent regex
p = re.compile('.*user[ -]agent.*', re.IGNORECASE)
# attach callback to the post search hook # attach callback to the post search hook
# request: flask request object # request: flask request object
# ctx: the whole local context of the pre search hook # ctx: the whole local context of the pre search hook
@ -32,4 +37,8 @@ def post_search(request, ctx):
ip = request.remote_addr ip = request.remote_addr
ctx['search'].answers.clear() ctx['search'].answers.clear()
ctx['search'].answers.add(ip) ctx['search'].answers.add(ip)
elif p.match(ctx['search'].query):
ua = request.user_agent
ctx['search'].answers.clear()
ctx['search'].answers.add(ua)
return True return True

View File

@ -1,36 +0,0 @@
'''
searx is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
searx is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com>
'''
from flask.ext.babel import gettext
import re
name = "Self User Agent"
description = gettext('Display your own User Agent if the query expression contains "user agent" or "user-agent"')
default_on = True
# User Agent query regex
p = re.compile('user[ -]agent', re.IGNORECASE)
# attach callback to the post search hook
# request: flask request object
# ctx: the whole local context of the pre search hook
def post_search(request, ctx):
if p.match(ctx['search'].query):
ua = request.user_agent
ctx['search'].answers.clear()
ctx['search'].answers.add(ua)
return True

View File

@ -38,10 +38,9 @@ class SelfIPTest(SearxTestCase):
def test_PluginStore_init(self): def test_PluginStore_init(self):
store = plugins.PluginStore() store = plugins.PluginStore()
store.register(plugins.self_ip) store.register(plugins.self)
store.register(plugins.self_useragent)
self.assertTrue(len(store.plugins) == 2) self.assertTrue(len(store.plugins) == 1)
# IP test # IP test
request = Mock(user_plugins=store.plugins, request = Mock(user_plugins=store.plugins,
@ -64,3 +63,6 @@ class SelfIPTest(SearxTestCase):
query='user agent')} query='user agent')}
store.call('post_search', request, ctx) store.call('post_search', request, ctx)
self.assertTrue('Mock' in ctx['search'].answers) self.assertTrue('Mock' in ctx['search'].answers)
ctx = {'search': Mock(answers=set(),
query='What is my User-Agent?')}
store.call('post_search', request, ctx)