Cda Plugin: align to website changes

This commit is contained in:
Tomasz Długosz 2015-02-20 22:41:52 +01:00
parent 7c0036a7c6
commit 00077af7ed

View File

@ -1,10 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import (unicode_literals, division, absolute_import, print_function) from __future__ import (unicode_literals, division, absolute_import, print_function)
store_version = 4 # Needed for dynamic plugin loading store_version = 5 # Needed for dynamic plugin loading
__license__ = 'GPL 3' __license__ = 'GPL 3'
__copyright__ = '2013-2014, Tomasz Długosz <tomek3d@gmail.com>' __copyright__ = '2013-2015, Tomasz Długosz <tomek3d@gmail.com>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import urllib import urllib
@ -50,43 +50,40 @@ class CdpStore(BasicStoreConfig, StorePlugin):
counter = max_results counter = max_results
while counter: while counter:
with closing(br.open(u'https://cdp.pl/products/search?utf8=✓&keywords=' + urllib.quote_plus(query) + '&page=' + str(page), timeout=timeout)) as f: with closing(br.open(u'https://cdp.pl/ksiazki/e-book.html?q=' + urllib.quote_plus(query) + '&p=' + str(page), timeout=timeout)) as f:
doc = html.fromstring(f.read()) doc = html.fromstring(f.read())
for data in doc.xpath('//ul[@id="products"]/li'): for data in doc.xpath('//ul[@class="grid-of-products"]/li'):
if counter <= 0: if counter <= 0:
break break
id = ''.join(data.xpath('.//div[@class="product-image"]/a[1]/@href')) id = ''.join(data.xpath('.//a[@class="product-image"]/@href'))
if not id: if not id:
continue continue
if 'ksiazki' not in id: if 'ksiazki' not in id:
continue continue
cover_url = ''.join(data.xpath('.//div[@class="product-image"]/a[1]/@data-background')) cover_url = ''.join(data.xpath('.//a[@class="product-image"]/img/@data-src'))
cover_url = cover_url.split('\'')[1] title = ''.join(data.xpath('.//h3[1]/a/@title'))
title = ''.join(data.xpath('.//div[@class="product-description"]/h2/a/text()')) price = ''.join(data.xpath('.//span[@class="custom_price"]/text()'))+','+''.join(data.xpath('.//span[@class="custom_price"]/sup/text()'))
author = ''.join(data.xpath('.//div[@class="product-description"]//ul[@class="taxons"]/li[@class="author"]/a/text()')) author = ''
price = ''.join(data.xpath('.//span[@itemprop="price"]/text()')) formats = ''
with closing(br.open( id.strip(), timeout=timeout/4)) as nf:
idata = html.fromstring(nf.read())
author = ', '.join(idata.xpath('.//ul[@class="film-data"]/li[1]/p/text()'))
formats = idata.xpath('//div[@class="product-attributes-container"][2]/ul/li/span/text()')[-1]
counter -= 1 counter -= 1
s = SearchResult() s = SearchResult()
s.cover_url = cover_url s.cover_url = cover_url
s.title = title.strip() s.title = title.strip()
s.author = author.strip() s.author = author
s.price = price s.price = price + ''
s.detail_item = id.strip() s.detail_item = id.strip()
s.drm = SearchResult.DRM_UNLOCKED s.drm = SearchResult.DRM_UNLOCKED
s.formats = formats.upper().strip()
yield s yield s
if not doc.xpath('//span[@class="next"]/a'): if not doc.xpath('//span[@class="next-page"]/a'):
break break
page+=1 page+=1
def get_details(self, search_result, timeout):
br = browser()
with closing(br.open(search_result.detail_item, timeout=timeout)) as nf:
idata = html.fromstring(nf.read())
formats = ', '.join(idata.xpath('//div[@id="product-bonus"]/div/ul/li/text()'))
search_result.formats = formats.upper()
return True