summaryrefslogtreecommitdiff
path: root/searx/plugins
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2015-06-15 09:42:01 -0400
committerAdam Tauber <asciimoo@gmail.com>2015-06-15 09:42:01 -0400
commita9d92c3874dd8d44a5b6ce0e823972823637529a (patch)
treeb63097fd8293a0516aa9684f1b1ee2f801e24494 /searx/plugins
parentc9b8c7f8deffce93b920273171a4f8f9d6339ea7 (diff)
parent0fe362bacf608f535680a68c0d38784b331a45e3 (diff)
Merge pull request #371 from framasoft/add-useragent-plugin
Add a self user agent plugin
Diffstat (limited to 'searx/plugins')
-rw-r--r--searx/plugins/__init__.py4
-rw-r--r--searx/plugins/self_info.py (renamed from searx/plugins/self_ip.py)13
2 files changed, 13 insertions, 4 deletions
diff --git a/searx/plugins/__init__.py b/searx/plugins/__init__.py
index 5ac3f447c..411f9cd1d 100644
--- a/searx/plugins/__init__.py
+++ b/searx/plugins/__init__.py
@@ -20,7 +20,7 @@ from searx import logger
logger = logger.getChild('plugins')
from searx.plugins import (https_rewrite,
- self_ip,
+ self_info,
search_on_category_select)
required_attrs = (('name', str),
@@ -71,5 +71,5 @@ class PluginStore():
plugins = PluginStore()
plugins.register(https_rewrite)
-plugins.register(self_ip)
+plugins.register(self_info)
plugins.register(search_on_category_select)
diff --git a/searx/plugins/self_ip.py b/searx/plugins/self_info.py
index 5184ea4cf..5ca994526 100644
--- a/searx/plugins/self_ip.py
+++ b/searx/plugins/self_info.py
@@ -15,11 +15,16 @@ 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
-name = "Self IP"
-description = gettext('Display your source IP address if the query expression is "ip"')
+import re
+name = "Self Informations"
+description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".')
default_on = True
+# Self User Agent 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
@@ -32,4 +37,8 @@ def post_search(request, ctx):
ip = request.remote_addr
ctx['search'].answers.clear()
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