searx

commit: 0fe362bacf608f535680a68c0d38784b331a45e3
parent 41fd748cdf7a6bcb14b664ded16f339eb864900c
Author: Luc Didry <luc@didry.org>
Date:   Mon, 15 Jun 2015 13:36:38 +0200

Change self plugin to self_info + change self_info description

Diffstat:
M
searx/plugins/__init__.py
4
++--
D
searx/plugins/self.py
44
--------------------------------------------
A
searx/plugins/self_info.py
44
++++++++++++++++++++++++++++++++++++++++++++
M
searx/tests/test_plugins.py
2
+-

4 files changed, 47 insertions(+), 47 deletions(-)
diff --git 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,
+                           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)
+plugins.register(self_info)
 plugins.register(search_on_category_select)
diff --git a/searx/plugins/self.py b/searx/plugins/self.py
@@ -1,44 +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 Informations"
-description = gettext('Correct Duckduckgo instant answers with your own informations (IP and 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
-def post_search(request, ctx):
-    if ctx['search'].query == 'ip':
-        x_forwarded_for = request.headers.getlist("X-Forwarded-For")
-        if x_forwarded_for:
-            ip = x_forwarded_for[0]
-        else:
-            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
diff --git a/searx/plugins/self_info.py b/searx/plugins/self_info.py
@@ -0,0 +1,44 @@
+'''
+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 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
+def post_search(request, ctx):
+    if ctx['search'].query == 'ip':
+        x_forwarded_for = request.headers.getlist("X-Forwarded-For")
+        if x_forwarded_for:
+            ip = x_forwarded_for[0]
+        else:
+            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
diff --git a/searx/tests/test_plugins.py b/searx/tests/test_plugins.py
@@ -38,7 +38,7 @@ class SelfIPTest(SearxTestCase):
 
     def test_PluginStore_init(self):
         store = plugins.PluginStore()
-        store.register(plugins.self)
+        store.register(plugins.self_info)
 
         self.assertTrue(len(store.plugins) == 1)