From da14165c63f2259292e7de77b2dc8bf2cc5b5ce1 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 1 Jul 2012 13:47:23 -0400 Subject: [PATCH 1/3] Store: Fix Weightless. --- src/calibre/gui2/store/stores/weightless_books_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/store/stores/weightless_books_plugin.py b/src/calibre/gui2/store/stores/weightless_books_plugin.py index 3fa1c76851..330f3fdf0f 100644 --- a/src/calibre/gui2/store/stores/weightless_books_plugin.py +++ b/src/calibre/gui2/store/stores/weightless_books_plugin.py @@ -41,7 +41,7 @@ class WeightlessBooksStore(BasicStoreConfig, StorePlugin): counter = max_results with closing(br.open(url, timeout=timeout)) as f: doc = html.fromstring(f.read()) - for data in doc.xpath('//li[@id="product"]'): + for data in doc.xpath('//li[@class="product"]'): if counter <= 0: break From 67b3e063ce5328df42058dec2cd06a881bf87b84 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 1 Jul 2012 13:49:23 -0400 Subject: [PATCH 2/3] Store: Remove OReilly plugin. --- src/calibre/customize/builtins.py | 10 --- .../gui2/store/stores/oreilly_plugin.py | 81 ------------------- 2 files changed, 91 deletions(-) delete mode 100644 src/calibre/gui2/store/stores/oreilly_plugin.py diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index cced3b194f..495d923289 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1511,15 +1511,6 @@ class StoreOpenBooksStore(StoreBase): drm_free_only = True headquarters = 'US' -class StoreOReillyStore(StoreBase): - name = 'OReilly' - description = u'Programming and tech ebooks from OReilly.' - actual_plugin = 'calibre.gui2.store.stores.oreilly_plugin:OReillyStore' - - drm_free_only = True - headquarters = 'US' - formats = ['APK', 'DAISY', 'EPUB', 'MOBI', 'PDF'] - class StoreOzonRUStore(StoreBase): name = 'OZON.ru' description = u'ebooks from OZON.ru' @@ -1659,7 +1650,6 @@ plugins += [ StoreMobileReadStore, StoreNextoStore, StoreOpenBooksStore, - StoreOReillyStore, StoreOzonRUStore, StorePragmaticBookshelfStore, StoreRW2010Store, diff --git a/src/calibre/gui2/store/stores/oreilly_plugin.py b/src/calibre/gui2/store/stores/oreilly_plugin.py deleted file mode 100644 index e45c072eea..0000000000 --- a/src/calibre/gui2/store/stores/oreilly_plugin.py +++ /dev/null @@ -1,81 +0,0 @@ -# -*- coding: utf-8 -*- - -from __future__ import (unicode_literals, division, absolute_import, print_function) - -__license__ = 'GPL 3' -__copyright__ = '2011, John Schember ' -__docformat__ = 'restructuredtext en' - -import urllib -from contextlib import closing - -from lxml import html - -from PyQt4.Qt import QUrl - -from calibre import browser, url_slash_cleaner -from calibre.gui2 import open_url -from calibre.gui2.store import StorePlugin -from calibre.gui2.store.basic_config import BasicStoreConfig -from calibre.gui2.store.search_result import SearchResult -from calibre.gui2.store.web_store_dialog import WebStoreDialog - -class OReillyStore(BasicStoreConfig, StorePlugin): - - def open(self, parent=None, detail_item=None, external=False): - url = 'http://oreilly.com/ebooks/' - - if external or self.config.get('open_external', False): - open_url(QUrl(url_slash_cleaner(detail_item if detail_item else url))) - else: - d = WebStoreDialog(self.gui, url, parent, detail_item) - d.setWindowTitle(self.name) - d.set_tags(self.config.get('tags', '')) - d.exec_() - - def search(self, query, max_results=10, timeout=60): - url = 'http://search.oreilly.com/?t1=Books&t2=Format&t3=Ebook&q=' + urllib.quote_plus(query) - - br = browser() - - counter = max_results - with closing(br.open(url, timeout=timeout)) as f: - doc = html.fromstring(f.read()) - for data in doc.xpath('//div[@class="result"]'): - if counter <= 0: - break - - ebook = ' '.join(data.xpath('.//p[@class="note"]/text()')) - if 'ebook' not in ebook.lower(): - continue - - id = ''.join(data.xpath('./div[@class="book_text"]//p[@class="title"]/a/@href')) - - cover_url = ''.join(data.xpath('./a/img[1]/@src')) - - title = ''.join(data.xpath('./div[@class="book_text"]/p[@class="title"]/a/text()')) - author = ''.join(data.xpath('./div[@class="book_text"]/p[@class="note"][1]/text()')) - author = author.split('By ')[-1].strip() - - # Get the detail here because we need to get the ebook id for the detail_item. - with closing(br.open(id, timeout=timeout)) as nf: - idoc = html.fromstring(nf.read()) - - for td in idoc.xpath('//td[@class="optionsTd"]'): - if 'ebook' in ''.join(td.xpath('.//text()')).lower(): - price = ''.join(td.xpath('.//span[@class="price"]/text()')).strip() - formats = ''.join(td.xpath('.//a[@id="availableFormats"]/text()')).strip() - break - - counter -= 1 - - s = SearchResult() - s.cover_url = cover_url.strip() - s.title = title.strip() - s.author = author.strip() - s.detail_item = id.strip() - s.price = price.strip() - s.drm = SearchResult.DRM_UNLOCKED - s.formats = formats.upper() - - yield s From 340998fbee0fdfdc28e482480cc7f58182f08538 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 1 Jul 2012 13:59:20 -0400 Subject: [PATCH 3/3] Store: ebooks.com fix author and cover display. --- src/calibre/gui2/store/stores/ebooks_com_plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/store/stores/ebooks_com_plugin.py b/src/calibre/gui2/store/stores/ebooks_com_plugin.py index 656984a86d..7bf6704d9f 100644 --- a/src/calibre/gui2/store/stores/ebooks_com_plugin.py +++ b/src/calibre/gui2/store/stores/ebooks_com_plugin.py @@ -64,11 +64,11 @@ class EbookscomStore(BasicStoreConfig, StorePlugin): continue id = mo.group() - cover_url = ''.join(data.xpath('.//div[@class="img"]//img/@src')) + cover_url = ''.join(data.xpath('.//div[contains(@class, "img")]//img/@src')) title = ''.join(data.xpath( 'descendant::span[@class="book-title"]/a/text()')).strip() - author = ''.join(data.xpath( + author = ', '.join(data.xpath( 'descendant::span[@class="author"]/a/text()')).strip() if not title or not author: continue