remove 'all' option from search languages (4d177039) · Commits · e / infra / spot

searx/engines/archlinux.py

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@ xpath_results = '//ul[@class="mw-search-results"]/li'
	xpath_link = './/div[@class="mw-search-result-heading"]/a'		xpath_link = './/div[@class="mw-search-result-heading"]/a'


	# cut 'en' from 'en_US', 'de' from 'de_CH', and so on		# cut 'en' from 'en-US', 'de' from 'de-CH', and so on
	def locale_to_lang_code(locale):		def locale_to_lang_code(locale):
	if locale.find('-') >= 0:		if locale.find('-') >= 0:
	locale = locale.split('-')[0]		locale = locale.split('-')[0]
	@@ -36,7 +36,7 @@ def locale_to_lang_code(locale):
	# wikis for some languages were moved off from the main site, we need to make		# wikis for some languages were moved off from the main site, we need to make
	# requests to correct URLs to be able to get results in those languages		# requests to correct URLs to be able to get results in those languages
	lang_urls = {		lang_urls = {
	'all': {		'en': {
	'base': 'https://wiki.archlinux.org',		'base': 'https://wiki.archlinux.org',
	'search': '/index.php?title=Special:Search&offset={offset}&{query}'		'search': '/index.php?title=Special:Search&offset={offset}&{query}'
	},		},
	@@ -67,7 +67,7 @@ lang_urls = {
	def get_lang_urls(language):		def get_lang_urls(language):
	if language in lang_urls:		if language in lang_urls:
	return lang_urls[language]		return lang_urls[language]
	return lang_urls['all']		return lang_urls['en']


	# Language names to build search requests for		# Language names to build search requests for

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -32,10 +32,7 @@ search_string = 'search?{query}&first={offset}'
	def request(query, params):		def request(query, params):
	offset = (params['pageno'] - 1) * 10 + 1		offset = (params['pageno'] - 1) * 10 + 1

	if params['language'] != 'all':
	lang = params['language'].split('-')[0].upper()		lang = params['language'].split('-')[0].upper()
	else:
	lang = 'EN'

	query = u'language:{} {}'.format(lang, query.decode('utf-8')).encode('utf-8')		query = u'language:{} {}'.format(lang, query.decode('utf-8')).encode('utf-8')

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -71,9 +71,6 @@ def request(query, params):

	offset = (params['pageno'] - 1) * 10 + 1		offset = (params['pageno'] - 1) * 10 + 1

	if params['language'] == 'all':
	language = 'en-US'
	else:
	language = params['language']		language = params['language']

	params['url'] = _get_url(query, language, offset, params['time_range'])		params['url'] = _get_url(query, language, offset, params['time_range'])

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -32,9 +32,6 @@ supported_languages_url = 'https://api.dailymotion.com/languages'

	# do search-request		# do search-request
	def request(query, params):		def request(query, params):
	if params['language'] == 'all':
	locale = 'en-US'
	else:
	locale = params['language']		locale = params['language']

	params['url'] = search_url.format(		params['url'] = search_url.format(

+3 −9

Original line number	Original line	Diff line number	Diff line
	@@ -44,9 +44,7 @@ content_xpath = './/a[@class="result__snippet"]'
	# match query's language to a region code that duckduckgo will accept		# match query's language to a region code that duckduckgo will accept
	def get_region_code(lang, lang_list=None):		def get_region_code(lang, lang_list=None):
	# custom fixes for languages		# custom fixes for languages
	if lang == 'all':		if lang[:2] == 'ja':
	region_code = None
	elif lang[:2] == 'ja':
	region_code = 'jp-jp'		region_code = 'jp-jp'
	elif lang[:2] == 'sl':		elif lang[:2] == 'sl':
	region_code = 'sl-sl'		region_code = 'sl-sl'
	@@ -82,12 +80,8 @@ def request(query, params):
	offset = (params['pageno'] - 1) * 30		offset = (params['pageno'] - 1) * 30

	region_code = get_region_code(params['language'])		region_code = get_region_code(params['language'])
	if region_code:
	params['url'] = url.format(		params['url'] = url.format(
	query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)		query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)
	else:
	params['url'] = url.format(
	query=urlencode({'q': query}), offset=offset, dc_param=offset)

	if params['time_range'] in time_range_dict:		if params['time_range'] in time_range_dict:
	params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])		params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])