git.iko.soy/searx
on master help sign in
[enh] is_valid_lang moved to utils
commit983415bc38937a637e9b2aae191f2e087765800b authorpotato <mail@crazypotato.tk> dateTue 6 Sep 2016, 16:43 (10 years ago) parentb7d578a
3 files changed+19−32
compare with master
unifiedsplit
searx/engines/dictzone.py+3−17 searx/engines/translated.py+1−15 searx/utils.py+15
searx/engines/dictzone.py+3−17
@@ -14,7 +14,7 @@ from urlparse import urljoin
1414from lxml import html
1515from cgi import escape
1616from searx.engines.xpath import extract_text
17−from searx.languages import language_codes
17+from searx.utils import is_valid_lang
1818
1919categories = ['general']
2020url = 'http://dictzone.com/{from_lang}-{to_lang}-dictionary/{query}'
@@ -24,20 +24,6 @@ parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) ([^ ]+)$', re.I)
2424results_xpath = './/table[@id="r"]/tr'
2525
2626
27−def is_valid_lang(lang):
28− is_abbr = (len(lang) == 2)
29− if is_abbr:
30− for l in language_codes:
31− if l[0][:2] == lang.lower():
32− return (True, l[1].lower())
33− return False
34− else:
35− for l in language_codes:
36− if l[1].lower() == lang.lower():
37− return (True, l[1].lower())
38− return False
39−
40−
4127def request(query, params):
4228 m = parser_re.match(unicode(query, 'utf8'))
4329 if not m:
@@ -51,8 +37,8 @@ def request(query, params):
5137 if not from_lang or not to_lang:
5238 return params
5339
54− params['url'] = url.format(from_lang=from_lang[1],
55− to_lang=to_lang[1],
40+ params['url'] = url.format(from_lang=from_lang[2],
41+ to_lang=to_lang[2],
5642 query=query)
5743
5844 return params
searx/engines/translated.py+1−15
@@ -13,7 +13,7 @@ from urlparse import urljoin
1313from lxml import html
1414from cgi import escape
1515from searx.engines.xpath import extract_text
16−from searx.languages import language_codes
16+from searx.utils import is_valid_lang
1717
1818categories = ['general']
1919url = 'http://api.mymemory.translated.net/get?q={query}' \
@@ -25,20 +25,6 @@ parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I)
2525api_key = ''
2626
2727
28−def is_valid_lang(lang):
29− is_abbr = (len(lang) == 2)
30− if is_abbr:
31− for l in language_codes:
32− if l[0][:2] == lang.lower():
33− return (True, l[0][:2], l[1].lower())
34− return False
35− else:
36− for l in language_codes:
37− if l[1].lower() == lang.lower():
38− return (True, l[0][:2], l[1].lower())
39− return False
40−
41−
4228def request(query, params):
4329 m = parser_re.match(unicode(query, 'utf8'))
4430 if not m:
searx/utils.py+15
@@ -9,6 +9,7 @@ from HTMLParser import HTMLParser
99from random import choice
1010
1111from searx.version import VERSION_STRING
12+from searx.languages import language_codes
1213from searx import settings
1314from searx import logger
1415
@@ -255,3 +256,17 @@ def get_torrent_size(filesize, filesize_multiplier):
255256 filesize = None
256257
257258 return filesize
259+
260+
261+def is_valid_lang(lang):
262+ is_abbr = (len(lang) == 2)
263+ if is_abbr:
264+ for l in language_codes:
265+ if l[0][:2] == lang.lower():
266+ return (True, l[0][:2], l[1].lower())
267+ return False
268+ else:
269+ for l in language_codes:
270+ if l[1].lower() == lang.lower():
271+ return (True, l[0][:2], l[1].lower())
272+ return False