96dfb86 · searx · git.iko.soy

git.iko.soy/searx

Merge pull request #361 from asciimoo/https

bing_images & www1x engines use https connections

commit96dfb86947d11a4e85f9f34704c8fa503290c8b0 authorAdam Tauber <asciimoo@gmail.com> dateMon 8 Jun 2015, 08:12 (11 years ago) parent4e28f12 ded3f98

4 files changed+6−6

compare with master

unifiedsplit

searx/engines/bing_images.py+1−1 searx/engines/www1x.py+2−2 searx/tests/engines/test_bing_images.py+1−1 searx/tests/engines/test_www1x.py+2−2

searx/engines/bing_images.py+1−1

@@ -28,7 +28,7 @@ safesearch = True

2828# search-url

2929base_url = 'https://www.bing.com/'

3030search_string = 'images/search?{query}&count=10&first={offset}'

31−thumb_url = "http://ts1.mm.bing.net/th?id={ihk}" # no https, bad certificate

31+thumb_url = "https://www.bing.com/th?id={ihk}"

3232

3333# safesearch definitions

3434safesearch_types = {2: 'STRICT',

searx/engines/www1x.py+2−2

@@ -20,8 +20,8 @@ import re

2020categories = ['images']

2121paging = False

2222

23−# search-url, no HTTPS (there is a valid certificate for https://api2.1x.com/ )

24−base_url = 'http://1x.com'

23+# search-url

24+base_url = 'https://1x.com'

2525search_url = base_url+'/backend/search.php?{query}'

2626

2727

searx/tests/engines/test_bing_images.py+1−1

@@ -59,7 +59,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2

5959 self.assertEqual(results[0]['title'], 'Test Query')

6060 self.assertEqual(results[0]['url'], 'http://www.page.url/')

6161 self.assertEqual(results[0]['content'], '')

62− self.assertEqual(results[0]['thumbnail_src'], 'http://ts1.mm.bing.net/th?id=HN.608003696942779811')

62+ self.assertEqual(results[0]['thumbnail_src'], 'https://www.bing.com/th?id=HN.608003696942779811')

6363 self.assertEqual(results[0]['img_src'], 'http://test.url/Test%20Query.jpg')

6464

6565 html = """

searx/tests/engines/test_www1x.py+2−2

@@ -51,7 +51,7 @@ class TestWww1xEngine(SearxTestCase):

5151 results = www1x.response(response)

5252 self.assertEqual(type(results), list)

5353 self.assertEqual(len(results), 1)

54− self.assertEqual(results[0]['url'], 'http://1x.com/photo/123456')

55− self.assertEqual(results[0]['thumbnail_src'], 'http://1x.com/images/user/testimage-123456.jpg')

54+ self.assertEqual(results[0]['url'], 'https://1x.com/photo/123456')

55+ self.assertEqual(results[0]['thumbnail_src'], 'https://1x.com/images/user/testimage-123456.jpg')

5656 self.assertEqual(results[0]['content'], '')

5757 self.assertEqual(results[0]['template'], 'images.html')