瀏覽代碼

Merge pull request #307 from dalf/master

[fix] Flickr engine
Adam Tauber 10 年之前
父節點
當前提交
b3513aa3a6
共有 2 個檔案被更改,包括 7 行新增8 行删除
  1. 2
    2
      searx/engines/flickr_noapi.py
  2. 5
    6
      searx/utils.py

+ 2
- 2
searx/engines/flickr_noapi.py 查看文件

20
 
20
 
21
 categories = ['images']
21
 categories = ['images']
22
 
22
 
23
-url = 'https://secure.flickr.com/'
24
-search_url = url + 'search/?{query}&page={page}'
23
+url = 'https://www.flickr.com/'
24
+search_url = url + 'search?{query}&page={page}'
25
 photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}'
25
 photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}'
26
 regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL)
26
 regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL)
27
 image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's')
27
 image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's')

+ 5
- 6
searx/utils.py 查看文件

17
 
17
 
18
 logger = logger.getChild('utils')
18
 logger = logger.getChild('utils')
19
 
19
 
20
-ua_versions = ('31.0',
21
-               '32.0',
22
-               '33.0',
20
+ua_versions = ('33.0',
23
                '34.0',
21
                '34.0',
24
-               '35.0')
22
+               '35.0',
23
+               '36.0',
24
+               '37.0')
25
 
25
 
26
 ua_os = ('Windows NT 6.3; WOW64',
26
 ua_os = ('Windows NT 6.3; WOW64',
27
          'X11; Linux x86_64',
27
          'X11; Linux x86_64',
28
          'X11; Linux x86')
28
          'X11; Linux x86')
29
-
30
-ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}"
29
+ua = "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}"
31
 
30
 
32
 blocked_tags = ('script',
31
 blocked_tags = ('script',
33
                 'style')
32
                 'style')