From c3d78c7c69724ed99e44b799697c314870fc0107 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 30 Mar 2014 21:07:19 -0400 Subject: [PATCH] Store: Remove Diesel store because they've closed. --- src/calibre/customize/builtins.py | 10 -- .../gui2/store/stores/diesel_ebooks_plugin.py | 128 ------------------ 2 files changed, 138 deletions(-) delete mode 100644 src/calibre/gui2/store/stores/diesel_ebooks_plugin.py diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 2d45688535..a74951c8a8 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1382,15 +1382,6 @@ class StoreChitankaStore(StoreBase): headquarters = 'BG' formats = ['FB2', 'EPUB', 'TXT', 'SFB'] -class StoreDieselEbooksStore(StoreBase): - name = 'Diesel eBooks' - description = u'Instant access to over 2.4 million titles from hundreds of publishers including Harlequin, HarperCollins, John Wiley & Sons, McGraw-Hill, Simon & Schuster and Random House.' # noqa - actual_plugin = 'calibre.gui2.store.stores.diesel_ebooks_plugin:DieselEbooksStore' - - headquarters = 'US' - formats = ['EPUB', 'PDF'] - affiliate = True - class StoreEbookNLStore(StoreBase): name = 'eBook.nl' description = u'De eBookwinkel van Nederland' @@ -1720,7 +1711,6 @@ plugins += [ StoreBiblioStore, StoreChitankaStore, StoreCdpStore, - StoreDieselEbooksStore, StoreEbookNLStore, StoreEbookpointStore, StoreEbookscomStore, diff --git a/src/calibre/gui2/store/stores/diesel_ebooks_plugin.py b/src/calibre/gui2/store/stores/diesel_ebooks_plugin.py deleted file mode 100644 index eebd1376ba..0000000000 --- a/src/calibre/gui2/store/stores/diesel_ebooks_plugin.py +++ /dev/null @@ -1,128 +0,0 @@ -# -*- coding: utf-8 -*- - -from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 1 # Needed for dynamic plugin loading - -__license__ = 'GPL 3' -__copyright__ = '2011, John Schember ' -__docformat__ = 'restructuredtext en' - -import random -import re -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 DieselEbooksStore(BasicStoreConfig, StorePlugin): - - def open(self, parent=None, detail_item=None, external=False): - url = 'http://www.diesel-ebooks.com/' - - aff_id = '?aid=2049' - # Use Kovid's affiliate id 30% of the time. - if random.randint(1, 10) in (1, 2, 3): - aff_id = '?aid=2053' - - detail_url = None - if detail_item: - if '?' in detail_item: - detail_url = detail_item + aff_id.replace('?', '&') - else: - detail_url = detail_item + aff_id - url = url + aff_id - - if external or self.config.get('open_external', False): - open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url))) - else: - 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.diesel-ebooks.com/index.php?page=seek&id[m]=&id[c]=scope%253Dinventory&id[q]=' + urllib.quote_plus(query) - - br = browser() - - counter = max_results - with closing(br.open(url, timeout=timeout)) as f: - book_url = f.geturl() - doc = html.fromstring(f.read()) - - if doc.xpath('not(boolean(//select[contains(@id, "selection")]))'): - # This is the page for an individual book - id = ''.join(doc.xpath('//div[@class="price_fat"]//a/@href')) - mo = re.search('(?<=id=).+?(?=&)', id) - if not mo: - yield None - id = mo.group() - - cover_url = ''.join(doc.xpath('//div[@class="cover"]/a/@href')) - - title = ''.join(doc.xpath('//div[@class="desc_fat"]//h1/text()')) - author = ''.join(doc.xpath('//div[@class="desc_fat"]//span[@itemprop="author"]/text()')) - price = ''.join(doc.xpath('//div[@class="price_fat"]//h1/text()')) - - formats = ', '.join(doc.xpath('//div[@class="desc_fat"]//p[contains(text(), "Format")]/text()')) - a, b, formats = formats.partition('Format:') - - drm = SearchResult.DRM_LOCKED - if 'drm free' in formats.lower(): - drm = SearchResult.DRM_UNLOCKED - - s = SearchResult() - s.cover_url = cover_url - s.title = title.strip() - s.author = author.strip() - s.price = price.strip() - s.detail_item = book_url - s.formats = formats - s.drm = drm - - yield s - else: - for data in doc.xpath('//div[contains(@class, "item")]'): - if counter <= 0: - break - - id = ''.join(data.xpath('div[@class="cover"]/a/@href')) - if not id or '/item/' not in id: - continue - - cover_url = ''.join(data.xpath('div[@class="cover"]//img/@src')) - - title = ''.join(data.xpath('.//div[@class="content"]//h2/a/text()')) - author = ''.join(data.xpath('.//div[@class="content"]/span//a/text()')) - price = '' - price_elem = data.xpath('.//div[@class="price_fat"]//h1/text()') - if price_elem: - price = price_elem[0] - - formats = ', '.join(data.xpath('.//div[@class="book-info"]//text()')).strip() - a, b, formats = formats.partition('Format:') - drm = SearchResult.DRM_LOCKED - if 'drm free' in formats.lower(): - drm = SearchResult.DRM_UNLOCKED - - 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.formats = formats - s.drm = drm - - yield s