Explorar el Código

[enh] currency_convert: allow strings like google's "convert 1 euro to dollars"

Maxqia hace 9 años
padre
commit
fe2ce83e41
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2
    2
      searx/engines/currency_convert.py

+ 2
- 2
searx/engines/currency_convert.py Ver fichero

@@ -9,7 +9,7 @@ categories = []
9 9
 url = 'https://download.finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s={query}=X'
10 10
 weight = 100
11 11
 
12
-parser_re = re.compile(u'^\W*(\d+(?:\.\d+)?)\W*([^.0-9].+)\W+in?\W+([^\.]+)\W*$', re.I)  # noqa
12
+parser_re = re.compile(u'.*?(\d+(?:\.\d+)?) ([^.0-9].+) (in|to) ([^\.]+)\W*$', re.I)  # noqa
13 13
 
14 14
 db = 1
15 15
 
@@ -40,7 +40,7 @@ def request(query, params):
40 40
         # wrong query
41 41
         return params
42 42
 
43
-    ammount, from_currency, to_currency = m.groups()
43
+    ammount, from_currency, none, to_currency = m.groups()
44 44
     ammount = float(ammount)
45 45
     from_currency = name_to_iso4217(from_currency.strip())
46 46
     to_currency = name_to_iso4217(to_currency.strip())