add duckduckgo images engine

1 files changed, 35 insertions, 30 deletions

diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py
index 1872ab7d4..1c0587451 100644
--- a/searx/engines/duckduckgo.py
+++ b/searx/engines/duckduckgo.py
@@ -41,46 +41,51 @@ title_xpath = './/a[@class="result__a"]'
 content_xpath = './/a[@class="result__snippet"]'
 
 
-# do search-request
-def request(query, params):
-    if params['time_range'] and params['time_range'] not in time_range_dict:
-        return params
-
-    offset = 30 + (params['pageno'] - 1) * 50
-    dc_param = offset + 1
-
+# match query's language to a region code that duckduckgo will accept
+def get_region_code(lang):
     # custom fixes for languages
-    if params['language'] == 'all':
-        locale = None
-    elif params['language'][:2] == 'ja':
-        locale = 'jp-jp'
-    elif params['language'][:2] == 'sl':
-        locale = 'sl-sl'
-    elif params['language'] == 'zh-TW':
-        locale = 'tw-tzh'
-    elif params['language'] == 'zh-HK':
-        locale = 'hk-tzh'
-    elif params['language'][-2:] == 'SA':
-        locale = 'xa-' + params['language'].split('-')[0]
-    elif params['language'][-2:] == 'GB':
-        locale = 'uk-' + params['language'].split('-')[0]
+    if lang == 'all':
+        region_code = None
+    elif lang[:2] == 'ja':
+        region_code = 'jp-jp'
+    elif lang[:2] == 'sl':
+        region_code = 'sl-sl'
+    elif lang == 'zh-TW':
+        region_code = 'tw-tzh'
+    elif lang == 'zh-HK':
+        region_code = 'hk-tzh'
+    elif lang[-2:] == 'SA':
+        region_code = 'xa-' + lang.split('-')[0]
+    elif lang[-2:] == 'GB':
+        region_code = 'uk-' + lang.split('-')[0]
     else:
-        locale = params['language'].split('-')
-        if len(locale) == 2:
+        region_code = lang.split('-')
+        if len(region_code) == 2:
             # country code goes first
-            locale = locale[1].lower() + '-' + locale[0].lower()
+            region_code = region_code[1].lower() + '-' + region_code[0].lower()
         else:
             # tries to get a country code from language
-            locale = locale[0].lower()
+            region_code = region_code[0].lower()
             for lc in supported_languages:
                 lc = lc.split('-')
-                if locale == lc[0]:
-                    locale = lc[1].lower() + '-' + lc[0].lower()
+                if region_code == lc[0]:
+                    region_code = lc[1].lower() + '-' + lc[0].lower()
                     break
+    return region_code
+
+
+# do search-request
+def request(query, params):
+    if params['time_range'] and params['time_range'] not in time_range_dict:
+        return params
+
+    offset = 30 + (params['pageno'] - 1) * 50
+    dc_param = offset + 1
 
-    if locale:
+    region_code = get_region_code(params['language'])
+    if region_code:
         params['url'] = url.format(
-            query=urlencode({'q': query, 'kl': locale}), offset=offset, dc_param=dc_param)
+            query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=dc_param)
     else:
         params['url'] = url.format(
             query=urlencode({'q': query}), offset=offset, dc_param=dc_param)