From 41fd748cdf7a6bcb14b664ded16f339eb864900c Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Mon, 15 Jun 2015 10:22:37 +0200
Subject: [PATCH] Merge self_ip and self_useragent into one plugin

---
 searx/plugins/__init__.py             |  6 ++---
 searx/plugins/{self_ip.py => self.py} | 13 ++++++++--
 searx/plugins/self_useragent.py       | 36 ---------------------------
 searx/tests/test_plugins.py           |  8 +++---
 4 files changed, 18 insertions(+), 45 deletions(-)
 rename searx/plugins/{self_ip.py => self.py} (76%)
 delete mode 100644 searx/plugins/self_useragent.py

diff --git a/searx/plugins/__init__.py b/searx/plugins/__init__.py
index a16ae5fc3..bc4a0fba3 100644
--- a/searx/plugins/__init__.py
+++ b/searx/plugins/__init__.py
@@ -20,8 +20,7 @@ from searx import logger
 logger = logger.getChild('plugins')
 
 from searx.plugins import (https_rewrite,
-                           self_ip,
-                           self_useragent,
+                           self,
                            search_on_category_select)
 
 required_attrs = (('name', str),
@@ -72,6 +71,5 @@ class PluginStore():
 
 plugins = PluginStore()
 plugins.register(https_rewrite)
-plugins.register(self_ip)
-plugins.register(self_useragent)
+plugins.register(self)
 plugins.register(search_on_category_select)
diff --git a/searx/plugins/self_ip.py b/searx/plugins/self.py
similarity index 76%
rename from searx/plugins/self_ip.py
rename to searx/plugins/self.py
index 5184ea4cf..e3bb517d8 100644
--- a/searx/plugins/self_ip.py
+++ b/searx/plugins/self.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('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
@@ -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
diff --git a/searx/plugins/self_useragent.py b/searx/plugins/self_useragent.py
deleted file mode 100644
index cae91ccba..000000000
--- a/searx/plugins/self_useragent.py
+++ /dev/null
@@ -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
diff --git a/searx/tests/test_plugins.py b/searx/tests/test_plugins.py
index c12e71e1d..15bcab475 100644
--- a/searx/tests/test_plugins.py
+++ b/searx/tests/test_plugins.py
@@ -38,10 +38,9 @@ class SelfIPTest(SearxTestCase):
 
     def test_PluginStore_init(self):
         store = plugins.PluginStore()
-        store.register(plugins.self_ip)
-        store.register(plugins.self_useragent)
+        store.register(plugins.self)
 
-        self.assertTrue(len(store.plugins) == 2)
+        self.assertTrue(len(store.plugins) == 1)
 
         # IP test
         request = Mock(user_plugins=store.plugins,
@@ -64,3 +63,6 @@ class SelfIPTest(SearxTestCase):
                               query='user agent')}
         store.call('post_search', request, ctx)
         self.assertTrue('Mock' in ctx['search'].answers)
+        ctx = {'search': Mock(answers=set(),
+                              query='What is my User-Agent?')}
+        store.call('post_search', request, ctx)