@@ -24,7 +24,7 @@ time_range_support = True
25# search-url
25# search-url
26base_url = 'https://www.deviantart.com/'
26base_url = 'https://www.deviantart.com/'
27−search_url = base_url + 'browse/all/?offset={offset}&{query}'
27+search_url = base_url + 'search?page={page}&{query}'
28time_range_url = '&order={range}'
28time_range_url = '&order={range}'
30time_range_dict = {'day': 11,
30time_range_dict = {'day': 11,
@@ -37,9 +37,8 @@ def request(query, params):
37 if params['time_range'] and params['time_range'] not in time_range_dict:
37 if params['time_range'] and params['time_range'] not in time_range_dict:
38 return params
38 return params
40− offset = (params['pageno'] - 1) * 24
42− params['url'] = search_url.format(offset=offset,
41+ params['url'] = search_url.format(page=params['pageno'],
43 query=urlencode({'q': query}))
42 query=urlencode({'q': query}))
44 if params['time_range'] in time_range_dict:
43 if params['time_range'] in time_range_dict:
45 params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
44 params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
@@ -57,28 +56,28 @@ def response(resp):
58 dom = html.fromstring(resp.text)
57 dom = html.fromstring(resp.text)
60− regex = re.compile(r'\/200H\/')
62 # parse results
60 # parse results
63− for result in dom.xpath('.//span[@class="thumb wide"]'):
61+ for row in dom.xpath('//div[contains(@data-hook, "content_row")]'):
62+ for result in row.xpath('./div'):
64− link = result.xpath('.//a[@class="torpedo-thumb-link"]')[0]
63+ link = result.xpath('.//a[@data-hook="deviation_link"]')[0]
65− url = link.attrib.get('href')
64+ url = link.attrib.get('href')
66− title = extract_text(result.xpath('.//span[@class="title"]'))
65+ title = link.attrib.get('title')
67− thumbnail_src = link.xpath('.//img')[0].attrib.get('src')
66+ thumbnail_src = result.xpath('.//img')[0].attrib.get('src')
68− img_src = regex.sub('/', thumbnail_src)
67+ img_src = thumbnail_src
70− # http to https, remove domain sharding
69+ # http to https, remove domain sharding
71− thumbnail_src = re.sub(r"https?://(th|fc)\d+.", "https://th01.", thumbnail_src)
70+ thumbnail_src = re.sub(r"https?://(th|fc)\d+.", "https://th01.", thumbnail_src)
72− thumbnail_src = re.sub(r"http://", "https://", thumbnail_src)
71+ thumbnail_src = re.sub(r"http://", "https://", thumbnail_src)
74− url = re.sub(r"http://(.*)\.deviantart\.com/", "https://\\1.deviantart.com/", url)
73+ url = re.sub(r"http://(.*)\.deviantart\.com/", "https://\\1.deviantart.com/", url)
76− # append result
75+ # append result
77− results.append({'url': url,
76+ results.append({'url': url,
78− 'title': title,
77+ 'title': title,
79− 'img_src': img_src,
78+ 'img_src': img_src,
80− 'thumbnail_src': thumbnail_src,
79+ 'thumbnail_src': thumbnail_src,
81− 'template': 'images.html'})
80+ 'template': 'images.html'})
83 # return results
82 # return results
84 return results
83 return results