git.iko.soy/searx
on master help sign in
Merge pull request #1079 from pyrrh0n1c/master

Fixed the currency_convert engine.

commitd00aaeedfac7b86cbcb82e352d2f92438083e4c2 authorAdam Tauber <asciimoo@gmail.com> dateTue 7 Nov 2017, 16:05 (9 years ago) parent00a7041a1d1a50
2 files changed+21−23
compare with master
unifiedsplit
searx/engines/currency_convert.py+13−16 tests/unit/engines/test_currency_convert.py+8−7
searx/engines/currency_convert.py+13−16
@@ -10,7 +10,7 @@ if sys.version_info[0] == 3:
1010 unicode = str
1111
1212categories = []
13−url = 'https://download.finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s={query}=X'
13+url = 'https://finance.google.com/finance/converter?a=1&from={0}&to={1}'
1414weight = 100
1515
1616parser_re = re.compile(b'.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I)
@@ -44,15 +44,15 @@ def request(query, params):
4444 # wrong query
4545 return params
4646
47− ammount, from_currency, to_currency = m.groups()
48− ammount = float(ammount)
47+ amount, from_currency, to_currency = m.groups()
48+ amount = float(amount)
4949 from_currency = name_to_iso4217(from_currency.strip())
5050 to_currency = name_to_iso4217(to_currency.strip())
5151
5252 q = (from_currency + to_currency).upper()
5353
54− params['url'] = url.format(query=q)
55− params['ammount'] = ammount
54+ params['url'] = url.format(from_currency, to_currency)
55+ params['amount'] = amount
5656 params['from'] = from_currency
5757 params['to'] = to_currency
5858 params['from_name'] = iso4217_to_name(from_currency, 'en')
@@ -63,30 +63,27 @@ def request(query, params):
6363
6464def response(resp):
6565 results = []
66+ pat = '<span class=bld>(.+) {0}</span>'.format(
67+ resp.search_params['to'].upper())
68+
6669 try:
67− _, conversion_rate, _ = resp.text.split(',', 2)
70+ conversion_rate = re.findall(pat, resp.text)[0]
6871 conversion_rate = float(conversion_rate)
6972 except:
7073 return results
7174
7275 answer = '{0} {1} = {2} {3}, 1 {1} ({5}) = {4} {3} ({6})'.format(
73− resp.search_params['ammount'],
76+ resp.search_params['amount'],
7477 resp.search_params['from'],
75− resp.search_params['ammount'] * conversion_rate,
78+ resp.search_params['amount'] * conversion_rate,
7679 resp.search_params['to'],
7780 conversion_rate,
7881 resp.search_params['from_name'],
7982 resp.search_params['to_name'],
8083 )
8184
82− now_date = datetime.now().strftime('%Y%m%d')
83− url = 'https://finance.yahoo.com/currency/converter-results/{0}/{1}-{2}-to-{3}.html' # noqa
84− url = url.format(
85− now_date,
86− resp.search_params['ammount'],
87− resp.search_params['from'].lower(),
88− resp.search_params['to'].lower()
89− )
85+ url = 'https://finance.google.com/finance?q={0}{1}'.format(
86+ resp.search_params['from'].upper(), resp.search_params['to'])
9087
9188 results.append({'answer': answer, 'url': url})
9289
tests/unit/engines/test_currency_convert.py+8−7
@@ -17,13 +17,13 @@ class TestCurrencyConvertEngine(SearxTestCase):
1717 query = b'convert 10 Pound Sterlings to United States Dollars'
1818 params = currency_convert.request(query, dicto)
1919 self.assertIn('url', params)
20− self.assertIn('finance.yahoo.com', params['url'])
20+ self.assertIn('finance.google.com', params['url'])
2121 self.assertIn('GBP', params['url'])
2222 self.assertIn('USD', params['url'])
2323
2424 def test_response(self):
2525 dicto = defaultdict(dict)
26− dicto['ammount'] = float(10)
26+ dicto['amount'] = float(10)
2727 dicto['from'] = "GBP"
2828 dicto['to'] = "USD"
2929 dicto['from_name'] = "pound sterling"
@@ -31,13 +31,14 @@ class TestCurrencyConvertEngine(SearxTestCase):
3131 response = mock.Mock(text='a,b,c,d', search_params=dicto)
3232 self.assertEqual(currency_convert.response(response), [])
3333
34− csv = "2,0.5,1"
35− response = mock.Mock(text=csv, search_params=dicto)
34+ body = "<span class=bld>0.5 {}</span>".format(dicto['to'])
35+ response = mock.Mock(text=body, search_params=dicto)
3636 results = currency_convert.response(response)
3737 self.assertEqual(type(results), list)
3838 self.assertEqual(len(results), 1)
3939 self.assertEqual(results[0]['answer'], '10.0 GBP = 5.0 USD, 1 GBP (pound sterling)' +
4040 ' = 0.5 USD (United States dollar)')
41− now_date = datetime.now().strftime('%Y%m%d')
42− self.assertEqual(results[0]['url'], 'https://finance.yahoo.com/currency/converter-results/' +
43− now_date + '/10.0-gbp-to-usd.html')
41+
42+ target_url = 'https://finance.google.com/finance?q={}{}'.format(
43+ dicto['from'], dicto['to'])
44+ self.assertEqual(results[0]['url'], target_url)