From 7afd02c94e7c535af7730b6a058238efcadd750b Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Wed, 27 May 2015 13:49:25 +0200
Subject: [fix] flickr engine

---
 searx/engines/flickr_noapi.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'searx/engines/flickr_noapi.py')

diff --git a/searx/engines/flickr_noapi.py b/searx/engines/flickr_noapi.py
index 2071b8e36..87b912eb3 100644
--- a/searx/engines/flickr_noapi.py
+++ b/searx/engines/flickr_noapi.py
@@ -25,7 +25,7 @@ categories = ['images']
 url = 'https://www.flickr.com/'
 search_url = url + 'search?{query}&page={page}'
 photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}'
-regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL)
+regex = re.compile(r"\"search-photos-lite-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL)
 image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's')
 
 paging = True
@@ -38,6 +38,7 @@ def build_flickr_url(user_id, photo_id):
 def request(query, params):
     params['url'] = search_url.format(query=urlencode({'text': query}),
                                       page=params['pageno'])
+
     return params
 
 
@@ -75,10 +76,10 @@ def response(resp):
             logger.debug('cannot find valid image size: {0}'.format(repr(photo)))
             continue
 
-        if 'id' not in photo['owner']:
+        if 'ownerNsid' not in photo:
             continue
 
-# For a bigger thumbnail, keep only the url_z, not the url_n
+        # For a bigger thumbnail, keep only the url_z, not the url_n
         if 'n' in photo['sizes']:
             thumbnail_src = photo['sizes']['n']['url']
         elif 'z' in photo['sizes']:
@@ -86,20 +87,14 @@ def response(resp):
         else:
             thumbnail_src = img_src
 
-        url = build_flickr_url(photo['owner']['id'], photo['id'])
+        url = build_flickr_url(photo['ownerNsid'], photo['id'])
 
         title = photo.get('title', '')
 
         content = '<span class="photo-author">' +\
-                  photo['owner']['username'] +\
+                  photo['username'] +\
                   '</span><br />'
 
-        if 'description' in photo:
-            content = content +\
-                '<span class="description">' +\
-                photo['description'] +\
-                '</span>'
-
         # append result
         results.append({'url': url,
                         'title': title,
-- 
cgit v1.2.3