OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

Merge pull request #361 from asciimoo/https

Browse source 
bing_images & www1x engines use https connections
This commit is contained in:
Adam Tauber 2015-06-08 08:12:01 -04:00
commit 96dfb86947
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
searx/engines/bing_images.py
View file

@ -28,7 +28,7 @@ safesearch = True
# search-url # search-url
base_url = 'https://www.bing.com/' base_url = 'https://www.bing.com/'
search_string = 'images/search?{query}&count=10&first={offset}' search_string = 'images/search?{query}&count=10&first={offset}'
thumb_url = "http://ts1.mm.bing.net/th?id={ihk}" # no https, bad certificate thumb_url = "https://www.bing.com/th?id={ihk}"
# safesearch definitions # safesearch definitions
safesearch_types = {2: 'STRICT', safesearch_types = {2: 'STRICT',

4
searx/engines/www1x.py
View file

@ -20,8 +20,8 @@ import re
categories = ['images'] categories = ['images']
paging = False paging = False
# search-url, no HTTPS (there is a valid certificate for https://api2.1x.com/ ) # search-url
base_url = 'http://1x.com' base_url = 'https://1x.com'
search_url = base_url+'/backend/search.php?{query}' search_url = base_url+'/backend/search.php?{query}'

2
searx/tests/engines/test_bing_images.py
View file

@ -59,7 +59,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2
self.assertEqual(results[0]['title'], 'Test Query') self.assertEqual(results[0]['title'], 'Test Query')
self.assertEqual(results[0]['url'], 'http://www.page.url/') self.assertEqual(results[0]['url'], 'http://www.page.url/')
self.assertEqual(results[0]['content'], '') self.assertEqual(results[0]['content'], '')
self.assertEqual(results[0]['thumbnail_src'], 'http://ts1.mm.bing.net/th?id=HN.608003696942779811') self.assertEqual(results[0]['thumbnail_src'], 'https://www.bing.com/th?id=HN.608003696942779811')
self.assertEqual(results[0]['img_src'], 'http://test.url/Test%20Query.jpg') self.assertEqual(results[0]['img_src'], 'http://test.url/Test%20Query.jpg')
html = """ html = """

4
searx/tests/engines/test_www1x.py
View file

@ -51,7 +51,7 @@ class TestWww1xEngine(SearxTestCase):
results = www1x.response(response) results = www1x.response(response)
self.assertEqual(type(results), list) self.assertEqual(type(results), list)
self.assertEqual(len(results), 1) self.assertEqual(len(results), 1)
self.assertEqual(results[0]['url'], 'http://1x.com/photo/123456') self.assertEqual(results[0]['url'], 'https://1x.com/photo/123456')
self.assertEqual(results[0]['thumbnail_src'], 'http://1x.com/images/user/testimage-123456.jpg') self.assertEqual(results[0]['thumbnail_src'], 'https://1x.com/images/user/testimage-123456.jpg')
self.assertEqual(results[0]['content'], '') self.assertEqual(results[0]['content'], '')
self.assertEqual(results[0]['template'], 'images.html') self.assertEqual(results[0]['template'], 'images.html')