diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 70ef1612ee..fb35fa14e9 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1355,16 +1355,6 @@ class StoreVirtualoStore(StoreBase): headquarters = 'PL' formats = ['EPUB', 'PDF'] -class StoreWaterstonesUKStore(StoreBase): - name = 'Waterstones UK' - author = 'Charles Haley' - description = u'Waterstone\'s mission is to be the leading Bookseller on the High Street and online providing customers the widest choice, great value and expert advice from a team passionate about Bookselling.' - actual_plugin = 'calibre.gui2.store.waterstones_uk_plugin:WaterstonesUKStore' - - drm_free_only = False - headquarters = 'UK' - formats = ['EPUB', 'PDF'] - class StoreWeightlessBooksStore(StoreBase): name = 'Weightless Books' description = u'An independent DRM-free ebooksite devoted to ebooks of all sorts.' @@ -1421,7 +1411,6 @@ plugins += [ StorePragmaticBookshelfStore, StoreSmashwordsStore, StoreVirtualoStore, - #StoreWaterstonesUKStore, StoreWeightlessBooksStore, StoreWizardsTowerBooksStore, StoreWoblinkStore diff --git a/src/calibre/gui2/store/waterstones_uk_plugin.py b/src/calibre/gui2/store/waterstones_uk_plugin.py deleted file mode 100644 index a5065128ba..0000000000 --- a/src/calibre/gui2/store/waterstones_uk_plugin.py +++ /dev/null @@ -1,84 +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 urllib2 -from contextlib import closing - -from lxml import html - -from PyQt4.Qt import QUrl - -from calibre import browser -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 WaterstonesUKStore(BasicStoreConfig, StorePlugin): - - def open(self, parent=None, detail_item=None, external=False): - url = 'http://clkuk.tradedoubler.com/click?p=51196&a=1951604&g=19333484' - url_details = 'http://clkuk.tradedoubler.com/click?p(51196)a(1951604)g(16460516)url({0})' - - if external or self.config.get('open_external', False): - if detail_item: - url = url_details.format(detail_item) - open_url(QUrl(url)) - else: - detail_url = None - if detail_item: - detail_url = url_details.format(detail_item) - d = WebStoreDialog(self.gui, url, parent, detail_url) - 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.waterstones.com/waterstonesweb/advancedSearch.do?buttonClicked=1&format=3757&bookkeywords=' + urllib2.quote(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[contains(@class, "results-pane")]'): - if counter <= 0: - break - - id = ''.join(data.xpath('./div/div/h2/a/@href')).strip() - if not id: - continue - cover_url = ''.join(data.xpath('.//div[@class="image"]/a/img/@src')) - title = ''.join(data.xpath('./div/div/h2/a/text()')) - author = ', '.join(data.xpath('.//p[@class="byAuthor"]/a/text()')) - price = ''.join(data.xpath('.//p[@class="price"]/span[@class="priceStandard"]/text()')) - drm = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "DRM")])') - pdf = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "PDF")])') - epub = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "EPUB")])') - - counter -= 1 - - s = SearchResult() - s.cover_url = cover_url - s.title = title.strip() - s.author = author.strip() - s.price = price - if drm: - s.drm = SearchResult.DRM_LOCKED - else: - s.drm = SearchResult.DRM_UNKNOWN - s.detail_item = id - formats = [] - if epub: - formats.append('ePub') - if pdf: - formats.append('PDF') - s.formats = ', '.join(formats) - - yield s