diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index d3fa6e2e83..8e16d4c76c 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1164,6 +1164,11 @@ class StoreFoylesUKStore(StoreBase): description = _('Foyles of London, online.') actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore' +class StoreGoogleBooksStore(StoreBase): + name = 'Google Books' + description = _('Google Books') + actual_plugin = 'calibre.gui2.store.google_books_plugin:GoogleBooksStore' + class StoreGutenbergStore(StoreBase): name = 'Project Gutenberg' description = _('The first producer of free ebooks.') @@ -1219,7 +1224,8 @@ plugins += [StoreArchiveOrgStore, StoreAmazonKindleStore, StoreAmazonDEKindleSto StoreBeamEBooksDEStore, StoreBeWriteStore, StoreDieselEbooksStore, StoreEbookscomStore, StoreEPubBuyDEStore, StoreEHarlequinStore, StoreFeedbooksStore, - StoreFoylesUKStore, StoreGutenbergStore, StoreKoboStore, StoreManyBooksStore, + StoreFoylesUKStore, StoreGoogleBooksStore, StoreGutenbergStore, + StoreKoboStore, StoreManyBooksStore, StoreMobileReadStore, StoreNextoStore, StoreOpenLibraryStore, StoreSmashwordsStore, StoreWaterstonesUKStore, StoreWeightlessBooksStore, StoreWizardsTowerBooksStore] diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 3270fcfde5..8007b6cd19 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -631,10 +631,11 @@ class Application(QApplication): if (islinux or isfreebsd) and st in ('windows', 'motif', 'cde'): from PyQt4.Qt import QStyleFactory styles = set(map(unicode, QStyleFactory.keys())) - if 'Cleanlooks' in styles: - self.setStyle('Cleanlooks') - else: + if 'Plastique' in styles and os.environ.get('KDE_FULL_SESSION', + False): self.setStyle('Plastique') + elif 'Cleanlooks' in styles: + self.setStyle('Cleanlooks') def _send_file_open_events(self): with self._file_open_lock: diff --git a/src/calibre/gui2/actions/store.py b/src/calibre/gui2/actions/store.py index 2493a617ac..c8507e851c 100644 --- a/src/calibre/gui2/actions/store.py +++ b/src/calibre/gui2/actions/store.py @@ -68,7 +68,7 @@ class StoreAction(InterfaceAction): a = ' '.join(a) corrected_authors.append(a) - return ' & '.join(corrected_authors) + return ' & '.join(corrected_authors).strip() def search_author(self): row = self._get_selected_row() @@ -87,7 +87,7 @@ class StoreAction(InterfaceAction): mi = self.gui.current_view().model().get_book_display_info(row) title = mi.title - return title + return title.strip() def search_title(self): row = self._get_selected_row() diff --git a/src/calibre/gui2/store/google_books_plugin.py b/src/calibre/gui2/store/google_books_plugin.py new file mode 100644 index 0000000000..6db0cc10b8 --- /dev/null +++ b/src/calibre/gui2/store/google_books_plugin.py @@ -0,0 +1,93 @@ +# -*- 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 GoogleBooksStore(BasicStoreConfig, StorePlugin): + + def open(self, parent=None, detail_item=None, external=False): + url = 'http://books.google.com/' + + 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://www.google.com/search?tbm=bks&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('//ol[@id="rso"]/li'): + if counter <= 0: + break + + id = ''.join(data.xpath('.//h3/a/@href')) + if not id: + continue + + title = ''.join(data.xpath('.//h3/a//text()')) + authors = data.xpath('.//span[@class="gl"]//a//text()') + if authors[-1].strip().lower() == 'preview': + authors = authors[:-1] + else: + continue + author = ', '.join(authors) + + counter -= 1 + + s = SearchResult() + s.title = title.strip() + s.author = author.strip() + s.detail_item = id.strip() + s.drm = SearchResult.DRM_UNKNOWN + + yield s + + def get_details(self, search_result, timeout): + br = browser() + with closing(br.open(search_result.detail_item, timeout=timeout)) as nf: + doc = html.fromstring(nf.read()) + + search_result.cover_url = ''.join(doc.xpath('//div[@class="sidebarcover"]//img/@src')) + + # Try to get the set price. + price = ''.join(doc.xpath('//div[@class="buy-price-container"]/span[contains(@class, "buy-price")]/text()')) + # Try to get the price inside of a buy button. + if not price.strip(): + price = ''.join(doc.xpath('//div[@class="buy-container"]/a/text()')) + price = price.split('-')[-1] + # No price set for this book. + if not price.strip(): + price = '$0.00' + search_result.price = price.strip() + + search_result.formats = ', '.join(doc.xpath('//div[contains(@class, "download-panel-div")]//a/text()')).upper() + if not search_result.formats: + search_result.formats = _('Unknown') + + return True + diff --git a/src/calibre/gui2/store/nexto_plugin.py b/src/calibre/gui2/store/nexto_plugin.py index 154274d12a..d63cf18233 100644 --- a/src/calibre/gui2/store/nexto_plugin.py +++ b/src/calibre/gui2/store/nexto_plugin.py @@ -26,7 +26,7 @@ class NextoStore(BasicStoreConfig, StorePlugin): def open(self, parent=None, detail_item=None, external=False): pid = '155711' - url = 'http://www.nexto.pl/ebooki_c1015.xml?pid=' + pid + url = 'http://www.nexto.pl/ebooki_c1015.xml' detail_url = None if detail_item: diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index 29bd6822a9..e0d0251f98 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -52,7 +52,7 @@ class SearchDialog(QDialog, Ui_Dialog): stores_check_widget.setLayout(stores_group_layout) for x in sorted(self.store_plugins.keys(), key=lambda x: x.lower()): cbox = QCheckBox(x) - cbox.setChecked(True) + cbox.setChecked(False) stores_group_layout.addWidget(cbox) setattr(self, 'store_check_' + x, cbox) stores_group_layout.addStretch() diff --git a/src/calibre/gui2/store/wizards_tower_books_plugin.py b/src/calibre/gui2/store/wizards_tower_books_plugin.py index c17ea2ca64..90966fc06a 100644 --- a/src/calibre/gui2/store/wizards_tower_books_plugin.py +++ b/src/calibre/gui2/store/wizards_tower_books_plugin.py @@ -44,40 +44,70 @@ class WizardsTowerBooksStore(BasicStoreConfig, StorePlugin): counter = max_results with closing(br.open(url, timeout=timeout)) as f: doc = html.fromstring(f.read()) - for data in doc.xpath('//table[@class="gridp"]//td'): - if counter <= 0: - break - - id = ''.join(data.xpath('.//span[@class="prti"]/a/@href')) - id = id.strip() - if not id: - continue - - cover_url = ''.join(data.xpath('.//div[@class="prim"]/a/img/@src')) - cover_url = url_slash_cleaner(self.url + cover_url.strip()) - - price = ''.join(data.xpath('.//font[@class="selling_price"]//text()')) - price = price.strip() - if not price: - continue - - title = ''.join(data.xpath('.//span[@class="prti"]/a/b/text()')) - author = ''.join(data.xpath('.//p[@class="last"]/text()')) - a, b, author = author.partition(' by ') - - counter -= 1 - + if 'search.html' in f.geturl(): + for data in doc.xpath('//table[@class="gridp"]//td'): + if counter <= 0: + break + + id = ''.join(data.xpath('.//span[@class="prti"]/a/@href')) + id = id.strip() + if not id: + continue + + cover_url = ''.join(data.xpath('.//div[@class="prim"]/a/img/@src')) + cover_url = url_slash_cleaner(self.url + cover_url.strip()) + + price = ''.join(data.xpath('.//font[@class="selling_price"]//text()')) + price = price.strip() + if not price: + continue + + title = ''.join(data.xpath('.//span[@class="prti"]/a/b/text()')) + author = ''.join(data.xpath('.//p[@class="last"]/text()')) + a, b, author = author.partition(' by ') + + counter -= 1 + + s = SearchResult() + s.cover_url = cover_url + s.title = title.strip() + s.author = author.strip() + s.price = price.strip() + s.detail_item = id.strip() + s.drm = SearchResult.DRM_UNLOCKED + + yield s + # Exact match brought us to the books detail page. + else: s = SearchResult() - s.cover_url = cover_url - s.title = title.strip() - s.author = author.strip() - s.price = price.strip() - s.detail_item = id.strip() + + cover_url = ''.join(doc.xpath('//div[@id="image"]/a/img[@title="Zoom"]/@src')).strip() + s.cover_url = url_slash_cleaner(self.url + cover_url.strip()) + + s.title = ''.join(doc.xpath('//form[@name="details"]/h1/text()')).strip() + + authors = doc.xpath('//p[contains(., "Author:")]//text()') + author_index = None + for i, a in enumerate(authors): + if 'author' in a.lower(): + author_index = i + 1 + break + if author_index is not None and len(authors) > author_index: + a = authors[author_index] + a = a.replace(u'\xa0', '') + s.author = a.strip() + + s.price = ''.join(doc.xpath('//span[@id="price_selling"]//text()')).strip() + s.detail_item = f.geturl().replace(self.url, '').strip() + s.formats = ', '.join(doc.xpath('//select[@id="N1_"]//option//text()')) s.drm = SearchResult.DRM_UNLOCKED - + yield s def get_details(self, search_result, timeout): + if search_result.formats: + return False + br = browser() with closing(br.open(url_slash_cleaner(self.url + search_result.detail_item), timeout=timeout)) as nf: idata = html.fromstring(nf.read())