ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

switched currency convert to duckduckgo and added Bitcoin to currency list

This commit is contained in:
rinpatch 2018-04-22 13:46:13 +03:00
parent 829d479312
commit a305dae9d8
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
searx/data/currencies.json
View File

@ -6163,9 +6163,21 @@
], ],
"scellino keniota": [ "scellino keniota": [
"KES" "KES"
] ],
"bitcoin": [
"XBT"
]
}, },
"iso4217": { "iso4217": {
"XBT":{
"fr": "Bitcoin",
"en": "Bitcoin",
"nl": "Bitcoin",
"de": "Bitcoin",
"it": "Bitcoin",
"hu": "Bitcoin",
"es": "Bitcoin"
},
"DZD": { "DZD": {
"fr": "Dinar alg\u00e9rien", "fr": "Dinar alg\u00e9rien",
"en": "Algerian dinar", "en": "Algerian dinar",
@ -7652,4 +7664,4 @@
"es": "Libra sudanesa" "es": "Libra sudanesa"
} }
} }
} }

13
searx/engines/currency_convert.py
View File

@ -11,7 +11,7 @@ if sys.version_info[0] == 3:
unicode = str unicode = str
categories = [] categories = []
url = 'https://finance.google.com/finance/converter?a=1&from={0}&to={1}' url = 'https://duckduckgo.com/js/spice/currency/1/{0}/{1}'
weight = 100 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) ([^.0-9]+)', re.I)
@ -63,16 +63,13 @@ def request(query, params):
def response(resp): def response(resp):
"""remove first and last lines to get only json"""
json_resp = resp.text[resp.text.find('\n')+1:resp.text.rfind('\n')-2]
results = [] results = []
pat = '<span class=bld>(.+) {0}</span>'.format(
resp.search_params['to'].upper())
try: try:
conversion_rate = re.findall(pat, resp.text)[0] conversion_rate = float(json.loads(json_resp)['conversion']['converted-amount'])
conversion_rate = float(conversion_rate)
except: except:
return results return results
answer = '{0} {1} = {2} {3}, 1 {1} ({5}) = {4} {3} ({6})'.format( answer = '{0} {1} = {2} {3}, 1 {1} ({5}) = {4} {3} ({6})'.format(
resp.search_params['amount'], resp.search_params['amount'],
resp.search_params['from'], resp.search_params['from'],
@ -83,7 +80,7 @@ def response(resp):
resp.search_params['to_name'], resp.search_params['to_name'],
) )
url = 'https://finance.google.com/finance?q={0}{1}'.format( url = 'https://duckduckgo.com/js/spice/currency/1/{0}/{1}'.format(
resp.search_params['from'].upper(), resp.search_params['to']) resp.search_params['from'].upper(), resp.search_params['to'])
results.append({'answer': answer, 'url': url}) results.append({'answer': answer, 'url': url})