|  | @@ -4,26 +4,25 @@ from urllib import quote
 | 
											
												
													
														|  |  from lxml import html
 |  |  from lxml import html
 | 
											
												
													
														|  |  from urlparse import urljoin
 |  |  from urlparse import urljoin
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -categories = ['img']
 |  | 
 | 
											
												
													
														|  | 
 |  | +categories = ['images']
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  base_url = 'https://secure.flickr.com/'
 |  |  base_url = 'https://secure.flickr.com/'
 | 
											
												
													
														|  |  search_url = base_url+'search/?q='
 |  |  search_url = base_url+'search/?q='
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  def request(query, params):
 |  |  def request(query, params):
 | 
											
												
													
														|  |      global search_url
 |  |      global search_url
 | 
											
												
													
														|  | -    print 'qqwerqwerqwerqwer'
 |  | 
 | 
											
												
													
														|  |      query = quote(query.replace(' ', '+'), safe='+')
 |  |      query = quote(query.replace(' ', '+'), safe='+')
 | 
											
												
													
														|  |      params['url'] = search_url + query
 |  |      params['url'] = search_url + query
 | 
											
												
													
														|  |      return params
 |  |      return params
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  def response(resp):
 |  |  def response(resp):
 | 
											
												
													
														|  |      global base_url
 |  |      global base_url
 | 
											
												
													
														|  | -    print 'asdfasdfasdf'
 |  | 
 | 
											
												
													
														|  |      results = []
 |  |      results = []
 | 
											
												
													
														|  |      dom = html.fromstring(resp.text)
 |  |      dom = html.fromstring(resp.text)
 | 
											
												
													
														|  | -    for result in dom.xpath('//#thumbnails//a'):
 |  | 
 | 
											
												
													
														|  | 
 |  | +    for result in dom.xpath('//div[@id="thumbnails"]//a[@class="rapidnofollow photo-click" and @data-track="photo-click"]'):
 | 
											
												
													
														|  |          url = urljoin(base_url, result.attrib.get('href'))
 |  |          url = urljoin(base_url, result.attrib.get('href'))
 | 
											
												
													
														|  | -        title = result.xpath('./img')[0].attrib.get('alt')
 |  | 
 | 
											
												
													
														|  | -        content = "<img src='%s'></img>" % result.xpath('./img')[0].attrib.get('src')
 |  | 
 | 
											
												
													
														|  | 
 |  | +        img = result.xpath('.//img')[0]
 | 
											
												
													
														|  | 
 |  | +        title = img.attrib.get('alt', '')
 | 
											
												
													
														|  | 
 |  | +        content = '<img src="%s" alt="%s" />' % (img.attrib.get('data-defer-src', ''), title)
 | 
											
												
													
														|  |          results.append({'url': url, 'title': title, 'content': content})
 |  |          results.append({'url': url, 'title': title, 'content': content})
 | 
											
												
													
														|  |      return results
 |  |      return results
 |