diff --git a/src/calibre/gui2/store/stores/kobo_plugin.py b/src/calibre/gui2/store/stores/kobo_plugin.py index f829ea2127..5a8b5618d5 100644 --- a/src/calibre/gui2/store/stores/kobo_plugin.py +++ b/src/calibre/gui2/store/stores/kobo_plugin.py @@ -7,6 +7,7 @@ __copyright__ = '2011, John Schember ' __docformat__ = 'restructuredtext en' import random +import urllib import urllib2 from contextlib import closing @@ -32,20 +33,19 @@ class KoboStore(BasicStoreConfig, StorePlugin): murl = 'http://click.linksynergy.com/fs-bin/click?id=%s&offerid=268429.4&type=3&subid=0' % pub_id if detail_item: - purl = 'http://click.linksynergy.com/fs-bin/click?id=%s&subid=&offerid=268429.1&type=10&tmpid=9310&RD_PARM1=%s' % urllib.quote_plus(pub_id, detail_item) url = purl + purl = 'http://click.linksynergy.com/link?id=%s&offerid=268429&type=2&murl=%s' % (pub_id, urllib.quote_plus(detail_item)) + url = purl else: purl = None url = murl - print(url) - if external or self.config.get('open_external', False): - open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url))) + open_url(QUrl(url_slash_cleaner(url))) else: - d = WebStoreDialog(self.gui, url, parent, detail_url) - d.setWindowTitle(self.name) - d.set_tags(self.config.get('tags', '')) - d.exec_() + d = WebStoreDialog(self.gui, murl, parent, purl) + d.setWindowTitle(self.name) + d.set_tags(self.config.get('tags', '')) + d.exec_() def search(self, query, max_results=10, timeout=60): url = 'http://www.kobobooks.com/search/search.html?q=' + urllib2.quote(query) @@ -62,15 +62,19 @@ class KoboStore(BasicStoreConfig, StorePlugin): id = ''.join(data.xpath('.//div[@class="SearchImageContainer"]/a[1]/@href')) if not id: continue + try: + id = id.split('?', 1)[0] + except: + continue - price = ''.join(data.xpath('.//span[@class="OurPrice"]/strong/text()')) + price = ''.join(data.xpath('.//span[@class="KV2OurPrice"]/strong/text()')) if not price: price = '$0.00' cover_url = ''.join(data.xpath('.//div[@class="SearchImageContainer"]//img[1]/@src')) - title = ''.join(data.xpath('.//div[@class="SCItemHeader"]/h1/a[1]/text()')) - author = ', '.join(data.xpath('.//div[@class="SCItemSummary"]//span//a/text()')) + title = ''.join(data.xpath('.//div[@class="SCItemHeader"]//a[1]/text()')) + author = ', '.join(data.xpath('.//div[@class="SCItemSummary"]//span[contains(@class, "Author")]//a/text()')) drm = data.xpath('boolean(.//span[@class="SCAvailibilityFormatsText" and not(contains(text(), "DRM-Free"))])') counter -= 1