Merge ec8223e22c244b7587a6ab7e3fcb9e73e8aed132 into 49b6206d6cbfdc19e2bb2c42e999fd7caa776a09

searx/engines/currency_convert.py

@@ -14,7 +14,7 @@ categories = []
 url = 'https://finance.google.com/finance/converter?a=1&from={0}&to={1}'
 weight = 100
 
-parser_re = re.compile(b'.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I)
+parser_re = re.compile(b'.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to|en) ([^.0-9]+)', re.I)
 
 db = 1
 
@@ -35,15 +35,21 @@ def name_to_iso4217(name):
 
 def iso4217_to_name(iso4217, language):
     global db
-
     return db['iso4217'].get(iso4217, {}).get(language, iso4217)
 
 
-def request(query, params):
+def is_accepted(query, params):
     m = parser_re.match(query)
     if not m:
         # wrong query
-        return params
+        return False
+
+    params['parsed_regex'] = m
+    return True
+
+
+def request(query, params):
+    m = params['parsed_regex']
 
     amount, from_currency, to_currency = m.groups()
     amount = float(amount)
@@ -97,7 +103,7 @@ def load():
     current_dir = os.path.dirname(os.path.realpath(__file__))
     json_data = open(current_dir + "/../data/currencies.json", 'r', encoding='utf-8').read()
 
-    db = json.loads(json_data)
+    db = json.loads(json_data, encoding="utf-8")
 
 
 load()

searx/engines/dictzone.py

@@ -15,17 +15,20 @@ from searx.utils import is_valid_lang
 from searx.url_utils import urljoin
 
 categories = ['general']
-url = u'http://dictzone.com/{from_lang}-{to_lang}-dictionary/{query}'
+url = u'https://dictzone.com/{from_lang}-{to_lang}-dictionary/{query}'
 weight = 100
 
 parser_re = re.compile(b'.*?([a-z]+)-([a-z]+) ([^ ]+)$', re.I)
 results_xpath = './/table[@id="r"]/tr'
 
 
-def request(query, params):
-    m = parser_re.match(query)
+def is_accepted(query, params):
+    m = parser_re.match(unicode(query, 'utf8'))
     if not m:
-        return params
+        # wrong query
+        return False
+
+    params["parsed_regex"] = m
 
     from_lang, to_lang, query = m.groups()
 
@@ -33,11 +36,23 @@ def request(query, params):
     to_lang = is_valid_lang(to_lang)
 
     if not from_lang or not to_lang:
+        return False
+
+    params['from_lang'] = from_lang
+    params['to_lang'] = to_lang
+    params['query'] = query
+
+    return True
+
+
+def request(query, params):
+    m = params["parsed_regex"]
+    if not m:
         return params
 
-    params['url'] = url.format(from_lang=from_lang[2],
-                               to_lang=to_lang[2],
-                               query=query.decode('utf-8'))
+    params['url'] = url.format(from_lang=params['from_lang'][2],
+                               to_lang=params['to_lang'][2],
+                               query=params['query'])
 
     return params
 
@@ -45,6 +60,9 @@ def request(query, params):
 def response(resp):
     results = []
 
+    if resp.status_code != 200:
+        return results
+
     dom = html.fromstring(resp.text)
 
     for k, result in enumerate(dom.xpath(results_xpath)[1:]):
@@ -61,7 +79,10 @@ def response(resp):
 
         results.append({
             'url': urljoin(resp.url, '?%d' % k),
-            'title': from_result.text_content(),
+            'title': '[{0}-{1}] {2}'.format(
+                resp.search_params['from_lang'][1],
+                resp.search_params['to_lang'][1],
+                from_result.text_content()),
             'content': '; '.join(to_results)
         })
 

searx/engines/translated.py

@@ -24,10 +24,13 @@ parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I)
 api_key = ''
 
 
-def request(query, params):
+def is_accepted(query, params):
     m = parser_re.match(unicode(query, 'utf8'))
     if not m:
-        return params
+        # wrong query
+        return False
+
+    params["parsed_regex"] = m
 
     from_lang, to_lang, query = m.groups()
 
@@ -35,20 +38,26 @@ def request(query, params):
     to_lang = is_valid_lang(to_lang)
 
     if not from_lang or not to_lang:
-        return params
+        return False
+
+    params['from_lang'] = from_lang
+    params['to_lang'] = to_lang
+    params['query'] = query
+
+    return True
+
+
+def request(query, params):
+    m = params["parsed_regex"]
 
     if api_key:
         key_form = '&key=' + api_key
     else:
         key_form = ''
-    params['url'] = url.format(from_lang=from_lang[1],
-                               to_lang=to_lang[1],
-                               query=query,
+    params['url'] = url.format(from_lang=params['from_lang'][1],
+                               to_lang=params['to_lang'][1],
+                               query=params['query'],
                                key=key_form)
-    params['query'] = query
-    params['from_lang'] = from_lang
-    params['to_lang'] = to_lang
-
     return params
 
 

searx/search.py

@@ -401,6 +401,11 @@ class Search(object):
             request_params['safesearch'] = search_query.safesearch
             request_params['time_range'] = search_query.time_range
 
+            # check if the engine accepts the request
+            if hasattr(engine, 'is_accepted'):
+                if not engine.is_accepted(search_query.query, request_params):
+                    continue
+
             # append request to list
             requests.append((selected_engine['name'], search_query.query, request_params))
 

tests/unit/engines/test_currency_convert.py

@@ -11,10 +11,10 @@ class TestCurrencyConvertEngine(SearxTestCase):
         query = b'test_query'
         dicto = defaultdict(dict)
         dicto['pageno'] = 1
-        params = currency_convert.request(query, dicto)
-        self.assertNotIn('url', params)
+        self.assertFalse(currency_convert.is_accepted(query, dicto))
 
         query = b'convert 10 Pound Sterlings to United States Dollars'
+        self.assertTrue(currency_convert.is_accepted(query, dicto))
         params = currency_convert.request(query, dicto)
         self.assertIn('url', params)
         self.assertIn('finance.google.com', params['url'])