From 35ee75d43459b4ef23e391913c5ca7e1d6b9310a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= Date: Sat, 21 May 2011 13:41:10 +0200 Subject: [PATCH 01/19] Woblink store --- src/calibre/customize/builtins.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index ac26544207..fd80f14b60 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1236,6 +1236,12 @@ class StoreWizardsTowerBooksStore(StoreBase): description = 'Wizard\'s Tower Press.' actual_plugin = 'calibre.gui2.store.wizards_tower_books_plugin:WizardsTowerBooksStore' +class StoreWoblinkStore(StoreBase): + name = 'Woblink' + author = 'Tomasz Długosz' + description = _('Czytanie zdarza się wszędzie!') + actual_plugin = 'calibre.gui2.store.woblink_plugin:WoblinkStore' + plugins += [ StoreArchiveOrgStore, StoreAmazonKindleStore, @@ -1264,7 +1270,8 @@ plugins += [ StoreSmashwordsStore, StoreWaterstonesUKStore, StoreWeightlessBooksStore, - StoreWizardsTowerBooksStore + StoreWizardsTowerBooksStore, + StoreWoblinkStore ] # }}} From 215e3fa699d9e8b03e88221c1ce9c38feef44702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= Date: Sat, 21 May 2011 13:44:04 +0200 Subject: [PATCH 02/19] Woblink store, missed file --- src/calibre/gui2/store/woblink_plugin.py | 76 ++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 src/calibre/gui2/store/woblink_plugin.py diff --git a/src/calibre/gui2/store/woblink_plugin.py b/src/calibre/gui2/store/woblink_plugin.py new file mode 100644 index 0000000000..9659f72fd1 --- /dev/null +++ b/src/calibre/gui2/store/woblink_plugin.py @@ -0,0 +1,76 @@ +# -*- coding: utf-8 -*- + +from __future__ import (unicode_literals, division, absolute_import, print_function) + +__license__ = 'GPL 3' +__copyright__ = '2011, Tomasz Długosz ' +__docformat__ = 'restructuredtext en' + +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 WoblinkStore(BasicStoreConfig, StorePlugin): + + def open(self, parent=None, detail_item=None, external=False): + + url = 'http://woblink.com/publication' + detail_url = None + + if detail_item: + detail_url = 'http://woblink.com' + detail_item + + 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://woblink.com/publication?query' + urllib.quote_plus(query.encode('utf-8')) + + 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="book-item"]'): + if counter <= 0: + break + + id = ''.join(data.xpath('.//td[@class="w10 va-t"]/a[1]/@href')) + if not id: + continue + + cover_url = ''.join(data.xpath('.//td[@class="w10 va-t"]/a[1]/img/@src')) + title = ''.join(data.xpath('.//h3[@class="title"]/a[1]/text()')) + author = ''.join(data.xpath('.//p[@class="author"]/a[1]/text()')) + price = ''.join(data.xpath('.//div[@class="prices"]/p[1]/span/text()')) + price = re.sub('PLN', ' zł', price) + price = re.sub('\.', ',', price) + + counter -= 1 + + s = SearchResult() + s.cover_url = 'http://woblink.com' + cover_url + s.title = title.strip() + s.author = author.strip() + s.price = price + s.detail_item = id.strip() + s.drm = SearchResult.DRM_LOCKED + s.formats = 'EPUB' + + yield s From f14c1a65fdb6aa6f4e0a7f873b8d57bd11d3f96b Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 09:35:45 -0400 Subject: [PATCH 03/19] Store: Amazon UK and DE, fix search url. --- src/calibre/gui2/store/amazon_de_plugin.py | 2 +- src/calibre/gui2/store/amazon_uk_plugin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/store/amazon_de_plugin.py b/src/calibre/gui2/store/amazon_de_plugin.py index 782d6bf0ed..f7b17a2e83 100644 --- a/src/calibre/gui2/store/amazon_de_plugin.py +++ b/src/calibre/gui2/store/amazon_de_plugin.py @@ -16,7 +16,7 @@ class AmazonDEKindleStore(AmazonKindleStore): For comments on the implementation, please see amazon_plugin.py ''' - search_url = 'http://www.amazon.de/s/url=search-alias%3Ddigital-text&field-keywords=' + search_url = 'http://www.amazon.de/s/?url=search-alias%3Ddigital-text&field-keywords=' details_url = 'http://amazon.de/dp/' drm_search_text = u'Gleichzeitige Verwendung von Geräten' drm_free_text = u'Keine Einschränkung' diff --git a/src/calibre/gui2/store/amazon_uk_plugin.py b/src/calibre/gui2/store/amazon_uk_plugin.py index 770db6cfd9..9544add17c 100644 --- a/src/calibre/gui2/store/amazon_uk_plugin.py +++ b/src/calibre/gui2/store/amazon_uk_plugin.py @@ -17,7 +17,7 @@ class AmazonUKKindleStore(AmazonKindleStore): For comments on the implementation, please see amazon_plugin.py ''' - search_url = 'http://www.amazon.co.uk/s/url=search-alias%3Ddigital-text&field-keywords=' + search_url = 'http://www.amazon.co.uk/s/?url=search-alias%3Ddigital-text&field-keywords=' details_url = 'http://amazon.co.uk/dp/' def open(self, parent=None, detail_item=None, external=False): From 4a8f83305f56679a3ded6f108d4475789ec1c2bd Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 18:39:54 -0400 Subject: [PATCH 04/19] Store: Add config widget for search accessible via the store plugin preferences. --- src/calibre/customize/builtins.py | 11 +++++ .../gui2/store/search/download_thread.py | 13 +++--- src/calibre/gui2/store/search/models.py | 6 +-- src/calibre/gui2/store/search/search.py | 45 +++++++++++++++---- 4 files changed, 58 insertions(+), 17 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index ac26544207..8490630bb8 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -854,6 +854,17 @@ class ActionStore(InterfaceActionBase): name = 'Store' author = 'John Schember' actual_plugin = 'calibre.gui2.actions.store:StoreAction' + + def customization_help(self, gui=False): + return 'Customize the behavior of the store search.' + + def config_widget(self): + from calibre.gui2.store.config.store import config_widget as get_cw + return get_cw() + + def save_settings(self, config_widget): + from calibre.gui2.store.config.store import save_settings as save + save(config_widget) plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog, ActionConvert, ActionDelete, ActionEditMetadata, ActionView, diff --git a/src/calibre/gui2/store/search/download_thread.py b/src/calibre/gui2/store/search/download_thread.py index 97279d7773..1fc74a5748 100644 --- a/src/calibre/gui2/store/search/download_thread.py +++ b/src/calibre/gui2/store/search/download_thread.py @@ -22,7 +22,7 @@ class GenericDownloadThreadPool(object): at the end of the function. ''' - def __init__(self, thread_type, thread_count): + def __init__(self, thread_type, thread_count=1): self.thread_type = thread_type self.thread_count = thread_count @@ -30,6 +30,9 @@ class GenericDownloadThreadPool(object): self.results = Queue() self.threads = [] + def set_thread_count(self, thread_count): + self.thread_count = thread_count + def add_task(self): ''' This must be implemented in a sub class and this function @@ -92,8 +95,8 @@ class SearchThreadPool(GenericDownloadThreadPool): def __init__(self, thread_count): GenericDownloadThreadPool.__init__(self, SearchThread, thread_count) - def add_task(self, query, store_name, store_plugin, timeout): - self.tasks.put((query, store_name, store_plugin, timeout)) + def add_task(self, query, store_name, store_plugin, max_results, timeout): + self.tasks.put((query, store_name, store_plugin, max_results, timeout)) GenericDownloadThreadPool.add_task(self) @@ -112,8 +115,8 @@ class SearchThread(Thread): def run(self): while self._run and not self.tasks.empty(): try: - query, store_name, store_plugin, timeout = self.tasks.get() - for res in store_plugin.search(query, timeout=timeout): + query, store_name, store_plugin, max_results, timeout = self.tasks.get() + for res in store_plugin.search(query, max_results=max_results, timeout=timeout): if not self._run: return res.store_name = store_name diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index adc90e3b14..059c1d73ed 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -33,7 +33,7 @@ class Matches(QAbstractItemModel): HEADERS = [_('Cover'), _('Title'), _('Price'), _('DRM'), _('Store')] HTML_COLS = (1, 4) - def __init__(self): + def __init__(self, cover_thread_count=2, detail_thread_count=4): QAbstractItemModel.__init__(self) self.DRM_LOCKED_ICON = QPixmap(I('drm-locked.png')).scaledToHeight(64, @@ -51,8 +51,8 @@ class Matches(QAbstractItemModel): self.matches = [] self.query = '' self.search_filter = SearchFilter() - self.cover_pool = CoverThreadPool(2) - self.details_pool = DetailsThreadPool(4) + self.cover_pool = CoverThreadPool(cover_thread_count) + self.details_pool = DetailsThreadPool(detail_thread_count) self.sort_col = 2 self.sort_order = Qt.AscendingOrder diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index f9ac45e707..906ba0b4ff 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -18,9 +18,6 @@ from calibre.gui2.store.search.download_thread import SearchThreadPool, \ CacheUpdateThreadPool from calibre.gui2.store.search.search_ui import Ui_Dialog -HANG_TIME = 75000 # milliseconds seconds -TIMEOUT = 75 # seconds - class SearchDialog(QDialog, Ui_Dialog): def __init__(self, istores, parent=None, query=''): @@ -28,13 +25,22 @@ class SearchDialog(QDialog, Ui_Dialog): self.setupUi(self) self.config = JSONConfig('store/search') - self.search_edit.initialize('store_search_search') + + # Loads variables that store various settings. + # This needs to be called soon in __init__ because + # the variables it sets up are used later. + self.load_settings() # We keep a cache of store plugins and reference them by name. self.store_plugins = istores - self.search_pool = SearchThreadPool(4) - self.cache_pool = CacheUpdateThreadPool(2) + + # Setup our worker threads. + self.search_pool = SearchThreadPool(self.search_thread_count) + self.cache_pool = CacheUpdateThreadPool(self.cache_thread_count) + self.results_view.model().cover_pool.set_thread_count(self.cover_thread_count) + self.results_view.model().details_pool.set_thread_count(self.details_thread_count) + # Check for results and hung threads. self.checker = QTimer() self.progress_checker = QTimer() @@ -42,7 +48,7 @@ class SearchDialog(QDialog, Ui_Dialog): # Update store caches silently. for p in self.store_plugins.values(): - self.cache_pool.add_task(p, 30) + self.cache_pool.add_task(p, self.timeout) # Add check boxes for each store so the user # can disable searching specific stores on a @@ -128,7 +134,7 @@ class SearchDialog(QDialog, Ui_Dialog): # Add plugins that the user has checked to the search pool's work queue. for n in store_names: if getattr(self, 'store_check_' + n).isChecked(): - self.search_pool.add_task(query, n, self.store_plugins[n], TIMEOUT) + self.search_pool.add_task(query, n, self.store_plugins[n], self.max_results, self.timeout) self.hang_check = 0 self.checker.start(100) self.pi.startAnimation() @@ -202,11 +208,32 @@ class SearchDialog(QDialog, Ui_Dialog): self.results_view.model().sort_order = self.config.get('sort_order', Qt.AscendingOrder) self.results_view.header().setSortIndicator(self.results_view.model().sort_col, self.results_view.model().sort_order) + def load_settings(self): + # Seconds + self.timeout = self.config.get('timeout', 75) + # Milliseconds + self.hang_time = self.config.get('hang_time', 75) * 1000 + self.max_results = self.config.get('max_results', 10) + + # Number of threads to run for each type of operation + self.search_thread_count = self.config.get('search_thread_count', 4) + self.cache_thread_count = self.config.get('cache_thread_count', 2) + self.cover_thread_count = self.config.get('cover_thread_count', 2) + self.details_thread_count = self.config.get('details_thread_count', 4) + + def config_finished(self): + self.load_settings() + + self.search_pool.set_thread_count(self.search_thread_count) + self.cache_pool.set_thread_count(self.cache_thread_count) + self.results_view.model().cover_pool.set_thread_count(self.cover_thread_count) + self.results_view.model().details_pool.set_thread_count(self.details_thread_count) + def get_results(self): # We only want the search plugins to run # a maximum set amount of time before giving up. self.hang_check += 1 - if self.hang_check >= HANG_TIME: + if self.hang_check >= self.hang_time: self.search_pool.abort() self.checker.stop() else: From 4610ea2e7209640f1d7667cf46cd4bd6b6a9c43f Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 18:58:30 -0400 Subject: [PATCH 05/19] Store: Enchance search dialog. --- src/calibre/gui2/store/search/search.py | 10 +- src/calibre/gui2/store/search/search.ui | 169 +++++++++++++++--------- 2 files changed, 108 insertions(+), 71 deletions(-) diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index 906ba0b4ff..e76f15c58e 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -54,15 +54,15 @@ class SearchDialog(QDialog, Ui_Dialog): # can disable searching specific stores on a # per search basis. stores_check_widget = QWidget() - stores_group_layout = QVBoxLayout() - stores_check_widget.setLayout(stores_group_layout) + store_list_layout = QVBoxLayout() + stores_check_widget.setLayout(store_list_layout) for x in sorted(self.store_plugins.keys(), key=lambda x: x.lower()): cbox = QCheckBox(x) cbox.setChecked(False) - stores_group_layout.addWidget(cbox) + store_list_layout.addWidget(cbox) setattr(self, 'store_check_' + x, cbox) - stores_group_layout.addStretch() - self.stores_group.setWidget(stores_check_widget) + store_list_layout.addStretch() + self.store_list.setWidget(stores_check_widget) # Set the search query self.search_edit.setText(query) diff --git a/src/calibre/gui2/store/search/search.ui b/src/calibre/gui2/store/search/search.ui index 8dd423baec..42f91de735 100644 --- a/src/calibre/gui2/store/search/search.ui +++ b/src/calibre/gui2/store/search/search.ui @@ -6,8 +6,8 @@ 0 0 - 937 - 669 + 584 + 533 @@ -20,7 +20,7 @@ true - + @@ -66,8 +66,14 @@ Stores + + 0 + + + 0 + - + true @@ -76,15 +82,18 @@ 0 0 - 215 - 93 + 207 + 130 - + + + 0 + @@ -108,76 +117,104 @@ + + + + - - - Open a selected book in the system's web browser + + + + 1 + 0 + - - Open in &external browser + + + 0 + 0 + + + + true + + + + 32 + 32 + + + + false + + + false + + + false + + + true + + + false + + + + + + Configure + + + + + + + Open a selected book in the system's web browser + + + Open in &external browser + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + - - - - 2 - 0 - - - - Qt::Horizontal - - - - Qt::Horizontal - - - - - 1 - 0 - - - - - 0 - 0 - - - - true - - - - 32 - 32 - - - - false - - - false - - - false - - - true - - - false - - - - + + + + Books: + + + + + + + 0 + + + From 44366b2c97f4153d4efd4d329a9765144785246d Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 19:09:14 -0400 Subject: [PATCH 06/19] Store: Show number of results. --- src/calibre/gui2/store/search/models.py | 7 ++++++- src/calibre/gui2/store/search/search.py | 7 +++++++ src/calibre/gui2/store/search/search.ui | 6 +++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index 059c1d73ed..d7941480cc 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -9,7 +9,8 @@ __docformat__ = 'restructuredtext en' import re from operator import attrgetter -from PyQt4.Qt import (Qt, QAbstractItemModel, QVariant, QPixmap, QModelIndex, QSize) +from PyQt4.Qt import (Qt, QAbstractItemModel, QVariant, QPixmap, QModelIndex, QSize, + pyqtSignal) from calibre.gui2 import NONE from calibre.gui2.store.search_result import SearchResult @@ -30,6 +31,8 @@ def comparable_price(text): class Matches(QAbstractItemModel): + total_changed = pyqtSignal(int) + HEADERS = [_('Cover'), _('Title'), _('Price'), _('DRM'), _('Store')] HTML_COLS = (1, 4) @@ -69,6 +72,7 @@ class Matches(QAbstractItemModel): self.query = '' self.cover_pool.abort() self.details_pool.abort() + self.total_changed.emit(self.rowCount()) self.reset() def add_result(self, result, store_plugin): @@ -101,6 +105,7 @@ class Matches(QAbstractItemModel): self.matches = list(self.search_filter.parse(self.query)) else: self.matches = list(self.search_filter.universal_set()) + self.total_changed.emit(self.rowCount()) self.sort(self.sort_col, self.sort_order, False) self.layoutChanged.emit() diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index e76f15c58e..18ea50f125 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -78,9 +78,11 @@ class SearchDialog(QDialog, Ui_Dialog): self.checker.timeout.connect(self.get_results) self.progress_checker.timeout.connect(self.check_progress) self.results_view.activated.connect(self.open_store) + self.results_view.model().total_changed.connect(self.update_book_total) self.select_all_stores.clicked.connect(self.stores_select_all) self.select_invert_stores.clicked.connect(self.stores_select_invert) self.select_none_stores.clicked.connect(self.stores_select_none) + self.configure.clicked.connect(self.do_config) self.finished.connect(self.dialog_closed) self.progress_checker.start(100) @@ -221,6 +223,9 @@ class SearchDialog(QDialog, Ui_Dialog): self.cover_thread_count = self.config.get('cover_thread_count', 2) self.details_thread_count = self.config.get('details_thread_count', 4) + def do_config(self): + pass + def config_finished(self): self.load_settings() @@ -249,6 +254,8 @@ class SearchDialog(QDialog, Ui_Dialog): if not self.search_pool.threads_running() and not self.results_view.model().has_results(): info_dialog(self, _('No matches'), _('Couldn\'t find any books matching your query.'), show=True, show_copy_button=False) + def update_book_total(self, total): + self.total.setText('%s' % total) def open_store(self, index): result = self.results_view.model().get_result(index) diff --git a/src/calibre/gui2/store/search/search.ui b/src/calibre/gui2/store/search/search.ui index 42f91de735..905620f688 100644 --- a/src/calibre/gui2/store/search/search.ui +++ b/src/calibre/gui2/store/search/search.ui @@ -82,8 +82,8 @@ 0 0 - 207 - 130 + 102 + 129 @@ -209,7 +209,7 @@ - + 0 From 0c315cdb1ea78634031ae603ca88bedeede359b3 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 19:22:05 -0400 Subject: [PATCH 07/19] Store: Allow search to be configured in the search dialog. --- src/calibre/gui2/store/search/search.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index 18ea50f125..3e4edf37a2 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -9,10 +9,12 @@ __docformat__ = 'restructuredtext en' import re from random import shuffle -from PyQt4.Qt import (Qt, QDialog, QTimer, QCheckBox, QVBoxLayout, QIcon, QWidget) +from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QTimer, QCheckBox, + QVBoxLayout, QIcon, QWidget) from calibre.gui2 import JSONConfig, info_dialog from calibre.gui2.progress_indicator import ProgressIndicator +from calibre.gui2.store.config.search_widget import StoreConfigWidget from calibre.gui2.store.search.adv_search_builder import AdvSearchBuilderDialog from calibre.gui2.store.search.download_thread import SearchThreadPool, \ CacheUpdateThreadPool @@ -224,9 +226,23 @@ class SearchDialog(QDialog, Ui_Dialog): self.details_thread_count = self.config.get('details_thread_count', 4) def do_config(self): - pass + d = QDialog(self) + button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) + v = QVBoxLayout(d) + button_box.accepted.connect(d.accept) + button_box.rejected.connect(d.reject) + d.setWindowTitle(_('Customize get books search')) + config_widget = StoreConfigWidget(self.config) + v.addWidget(config_widget) + v.addWidget(button_box) + + d.exec_() + + if d.result() == QDialog.Accepted: + config_widget.save_settings() + self.config_changed() - def config_finished(self): + def config_changed(self): self.load_settings() self.search_pool.set_thread_count(self.search_thread_count) From 894affa1b40efd9be20d5fd84f0f4be4ef5b6d3f Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 19:38:48 -0400 Subject: [PATCH 08/19] Store: search dialog, change button. Add open external as a config option. --- src/calibre/gui2/store/search/search.py | 10 +++++++++- src/calibre/gui2/store/search/search.ui | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index 3e4edf37a2..c7c252034d 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -74,6 +74,7 @@ class SearchDialog(QDialog, Ui_Dialog): self.top_layout.addWidget(self.pi) self.adv_search_button.setIcon(QIcon(I('search.png'))) + self.configure.setIcon(QIcon(I('config.png'))) self.adv_search_button.clicked.connect(self.build_adv_search) self.search.clicked.connect(self.do_search) @@ -200,7 +201,7 @@ class SearchDialog(QDialog, Ui_Dialog): else: self.resize_columns() - self.open_external.setChecked(self.config.get('open_external', True)) + self.open_external.setChecked(self.should_open_external) store_check = self.config.get('store_checked', None) if store_check: @@ -217,7 +218,9 @@ class SearchDialog(QDialog, Ui_Dialog): self.timeout = self.config.get('timeout', 75) # Milliseconds self.hang_time = self.config.get('hang_time', 75) * 1000 + self.max_results = self.config.get('max_results', 10) + self.should_open_external = self.config.get('open_external', True) # Number of threads to run for each type of operation self.search_thread_count = self.config.get('search_thread_count', 4) @@ -226,6 +229,10 @@ class SearchDialog(QDialog, Ui_Dialog): self.details_thread_count = self.config.get('details_thread_count', 4) def do_config(self): + # Save values that need to be synced between the dialog and the + # search widget. + self.config['open_external'] = self.open_external.isChecked() + d = QDialog(self) button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) v = QVBoxLayout(d) @@ -245,6 +252,7 @@ class SearchDialog(QDialog, Ui_Dialog): def config_changed(self): self.load_settings() + self.open_external.setChecked(self.should_open_external) self.search_pool.set_thread_count(self.search_thread_count) self.cache_pool.set_thread_count(self.cache_thread_count) self.results_view.model().cover_pool.set_thread_count(self.cover_thread_count) diff --git a/src/calibre/gui2/store/search/search.ui b/src/calibre/gui2/store/search/search.ui index 905620f688..0360fa5f98 100644 --- a/src/calibre/gui2/store/search/search.ui +++ b/src/calibre/gui2/store/search/search.ui @@ -164,9 +164,9 @@ - + - Configure + ... From ab55a25674d64426fa06877ec6b9c6a1bb87b8a9 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 21:17:27 -0400 Subject: [PATCH 09/19] Store: add missed files. Add more quick functions for listing stores and which ones are enabled. --- src/calibre/customize/ui.py | 23 ++- src/calibre/gui2/store/config/__init__.py | 0 .../gui2/store/config/search_widget.py | 45 +++++ .../gui2/store/config/search_widget.ui | 162 ++++++++++++++++++ src/calibre/gui2/store/config/store.py | 14 ++ src/calibre/gui2/ui.py | 4 +- 6 files changed, 243 insertions(+), 5 deletions(-) create mode 100644 src/calibre/gui2/store/config/__init__.py create mode 100644 src/calibre/gui2/store/config/search_widget.py create mode 100644 src/calibre/gui2/store/config/search_widget.ui create mode 100644 src/calibre/gui2/store/config/store.py diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py index e955336d3f..0a21b0b42e 100644 --- a/src/calibre/customize/ui.py +++ b/src/calibre/customize/ui.py @@ -216,9 +216,26 @@ def store_plugins(): customization = config['plugin_customization'] for plugin in _initialized_plugins: if isinstance(plugin, Store): - if not is_disabled(plugin): - plugin.site_customization = customization.get(plugin.name, '') - yield plugin + plugin.site_customization = customization.get(plugin.name, '') + yield plugin + +def available_store_plugins(): + for plugin in store_plugins(): + if not is_disabled(plugin): + yield plugin + +def stores(): + stores = set([]) + for plugin in store_plugins(): + stores.add(plugin.name) + return stores + +def available_stores(): + stores = set([]) + for plugin in available_store_plugins(): + stores.add(plugin.name) + return stores + # }}} # Metadata read/write {{{ diff --git a/src/calibre/gui2/store/config/__init__.py b/src/calibre/gui2/store/config/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/calibre/gui2/store/config/search_widget.py b/src/calibre/gui2/store/config/search_widget.py new file mode 100644 index 0000000000..43e911a432 --- /dev/null +++ b/src/calibre/gui2/store/config/search_widget.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- + +from __future__ import (unicode_literals, division, absolute_import, print_function) + +__license__ = 'GPL 3' +__copyright__ = '2011, John Schember ' +__docformat__ = 'restructuredtext en' + +from PyQt4.Qt import QWidget + +from calibre.gui2 import JSONConfig +from calibre.gui2.store.config.search_widget_ui import Ui_Form + +class StoreConfigWidget(QWidget, Ui_Form): + + def __init__(self, config=None): + QWidget.__init__(self) + self.setupUi(self) + + self.config = JSONConfig('store/search') if not config else config + + # These default values should be the same as in + # calibre.gui2.store.search.search:SearchDialog.load_settings + # Seconds + self.opt_timeout.setValue(self.config.get('timeout', 75)) + self.opt_hang_time.setValue(self.config.get('hang_time', 75)) + + self.opt_max_results.setValue(self.config.get('max_results', 10)) + self.opt_open_external.setChecked(self.config.get('open_external', True)) + + # Number of threads to run for each type of operation + self.opt_search_thread_count.setValue(self.config.get('search_thread_count', 4)) + self.opt_cache_thread_count.setValue(self.config.get('cache_thread_count', 2)) + self.opt_cover_thread_count.setValue(self.config.get('cover_thread_count', 2)) + self.opt_details_thread_count.setValue(self.config.get('details_thread_count', 4)) + + def save_settings(self): + self.config['timeout'] = self.opt_timeout.value() + self.config['hang_time'] = self.opt_hang_time.value() + self.config['max_results'] = self.opt_max_results.value() + self.config['open_external'] = self.opt_open_external.isChecked() + self.config['search_thread_count'] = self.opt_search_thread_count.value() + self.config['cache_thread_count'] = self.opt_cache_thread_count.value() + self.config['cover_thread_count'] = self.opt_cover_thread_count.value() + self.config['details_thread_count'] = self.opt_details_thread_count.value() diff --git a/src/calibre/gui2/store/config/search_widget.ui b/src/calibre/gui2/store/config/search_widget.ui new file mode 100644 index 0000000000..a73aae3ea5 --- /dev/null +++ b/src/calibre/gui2/store/config/search_widget.ui @@ -0,0 +1,162 @@ + + + Form + + + + 0 + 0 + 465 + 396 + + + + Form + + + + + + Time + + + + + + Number of seconds to wait for a store to respond + + + + + + + 1 + + + + + + + Number of seconds to let a store process results + + + + + + + 1 + + + 99 + + + 1 + + + 1 + + + + + + + + + + Display + + + + + + Maximum number of results to show per store + + + + + + + 1 + + + + + + + Open search result in system browser + + + + + + + + + + Threads + + + + + + Number of search threads to use + + + + + + + 1 + + + + + + + Number of cache update threads to use + + + + + + + 1 + + + + + + + Number of conver download threads to use + + + + + + + 1 + + + + + + + Number of details threads to use + + + + + + + 1 + + + + + + + + + + + diff --git a/src/calibre/gui2/store/config/store.py b/src/calibre/gui2/store/config/store.py new file mode 100644 index 0000000000..0e05514867 --- /dev/null +++ b/src/calibre/gui2/store/config/store.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- + +from __future__ import (unicode_literals, division, absolute_import, print_function) + +__license__ = 'GPL 3' +__copyright__ = '2011, John Schember ' +__docformat__ = 'restructuredtext en' + +def config_widget(): + from calibre.gui2.store.config.search_widget import StoreConfigWidget + return StoreConfigWidget() + +def save_settings(config_widget): + config_widget.save_settings() diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 122bfc81b4..df0e20e1bc 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -23,7 +23,7 @@ from calibre.constants import __appname__, isosx from calibre.utils.config import prefs, dynamic from calibre.utils.ipc.server import Server from calibre.library.database2 import LibraryDatabase2 -from calibre.customize.ui import interface_actions, store_plugins +from calibre.customize.ui import interface_actions, enabled_store_plugins from calibre.gui2 import error_dialog, GetMetadata, open_url, \ gprefs, max_available_height, config, info_dialog, Dispatcher, \ question_dialog @@ -144,7 +144,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ def load_store_plugins(self): self.istores = OrderedDict() - for store in store_plugins(): + for store in enabled_store_plugins(): if self.opts.ignore_plugins and store.plugin_path is not None: continue try: From 8ae27a865f2d14bbe13bc30ec7ee5c1036bfe26c Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 21:21:53 -0400 Subject: [PATCH 10/19] ... --- src/calibre/gui2/store/config/store.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/calibre/gui2/store/config/store.py b/src/calibre/gui2/store/config/store.py index 0e05514867..ddc24870bd 100644 --- a/src/calibre/gui2/store/config/store.py +++ b/src/calibre/gui2/store/config/store.py @@ -6,6 +6,10 @@ __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' __docformat__ = 'restructuredtext en' +''' +Config widget access functions for configuring the store action. +''' + def config_widget(): from calibre.gui2.store.config.search_widget import StoreConfigWidget return StoreConfigWidget() From bc8ea972e337544d476c657f16e9328de03e5395 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 22:12:00 -0400 Subject: [PATCH 11/19] Store: Fix google books leaving out some books. Add meta info to store plugins. --- src/calibre/customize/builtins.py | 111 ++++++++++++++++++ src/calibre/gui2/store/google_books_plugin.py | 2 +- 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 8490630bb8..c085185a6e 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1108,144 +1108,255 @@ class StoreAmazonKindleStore(StoreBase): name = 'Amazon Kindle' description = _('Kindle books from Amazon.') actual_plugin = 'calibre.gui2.store.amazon_plugin:AmazonKindleStore' + + drm_free_only = False + location = 'US' + formats = ['KINDLE'] class StoreAmazonDEKindleStore(StoreBase): name = 'Amazon DE Kindle' description = _('Kindle books from Amazon.de.') actual_plugin = 'calibre.gui2.store.amazon_de_plugin:AmazonDEKindleStore' + + drm_free_only = False + location = 'DE' + formats = ['KINDLE'] class StoreAmazonUKKindleStore(StoreBase): name = 'Amazon UK Kindle' description = _('Kindle books from Amazon.uk.') actual_plugin = 'calibre.gui2.store.amazon_uk_plugin:AmazonUKKindleStore' + + drm_free_only = False + location = 'UK' + formats = ['KINDLE'] class StoreArchiveOrgStore(StoreBase): name = 'Archive.org' description = _('Free Books : Download & Streaming : Ebook and Texts Archive : Internet Archive.') actual_plugin = 'calibre.gui2.store.archive_org_plugin:ArchiveOrgStore' + drm_free_only = True + location = 'US' + formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT'] class StoreBaenWebScriptionStore(StoreBase): name = 'Baen WebScription' description = _('Ebooks for readers.') actual_plugin = 'calibre.gui2.store.baen_webscription_plugin:BaenWebScriptionStore' + + drm_free_only = True + location = 'US' + formats = ['EPUB', 'LIT', 'LRF', 'MOBI', 'RB', 'RTF', 'ZIP'] class StoreBNStore(StoreBase): name = 'Barnes and Noble' description = _('Books, Textbooks, eBooks, Toys, Games and More.') actual_plugin = 'calibre.gui2.store.bn_plugin:BNStore' + + drm_free_only = False + location = 'US' + formats = ['NOOK'] class StoreBeamEBooksDEStore(StoreBase): name = 'Beam EBooks DE' description = _('Der eBook Shop.') actual_plugin = 'calibre.gui2.store.beam_ebooks_de_plugin:BeamEBooksDEStore' + + drm_free_only = False + location = 'DE' + formats = ['MOBI', 'PDF'] class StoreBeWriteStore(StoreBase): name = 'BeWrite Books' description = _('Publishers of fine books.') actual_plugin = 'calibre.gui2.store.bewrite_plugin:BeWriteStore' + + drm_free_only = True + location = 'US' + formats = ['EPUB', 'MOBI', 'PDF'] class StoreDieselEbooksStore(StoreBase): name = 'Diesel eBooks' description = _('World Famous eBook Store.') actual_plugin = 'calibre.gui2.store.diesel_ebooks_plugin:DieselEbooksStore' + + drm_free_only = False + location = 'US' + formats = ['EPUB', 'PDF'] class StoreEbookscomStore(StoreBase): name = 'eBooks.com' description = _('The digital bookstore.') actual_plugin = 'calibre.gui2.store.ebooks_com_plugin:EbookscomStore' + + drm_free_only = False + location = 'US' + formats = ['EPUB', 'LIT', 'MOBI', 'PDF'] class StoreEPubBuyDEStore(StoreBase): name = 'EPUBBuy DE' description = _('EPUBReaders eBook Shop.') actual_plugin = 'calibre.gui2.store.epubbuy_de_plugin:EPubBuyDEStore' + + drm_free_only = True + location = 'DE' + formats = ['EPUB'] class StoreEHarlequinStore(StoreBase): name = 'eHarlequin' description = _('Entertain, enrich, inspire.') actual_plugin = 'calibre.gui2.store.eharlequin_plugin:EHarlequinStore' + + drm_free_only = False + location = 'US' + formats = ['EPUB', 'PDF'] class StoreFeedbooksStore(StoreBase): name = 'Feedbooks' description = _('Read anywhere.') actual_plugin = 'calibre.gui2.store.feedbooks_plugin:FeedbooksStore' + + drm_free_only = False + location = 'FR' + formats = ['EPUB', 'MOBI', 'PDF'] class StoreFoylesUKStore(StoreBase): name = 'Foyles UK' description = _('Foyles of London, online.') actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore' + drm_free_only = False + location = 'UK' + formats = ['EPUB', 'PDF'] + class StoreGandalfStore(StoreBase): name = 'Gandalf' author = 'Tomasz Długosz' description = _('Zaczarowany świat książek') actual_plugin = 'calibre.gui2.store.gandalf_plugin:GandalfStore' + drm_free_only = False + location = 'PL' + formats = ['EPUB', 'PDF'] + class StoreGoogleBooksStore(StoreBase): name = 'Google Books' description = _('Google Books') actual_plugin = 'calibre.gui2.store.google_books_plugin:GoogleBooksStore' + + drm_free_only = False + location = 'US' + formats = ['EPUB', 'PDF', 'TXT'] class StoreGutenbergStore(StoreBase): name = 'Project Gutenberg' description = _('The first producer of free ebooks.') actual_plugin = 'calibre.gui2.store.gutenberg_plugin:GutenbergStore' + + drm_free_only = True + location = 'US' + formats = ['EPUB', 'HTML', 'MOBI', 'PDB', 'TXT'] class StoreKoboStore(StoreBase): name = 'Kobo' description = _('eReading: anytime. anyplace.') actual_plugin = 'calibre.gui2.store.kobo_plugin:KoboStore' + + drm_free_only = False + location = 'US' + formats = ['EPUB'] class StoreManyBooksStore(StoreBase): name = 'ManyBooks' description = _('The best ebooks at the best price: free!') actual_plugin = 'calibre.gui2.store.manybooks_plugin:ManyBooksStore' + + drm_free_only = True + location = 'US' + formats = ['EPUB', 'FB2', 'JAR', 'LIT', 'LRF', 'MOBI', 'PDB', 'PDF', 'RB', 'RTF', 'TCR', 'TXT', 'ZIP'] class StoreMobileReadStore(StoreBase): name = 'MobileRead' description = _('Ebooks handcrafted with the utmost care.') actual_plugin = 'calibre.gui2.store.mobileread.mobileread_plugin:MobileReadStore' + drm_free_only = True + location = 'CH' + formats = ['EPUB', 'IMP', 'LRF', 'LIT', 'MOBI', 'PDF'] + class StoreNextoStore(StoreBase): name = 'Nexto' author = 'Tomasz Długosz' description = _('Audiobooki mp3, ebooki, prasa - księgarnia internetowa.') actual_plugin = 'calibre.gui2.store.nexto_plugin:NextoStore' + + drm_free_only = False + location = 'PL' + formats = ['EPUB', 'PDF'] class StoreOpenLibraryStore(StoreBase): name = 'Open Library' description = _('One web page for every book.') actual_plugin = 'calibre.gui2.store.open_library_plugin:OpenLibraryStore' + + drm_free_only = True + location = ['US'] + formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT'] class StoreOReillyStore(StoreBase): name = 'OReilly' description = _('DRM-Free tech ebooks.') actual_plugin = 'calibre.gui2.store.oreilly_plugin:OReillyStore' + + drm_free_only = True + location = 'US' + formats = ['APK', 'DAISY', 'EPUB', 'MOBI', 'PDF'] class StorePragmaticBookshelfStore(StoreBase): name = 'Pragmatic Bookshelf' description = _('The Pragmatic Bookshelf') actual_plugin = 'calibre.gui2.store.pragmatic_bookshelf_plugin:PragmaticBookshelfStore' + drm_free_only = True + location = 'US' + formats = ['EPUB', 'MOBI', 'PDF'] + class StoreSmashwordsStore(StoreBase): name = 'Smashwords' description = _('Your ebook. Your way.') actual_plugin = 'calibre.gui2.store.smashwords_plugin:SmashwordsStore' + + drm_free_only = True + location = 'US' + formats = ['EPUB', 'HTML', 'LRF', 'MOBI', 'PDB', 'RTF', 'TXT'] class StoreWaterstonesUKStore(StoreBase): name = 'Waterstones UK' description = _('Feel every word.') actual_plugin = 'calibre.gui2.store.waterstones_uk_plugin:WaterstonesUKStore' + + drm_free_only = False + location = 'UK' + formats = ['EPUB', 'PDF'] class StoreWeightlessBooksStore(StoreBase): name = 'Weightless Books' description = '(e)Books That Don\'t Weigh You Down.' actual_plugin = 'calibre.gui2.store.weightless_books_plugin:WeightlessBooksStore' + drm_free_only = True + location = 'US' + formats = ['EPUB', 'HTML', 'LIT', 'MOBI', 'PDF'] + class StoreWizardsTowerBooksStore(StoreBase): name = 'Wizards Tower Books' description = 'Wizard\'s Tower Press.' actual_plugin = 'calibre.gui2.store.wizards_tower_books_plugin:WizardsTowerBooksStore' + + drm_free_only = True + location = 'UK' + formats = ['EPUB', 'MOBI'] plugins += [ StoreArchiveOrgStore, diff --git a/src/calibre/gui2/store/google_books_plugin.py b/src/calibre/gui2/store/google_books_plugin.py index 6db0cc10b8..938ca70664 100644 --- a/src/calibre/gui2/store/google_books_plugin.py +++ b/src/calibre/gui2/store/google_books_plugin.py @@ -51,7 +51,7 @@ class GoogleBooksStore(BasicStoreConfig, StorePlugin): title = ''.join(data.xpath('.//h3/a//text()')) authors = data.xpath('.//span[@class="gl"]//a//text()') - if authors[-1].strip().lower() == 'preview': + if authors[-1].strip().lower() in ('preview', 'read'): authors = authors[:-1] else: continue From 957155ea4b7530097b11f04bf982f4f86478be8f Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 21 May 2011 22:27:32 -0400 Subject: [PATCH 12/19] Store: Fix change to function name change. --- src/calibre/gui2/ui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index df0e20e1bc..cf9f6ee610 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -23,7 +23,7 @@ from calibre.constants import __appname__, isosx from calibre.utils.config import prefs, dynamic from calibre.utils.ipc.server import Server from calibre.library.database2 import LibraryDatabase2 -from calibre.customize.ui import interface_actions, enabled_store_plugins +from calibre.customize.ui import interface_actions, available_store_plugins from calibre.gui2 import error_dialog, GetMetadata, open_url, \ gprefs, max_available_height, config, info_dialog, Dispatcher, \ question_dialog @@ -144,7 +144,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ def load_store_plugins(self): self.istores = OrderedDict() - for store in enabled_store_plugins(): + for store in available_store_plugins(): if self.opts.ignore_plugins and store.plugin_path is not None: continue try: From d9dc12c9d9a68522c8cf2bc2e38cb169d067bd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= Date: Sun, 22 May 2011 13:32:29 +0200 Subject: [PATCH 13/19] Add new variables for Woblink --- src/calibre/customize/builtins.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 783a5e7f94..f27df26d3d 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1364,6 +1364,10 @@ class StoreWoblinkStore(StoreBase): description = _('Czytanie zdarza się wszędzie!') actual_plugin = 'calibre.gui2.store.woblink_plugin:WoblinkStore' + drm_free_only = False + location = 'PL' + formats = ['EPUB'] + plugins += [ StoreArchiveOrgStore, StoreAmazonKindleStore, From 776536599e78f73b527c4a3c3a123d257075c9cb Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 22 May 2011 09:22:01 -0400 Subject: [PATCH 14/19] ... --- src/calibre/customize/__init__.py | 8 +++++ src/calibre/customize/builtins.py | 56 +++++++++++++++---------------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py index 6118e5583b..ecb452faca 100644 --- a/src/calibre/customize/__init__.py +++ b/src/calibre/customize/__init__.py @@ -610,6 +610,14 @@ class StoreBase(Plugin): # {{{ minimum_calibre_version = (0, 8, 0) actual_plugin = None + + # Does the store only distribute ebooks without DRM. + drm_free_only = False + # This is the 2 letter country code for the corporate + # headquarters of the store. + headquarters = '' + # All formats the store distributes ebooks in. + formats = [] def load_actual_plugin(self, gui): ''' diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index c085185a6e..8c0ef84d50 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1110,7 +1110,7 @@ class StoreAmazonKindleStore(StoreBase): actual_plugin = 'calibre.gui2.store.amazon_plugin:AmazonKindleStore' drm_free_only = False - location = 'US' + headquarters = 'US' formats = ['KINDLE'] class StoreAmazonDEKindleStore(StoreBase): @@ -1119,7 +1119,7 @@ class StoreAmazonDEKindleStore(StoreBase): actual_plugin = 'calibre.gui2.store.amazon_de_plugin:AmazonDEKindleStore' drm_free_only = False - location = 'DE' + headquarters = 'DE' formats = ['KINDLE'] class StoreAmazonUKKindleStore(StoreBase): @@ -1128,7 +1128,7 @@ class StoreAmazonUKKindleStore(StoreBase): actual_plugin = 'calibre.gui2.store.amazon_uk_plugin:AmazonUKKindleStore' drm_free_only = False - location = 'UK' + headquarters = 'UK' formats = ['KINDLE'] class StoreArchiveOrgStore(StoreBase): @@ -1137,7 +1137,7 @@ class StoreArchiveOrgStore(StoreBase): actual_plugin = 'calibre.gui2.store.archive_org_plugin:ArchiveOrgStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT'] class StoreBaenWebScriptionStore(StoreBase): @@ -1146,7 +1146,7 @@ class StoreBaenWebScriptionStore(StoreBase): actual_plugin = 'calibre.gui2.store.baen_webscription_plugin:BaenWebScriptionStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['EPUB', 'LIT', 'LRF', 'MOBI', 'RB', 'RTF', 'ZIP'] class StoreBNStore(StoreBase): @@ -1155,7 +1155,7 @@ class StoreBNStore(StoreBase): actual_plugin = 'calibre.gui2.store.bn_plugin:BNStore' drm_free_only = False - location = 'US' + headquarters = 'US' formats = ['NOOK'] class StoreBeamEBooksDEStore(StoreBase): @@ -1164,7 +1164,7 @@ class StoreBeamEBooksDEStore(StoreBase): actual_plugin = 'calibre.gui2.store.beam_ebooks_de_plugin:BeamEBooksDEStore' drm_free_only = False - location = 'DE' + headquarters = 'DE' formats = ['MOBI', 'PDF'] class StoreBeWriteStore(StoreBase): @@ -1173,7 +1173,7 @@ class StoreBeWriteStore(StoreBase): actual_plugin = 'calibre.gui2.store.bewrite_plugin:BeWriteStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['EPUB', 'MOBI', 'PDF'] class StoreDieselEbooksStore(StoreBase): @@ -1182,7 +1182,7 @@ class StoreDieselEbooksStore(StoreBase): actual_plugin = 'calibre.gui2.store.diesel_ebooks_plugin:DieselEbooksStore' drm_free_only = False - location = 'US' + headquarters = 'US' formats = ['EPUB', 'PDF'] class StoreEbookscomStore(StoreBase): @@ -1191,7 +1191,7 @@ class StoreEbookscomStore(StoreBase): actual_plugin = 'calibre.gui2.store.ebooks_com_plugin:EbookscomStore' drm_free_only = False - location = 'US' + headquarters = 'US' formats = ['EPUB', 'LIT', 'MOBI', 'PDF'] class StoreEPubBuyDEStore(StoreBase): @@ -1200,7 +1200,7 @@ class StoreEPubBuyDEStore(StoreBase): actual_plugin = 'calibre.gui2.store.epubbuy_de_plugin:EPubBuyDEStore' drm_free_only = True - location = 'DE' + headquarters = 'DE' formats = ['EPUB'] class StoreEHarlequinStore(StoreBase): @@ -1209,7 +1209,7 @@ class StoreEHarlequinStore(StoreBase): actual_plugin = 'calibre.gui2.store.eharlequin_plugin:EHarlequinStore' drm_free_only = False - location = 'US' + headquarters = 'US' formats = ['EPUB', 'PDF'] class StoreFeedbooksStore(StoreBase): @@ -1218,7 +1218,7 @@ class StoreFeedbooksStore(StoreBase): actual_plugin = 'calibre.gui2.store.feedbooks_plugin:FeedbooksStore' drm_free_only = False - location = 'FR' + headquarters = 'FR' formats = ['EPUB', 'MOBI', 'PDF'] class StoreFoylesUKStore(StoreBase): @@ -1227,7 +1227,7 @@ class StoreFoylesUKStore(StoreBase): actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore' drm_free_only = False - location = 'UK' + headquarters = 'UK' formats = ['EPUB', 'PDF'] class StoreGandalfStore(StoreBase): @@ -1237,7 +1237,7 @@ class StoreGandalfStore(StoreBase): actual_plugin = 'calibre.gui2.store.gandalf_plugin:GandalfStore' drm_free_only = False - location = 'PL' + headquarters = 'PL' formats = ['EPUB', 'PDF'] class StoreGoogleBooksStore(StoreBase): @@ -1246,7 +1246,7 @@ class StoreGoogleBooksStore(StoreBase): actual_plugin = 'calibre.gui2.store.google_books_plugin:GoogleBooksStore' drm_free_only = False - location = 'US' + headquarters = 'US' formats = ['EPUB', 'PDF', 'TXT'] class StoreGutenbergStore(StoreBase): @@ -1255,7 +1255,7 @@ class StoreGutenbergStore(StoreBase): actual_plugin = 'calibre.gui2.store.gutenberg_plugin:GutenbergStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['EPUB', 'HTML', 'MOBI', 'PDB', 'TXT'] class StoreKoboStore(StoreBase): @@ -1264,7 +1264,7 @@ class StoreKoboStore(StoreBase): actual_plugin = 'calibre.gui2.store.kobo_plugin:KoboStore' drm_free_only = False - location = 'US' + headquarters = 'US' formats = ['EPUB'] class StoreManyBooksStore(StoreBase): @@ -1273,7 +1273,7 @@ class StoreManyBooksStore(StoreBase): actual_plugin = 'calibre.gui2.store.manybooks_plugin:ManyBooksStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['EPUB', 'FB2', 'JAR', 'LIT', 'LRF', 'MOBI', 'PDB', 'PDF', 'RB', 'RTF', 'TCR', 'TXT', 'ZIP'] class StoreMobileReadStore(StoreBase): @@ -1282,7 +1282,7 @@ class StoreMobileReadStore(StoreBase): actual_plugin = 'calibre.gui2.store.mobileread.mobileread_plugin:MobileReadStore' drm_free_only = True - location = 'CH' + headquarters = 'CH' formats = ['EPUB', 'IMP', 'LRF', 'LIT', 'MOBI', 'PDF'] class StoreNextoStore(StoreBase): @@ -1292,7 +1292,7 @@ class StoreNextoStore(StoreBase): actual_plugin = 'calibre.gui2.store.nexto_plugin:NextoStore' drm_free_only = False - location = 'PL' + headquarters = 'PL' formats = ['EPUB', 'PDF'] class StoreOpenLibraryStore(StoreBase): @@ -1301,7 +1301,7 @@ class StoreOpenLibraryStore(StoreBase): actual_plugin = 'calibre.gui2.store.open_library_plugin:OpenLibraryStore' drm_free_only = True - location = ['US'] + headquarters = ['US'] formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT'] class StoreOReillyStore(StoreBase): @@ -1310,7 +1310,7 @@ class StoreOReillyStore(StoreBase): actual_plugin = 'calibre.gui2.store.oreilly_plugin:OReillyStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['APK', 'DAISY', 'EPUB', 'MOBI', 'PDF'] class StorePragmaticBookshelfStore(StoreBase): @@ -1319,7 +1319,7 @@ class StorePragmaticBookshelfStore(StoreBase): actual_plugin = 'calibre.gui2.store.pragmatic_bookshelf_plugin:PragmaticBookshelfStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['EPUB', 'MOBI', 'PDF'] class StoreSmashwordsStore(StoreBase): @@ -1328,7 +1328,7 @@ class StoreSmashwordsStore(StoreBase): actual_plugin = 'calibre.gui2.store.smashwords_plugin:SmashwordsStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['EPUB', 'HTML', 'LRF', 'MOBI', 'PDB', 'RTF', 'TXT'] class StoreWaterstonesUKStore(StoreBase): @@ -1337,7 +1337,7 @@ class StoreWaterstonesUKStore(StoreBase): actual_plugin = 'calibre.gui2.store.waterstones_uk_plugin:WaterstonesUKStore' drm_free_only = False - location = 'UK' + headquarters = 'UK' formats = ['EPUB', 'PDF'] class StoreWeightlessBooksStore(StoreBase): @@ -1346,7 +1346,7 @@ class StoreWeightlessBooksStore(StoreBase): actual_plugin = 'calibre.gui2.store.weightless_books_plugin:WeightlessBooksStore' drm_free_only = True - location = 'US' + headquarters = 'US' formats = ['EPUB', 'HTML', 'LIT', 'MOBI', 'PDF'] class StoreWizardsTowerBooksStore(StoreBase): @@ -1355,7 +1355,7 @@ class StoreWizardsTowerBooksStore(StoreBase): actual_plugin = 'calibre.gui2.store.wizards_tower_books_plugin:WizardsTowerBooksStore' drm_free_only = True - location = 'UK' + headquarters = 'UK' formats = ['EPUB', 'MOBI'] plugins += [ From 42cce14fa9329b9172732720ea13e93879b4aaea Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 22 May 2011 10:25:08 -0400 Subject: [PATCH 15/19] Store: Add real description. Correct authors. --- src/calibre/customize/__init__.py | 1 + src/calibre/customize/builtins.py | 62 +++++++++++++++++-------------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py index ecb452faca..bf8151fe15 100644 --- a/src/calibre/customize/__init__.py +++ b/src/calibre/customize/__init__.py @@ -608,6 +608,7 @@ class StoreBase(Plugin): # {{{ author = 'John Schember' type = _('Store') minimum_calibre_version = (0, 8, 0) + version = (1, 0, 1) actual_plugin = None diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 8c0ef84d50..778aba6780 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1115,7 +1115,8 @@ class StoreAmazonKindleStore(StoreBase): class StoreAmazonDEKindleStore(StoreBase): name = 'Amazon DE Kindle' - description = _('Kindle books from Amazon.de.') + author = 'Charles Haley' + description = _('Kindle books from Amazon\'s German website.') actual_plugin = 'calibre.gui2.store.amazon_de_plugin:AmazonDEKindleStore' drm_free_only = False @@ -1124,7 +1125,8 @@ class StoreAmazonDEKindleStore(StoreBase): class StoreAmazonUKKindleStore(StoreBase): name = 'Amazon UK Kindle' - description = _('Kindle books from Amazon.uk.') + author = 'Charles Haley' + description = _('Kindle books from Amazon\'s UK web site. Also, includes French language ebooks.') actual_plugin = 'calibre.gui2.store.amazon_uk_plugin:AmazonUKKindleStore' drm_free_only = False @@ -1133,7 +1135,7 @@ class StoreAmazonUKKindleStore(StoreBase): class StoreArchiveOrgStore(StoreBase): name = 'Archive.org' - description = _('Free Books : Download & Streaming : Ebook and Texts Archive : Internet Archive.') + description = _('An Internet library offering permanent access for researchers, historians, scholars, people with disabilities, and the general public to historical collections that exist in digital format.') actual_plugin = 'calibre.gui2.store.archive_org_plugin:ArchiveOrgStore' drm_free_only = True @@ -1142,7 +1144,7 @@ class StoreArchiveOrgStore(StoreBase): class StoreBaenWebScriptionStore(StoreBase): name = 'Baen WebScription' - description = _('Ebooks for readers.') + description = _('Sci-Fi & Fantasy brought to you by Jim Baen.') actual_plugin = 'calibre.gui2.store.baen_webscription_plugin:BaenWebScriptionStore' drm_free_only = True @@ -1151,7 +1153,7 @@ class StoreBaenWebScriptionStore(StoreBase): class StoreBNStore(StoreBase): name = 'Barnes and Noble' - description = _('Books, Textbooks, eBooks, Toys, Games and More.') + description = _('The world\'s largest book seller. As the ultimate destination for book lovers, Barnes & Noble.com offers an incredible array of content.') actual_plugin = 'calibre.gui2.store.bn_plugin:BNStore' drm_free_only = False @@ -1160,16 +1162,17 @@ class StoreBNStore(StoreBase): class StoreBeamEBooksDEStore(StoreBase): name = 'Beam EBooks DE' - description = _('Der eBook Shop.') + author = 'Charles Haley' + description = _('Thousands of German-language eBooks.') actual_plugin = 'calibre.gui2.store.beam_ebooks_de_plugin:BeamEBooksDEStore' - drm_free_only = False + drm_free_only = True headquarters = 'DE' - formats = ['MOBI', 'PDF'] + formats = ['EPUB', 'MOBI', 'PDF'] class StoreBeWriteStore(StoreBase): name = 'BeWrite Books' - description = _('Publishers of fine books.') + description = _('Publishers of fine books. Highly selective and editorially driven. Does not offer: books for children or exclusively YA, erotica, swords-and-sorcery fantasy and space-opera-style science fiction. All other genres are represented.') actual_plugin = 'calibre.gui2.store.bewrite_plugin:BeWriteStore' drm_free_only = True @@ -1178,7 +1181,7 @@ class StoreBeWriteStore(StoreBase): class StoreDieselEbooksStore(StoreBase): name = 'Diesel eBooks' - description = _('World Famous eBook Store.') + description = _('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.') actual_plugin = 'calibre.gui2.store.diesel_ebooks_plugin:DieselEbooksStore' drm_free_only = False @@ -1187,7 +1190,7 @@ class StoreDieselEbooksStore(StoreBase): class StoreEbookscomStore(StoreBase): name = 'eBooks.com' - description = _('The digital bookstore.') + description = _('Sells books in multiple electronic formats in all categories. Technical infrastructure is cutting edge, robust and scalable, with servers in the US and Europe.') actual_plugin = 'calibre.gui2.store.ebooks_com_plugin:EbookscomStore' drm_free_only = False @@ -1196,7 +1199,8 @@ class StoreEbookscomStore(StoreBase): class StoreEPubBuyDEStore(StoreBase): name = 'EPUBBuy DE' - description = _('EPUBReaders eBook Shop.') + author = 'Charles Haley' + description = _('Fiction and Non-Fiction. Only sells EPUB ebooks. German-language.') actual_plugin = 'calibre.gui2.store.epubbuy_de_plugin:EPubBuyDEStore' drm_free_only = True @@ -1205,16 +1209,16 @@ class StoreEPubBuyDEStore(StoreBase): class StoreEHarlequinStore(StoreBase): name = 'eHarlequin' - description = _('Entertain, enrich, inspire.') + description = _('A global leader in series romance and one of the world\'s leading publishers of books for women. Offers women a broad range of reading from romance to bestseller fiction, from young adult novels to erotic literature, from nonfiction to fantasy, from African-American novels to inspirational romance, and more.') actual_plugin = 'calibre.gui2.store.eharlequin_plugin:EHarlequinStore' drm_free_only = False - headquarters = 'US' + headquarters = 'CA' formats = ['EPUB', 'PDF'] class StoreFeedbooksStore(StoreBase): name = 'Feedbooks' - description = _('Read anywhere.') + description = _('Feedbooks is a cloud publishing and distribution service, connected to a large ecosystem of reading systems and social networks. Provides a variety of genres from independent and classic books.') actual_plugin = 'calibre.gui2.store.feedbooks_plugin:FeedbooksStore' drm_free_only = False @@ -1223,7 +1227,8 @@ class StoreFeedbooksStore(StoreBase): class StoreFoylesUKStore(StoreBase): name = 'Foyles UK' - description = _('Foyles of London, online.') + author = 'Charles Haley' + description = _('Foyles of London\'s ebook store. Provides extensive range covering all subjects.') actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore' drm_free_only = False @@ -1233,7 +1238,7 @@ class StoreFoylesUKStore(StoreBase): class StoreGandalfStore(StoreBase): name = 'Gandalf' author = 'Tomasz Długosz' - description = _('Zaczarowany świat książek') + description = _('Polish language-store.') actual_plugin = 'calibre.gui2.store.gandalf_plugin:GandalfStore' drm_free_only = False @@ -1251,7 +1256,7 @@ class StoreGoogleBooksStore(StoreBase): class StoreGutenbergStore(StoreBase): name = 'Project Gutenberg' - description = _('The first producer of free ebooks.') + description = _('The first producer of free ebooks. Free in the United States because their copyright has expired. They may not be free of copyright in other countries. Readers outside of the United States must check the copyright laws of their countries before downloading or redistributing our ebooks.') actual_plugin = 'calibre.gui2.store.gutenberg_plugin:GutenbergStore' drm_free_only = True @@ -1260,7 +1265,7 @@ class StoreGutenbergStore(StoreBase): class StoreKoboStore(StoreBase): name = 'Kobo' - description = _('eReading: anytime. anyplace.') + description = _('With over 2.3 million eBooks to browse we have engaged readers in over 200 countries in Kobo eReading. Our eBook listings include New York Times Bestsellers, award winners, classics and more!') actual_plugin = 'calibre.gui2.store.kobo_plugin:KoboStore' drm_free_only = False @@ -1269,7 +1274,7 @@ class StoreKoboStore(StoreBase): class StoreManyBooksStore(StoreBase): name = 'ManyBooks' - description = _('The best ebooks at the best price: free!') + description = _('Public domain and creative commons works from many sources.') actual_plugin = 'calibre.gui2.store.manybooks_plugin:ManyBooksStore' drm_free_only = True @@ -1288,7 +1293,7 @@ class StoreMobileReadStore(StoreBase): class StoreNextoStore(StoreBase): name = 'Nexto' author = 'Tomasz Długosz' - description = _('Audiobooki mp3, ebooki, prasa - księgarnia internetowa.') + description = _('Polish language-store.') actual_plugin = 'calibre.gui2.store.nexto_plugin:NextoStore' drm_free_only = False @@ -1297,7 +1302,7 @@ class StoreNextoStore(StoreBase): class StoreOpenLibraryStore(StoreBase): name = 'Open Library' - description = _('One web page for every book.') + description = _('One web page for every book ever published. The goal is to be a true online library. Over 20 million records from a variety of large catalogs as well as single contributions, with more on the way.') actual_plugin = 'calibre.gui2.store.open_library_plugin:OpenLibraryStore' drm_free_only = True @@ -1306,7 +1311,7 @@ class StoreOpenLibraryStore(StoreBase): class StoreOReillyStore(StoreBase): name = 'OReilly' - description = _('DRM-Free tech ebooks.') + description = _('Programming and tech ebooks from OReilly.') actual_plugin = 'calibre.gui2.store.oreilly_plugin:OReillyStore' drm_free_only = True @@ -1315,7 +1320,7 @@ class StoreOReillyStore(StoreBase): class StorePragmaticBookshelfStore(StoreBase): name = 'Pragmatic Bookshelf' - description = _('The Pragmatic Bookshelf') + description = _('The Pragmatic Bookshelf\'s collection of programming and tech books avaliable as ebooks.') actual_plugin = 'calibre.gui2.store.pragmatic_bookshelf_plugin:PragmaticBookshelfStore' drm_free_only = True @@ -1324,7 +1329,7 @@ class StorePragmaticBookshelfStore(StoreBase): class StoreSmashwordsStore(StoreBase): name = 'Smashwords' - description = _('Your ebook. Your way.') + description = _('An ebook publishing and distribution platform for ebook authors, publishers and readers. Covers many genres and formats.') actual_plugin = 'calibre.gui2.store.smashwords_plugin:SmashwordsStore' drm_free_only = True @@ -1333,7 +1338,8 @@ class StoreSmashwordsStore(StoreBase): class StoreWaterstonesUKStore(StoreBase): name = 'Waterstones UK' - description = _('Feel every word.') + author = 'Charles Haley' + description = _('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 @@ -1342,7 +1348,7 @@ class StoreWaterstonesUKStore(StoreBase): class StoreWeightlessBooksStore(StoreBase): name = 'Weightless Books' - description = '(e)Books That Don\'t Weigh You Down.' + description = _('An independent DRM-free ebooksite devoted to ebooks of all sorts.') actual_plugin = 'calibre.gui2.store.weightless_books_plugin:WeightlessBooksStore' drm_free_only = True @@ -1351,7 +1357,7 @@ class StoreWeightlessBooksStore(StoreBase): class StoreWizardsTowerBooksStore(StoreBase): name = 'Wizards Tower Books' - description = 'Wizard\'s Tower Press.' + description = _('A science fiction and fantasy publisher. Concentrates mainly on making out-of-print works available once more as e-books, and helping other small presses exploit the e-book market. Also publishes a small number of limited-print-run anthologies with a view to encouraging diversity in the science fiction and fantasy field.') actual_plugin = 'calibre.gui2.store.wizards_tower_books_plugin:WizardsTowerBooksStore' drm_free_only = True From 80bf19cfc17d67393fd1ce4d4ad0b3a837d5bb87 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 22 May 2011 10:51:17 -0400 Subject: [PATCH 16/19] Store: Make description non-translatable. Make descriptions unicode. --- src/calibre/customize/__init__.py | 4 +++ src/calibre/customize/builtins.py | 60 +++++++++++++++---------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py index bf8151fe15..3d265aed1c 100644 --- a/src/calibre/customize/__init__.py +++ b/src/calibre/customize/__init__.py @@ -607,6 +607,10 @@ class StoreBase(Plugin): # {{{ supported_platforms = ['windows', 'osx', 'linux'] author = 'John Schember' type = _('Store') + # Information about the store. Should be in the primary language + # of the store. This should not be translatable when set by + # a subclass. + description = _('An ebook store.') minimum_calibre_version = (0, 8, 0) version = (1, 0, 1) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 778aba6780..ea9e555c11 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1106,7 +1106,7 @@ plugins += [LookAndFeel, Behavior, Columns, Toolbar, Search, InputOptions, # Store plugins {{{ class StoreAmazonKindleStore(StoreBase): name = 'Amazon Kindle' - description = _('Kindle books from Amazon.') + description = u'Kindle books from Amazon.' actual_plugin = 'calibre.gui2.store.amazon_plugin:AmazonKindleStore' drm_free_only = False @@ -1116,7 +1116,7 @@ class StoreAmazonKindleStore(StoreBase): class StoreAmazonDEKindleStore(StoreBase): name = 'Amazon DE Kindle' author = 'Charles Haley' - description = _('Kindle books from Amazon\'s German website.') + description = u'Kindle Bücher von Amazon.' actual_plugin = 'calibre.gui2.store.amazon_de_plugin:AmazonDEKindleStore' drm_free_only = False @@ -1126,7 +1126,7 @@ class StoreAmazonDEKindleStore(StoreBase): class StoreAmazonUKKindleStore(StoreBase): name = 'Amazon UK Kindle' author = 'Charles Haley' - description = _('Kindle books from Amazon\'s UK web site. Also, includes French language ebooks.') + description = u'Kindle books from Amazon\'s UK web site. Also, includes French language ebooks.' actual_plugin = 'calibre.gui2.store.amazon_uk_plugin:AmazonUKKindleStore' drm_free_only = False @@ -1135,7 +1135,7 @@ class StoreAmazonUKKindleStore(StoreBase): class StoreArchiveOrgStore(StoreBase): name = 'Archive.org' - description = _('An Internet library offering permanent access for researchers, historians, scholars, people with disabilities, and the general public to historical collections that exist in digital format.') + description = u'An Internet library offering permanent access for researchers, historians, scholars, people with disabilities, and the general public to historical collections that exist in digital format.' actual_plugin = 'calibre.gui2.store.archive_org_plugin:ArchiveOrgStore' drm_free_only = True @@ -1144,7 +1144,7 @@ class StoreArchiveOrgStore(StoreBase): class StoreBaenWebScriptionStore(StoreBase): name = 'Baen WebScription' - description = _('Sci-Fi & Fantasy brought to you by Jim Baen.') + description = u'Sci-Fi & Fantasy brought to you by Jim Baen.' actual_plugin = 'calibre.gui2.store.baen_webscription_plugin:BaenWebScriptionStore' drm_free_only = True @@ -1153,7 +1153,7 @@ class StoreBaenWebScriptionStore(StoreBase): class StoreBNStore(StoreBase): name = 'Barnes and Noble' - description = _('The world\'s largest book seller. As the ultimate destination for book lovers, Barnes & Noble.com offers an incredible array of content.') + description = u'The world\'s largest book seller. As the ultimate destination for book lovers, Barnes & Noble.com offers an incredible array of content.' actual_plugin = 'calibre.gui2.store.bn_plugin:BNStore' drm_free_only = False @@ -1163,7 +1163,7 @@ class StoreBNStore(StoreBase): class StoreBeamEBooksDEStore(StoreBase): name = 'Beam EBooks DE' author = 'Charles Haley' - description = _('Thousands of German-language eBooks.') + description = u'Der eBook Shop.' actual_plugin = 'calibre.gui2.store.beam_ebooks_de_plugin:BeamEBooksDEStore' drm_free_only = True @@ -1172,7 +1172,7 @@ class StoreBeamEBooksDEStore(StoreBase): class StoreBeWriteStore(StoreBase): name = 'BeWrite Books' - description = _('Publishers of fine books. Highly selective and editorially driven. Does not offer: books for children or exclusively YA, erotica, swords-and-sorcery fantasy and space-opera-style science fiction. All other genres are represented.') + description = u'Publishers of fine books. Highly selective and editorially driven. Does not offer: books for children or exclusively YA, erotica, swords-and-sorcery fantasy and space-opera-style science fiction. All other genres are represented.' actual_plugin = 'calibre.gui2.store.bewrite_plugin:BeWriteStore' drm_free_only = True @@ -1181,7 +1181,7 @@ class StoreBeWriteStore(StoreBase): class StoreDieselEbooksStore(StoreBase): name = 'Diesel eBooks' - description = _('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.') + 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.' actual_plugin = 'calibre.gui2.store.diesel_ebooks_plugin:DieselEbooksStore' drm_free_only = False @@ -1190,7 +1190,7 @@ class StoreDieselEbooksStore(StoreBase): class StoreEbookscomStore(StoreBase): name = 'eBooks.com' - description = _('Sells books in multiple electronic formats in all categories. Technical infrastructure is cutting edge, robust and scalable, with servers in the US and Europe.') + description = u'Sells books in multiple electronic formats in all categories. Technical infrastructure is cutting edge, robust and scalable, with servers in the US and Europe.' actual_plugin = 'calibre.gui2.store.ebooks_com_plugin:EbookscomStore' drm_free_only = False @@ -1200,7 +1200,7 @@ class StoreEbookscomStore(StoreBase): class StoreEPubBuyDEStore(StoreBase): name = 'EPUBBuy DE' author = 'Charles Haley' - description = _('Fiction and Non-Fiction. Only sells EPUB ebooks. German-language.') + description = u'Deutsch epub-Spezialisten.' actual_plugin = 'calibre.gui2.store.epubbuy_de_plugin:EPubBuyDEStore' drm_free_only = True @@ -1209,7 +1209,7 @@ class StoreEPubBuyDEStore(StoreBase): class StoreEHarlequinStore(StoreBase): name = 'eHarlequin' - description = _('A global leader in series romance and one of the world\'s leading publishers of books for women. Offers women a broad range of reading from romance to bestseller fiction, from young adult novels to erotic literature, from nonfiction to fantasy, from African-American novels to inspirational romance, and more.') + description = u'A global leader in series romance and one of the world\'s leading publishers of books for women. Offers women a broad range of reading from romance to bestseller fiction, from young adult novels to erotic literature, from nonfiction to fantasy, from African-American novels to inspirational romance, and more.' actual_plugin = 'calibre.gui2.store.eharlequin_plugin:EHarlequinStore' drm_free_only = False @@ -1218,7 +1218,7 @@ class StoreEHarlequinStore(StoreBase): class StoreFeedbooksStore(StoreBase): name = 'Feedbooks' - description = _('Feedbooks is a cloud publishing and distribution service, connected to a large ecosystem of reading systems and social networks. Provides a variety of genres from independent and classic books.') + description = u'Feedbooks is a cloud publishing and distribution service, connected to a large ecosystem of reading systems and social networks. Provides a variety of genres from independent and classic books.' actual_plugin = 'calibre.gui2.store.feedbooks_plugin:FeedbooksStore' drm_free_only = False @@ -1228,7 +1228,7 @@ class StoreFeedbooksStore(StoreBase): class StoreFoylesUKStore(StoreBase): name = 'Foyles UK' author = 'Charles Haley' - description = _('Foyles of London\'s ebook store. Provides extensive range covering all subjects.') + description = u'Foyles of London\'s ebook store. Provides extensive range covering all subjects.' actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore' drm_free_only = False @@ -1237,8 +1237,8 @@ class StoreFoylesUKStore(StoreBase): class StoreGandalfStore(StoreBase): name = 'Gandalf' - author = 'Tomasz Długosz' - description = _('Polish language-store.') + author = u'Tomasz Długosz' + description = u'Zaczarowany świat książek.' actual_plugin = 'calibre.gui2.store.gandalf_plugin:GandalfStore' drm_free_only = False @@ -1247,7 +1247,7 @@ class StoreGandalfStore(StoreBase): class StoreGoogleBooksStore(StoreBase): name = 'Google Books' - description = _('Google Books') + description = u'Google Books' actual_plugin = 'calibre.gui2.store.google_books_plugin:GoogleBooksStore' drm_free_only = False @@ -1256,7 +1256,7 @@ class StoreGoogleBooksStore(StoreBase): class StoreGutenbergStore(StoreBase): name = 'Project Gutenberg' - description = _('The first producer of free ebooks. Free in the United States because their copyright has expired. They may not be free of copyright in other countries. Readers outside of the United States must check the copyright laws of their countries before downloading or redistributing our ebooks.') + description = u'The first producer of free ebooks. Free in the United States because their copyright has expired. They may not be free of copyright in other countries. Readers outside of the United States must check the copyright laws of their countries before downloading or redistributing our ebooks.' actual_plugin = 'calibre.gui2.store.gutenberg_plugin:GutenbergStore' drm_free_only = True @@ -1265,7 +1265,7 @@ class StoreGutenbergStore(StoreBase): class StoreKoboStore(StoreBase): name = 'Kobo' - description = _('With over 2.3 million eBooks to browse we have engaged readers in over 200 countries in Kobo eReading. Our eBook listings include New York Times Bestsellers, award winners, classics and more!') + description = u'With over 2.3 million eBooks to browse we have engaged readers in over 200 countries in Kobo eReading. Our eBook listings include New York Times Bestsellers, award winners, classics and more!' actual_plugin = 'calibre.gui2.store.kobo_plugin:KoboStore' drm_free_only = False @@ -1274,7 +1274,7 @@ class StoreKoboStore(StoreBase): class StoreManyBooksStore(StoreBase): name = 'ManyBooks' - description = _('Public domain and creative commons works from many sources.') + description = u'Public domain and creative commons works from many sources.' actual_plugin = 'calibre.gui2.store.manybooks_plugin:ManyBooksStore' drm_free_only = True @@ -1283,7 +1283,7 @@ class StoreManyBooksStore(StoreBase): class StoreMobileReadStore(StoreBase): name = 'MobileRead' - description = _('Ebooks handcrafted with the utmost care.') + description = u'Ebooks handcrafted with the utmost care.' actual_plugin = 'calibre.gui2.store.mobileread.mobileread_plugin:MobileReadStore' drm_free_only = True @@ -1292,8 +1292,8 @@ class StoreMobileReadStore(StoreBase): class StoreNextoStore(StoreBase): name = 'Nexto' - author = 'Tomasz Długosz' - description = _('Polish language-store.') + author = u'Tomasz Długosz' + description = u'Ebooki, prasa - księgarnia internetowa.' actual_plugin = 'calibre.gui2.store.nexto_plugin:NextoStore' drm_free_only = False @@ -1302,7 +1302,7 @@ class StoreNextoStore(StoreBase): class StoreOpenLibraryStore(StoreBase): name = 'Open Library' - description = _('One web page for every book ever published. The goal is to be a true online library. Over 20 million records from a variety of large catalogs as well as single contributions, with more on the way.') + description = u'One web page for every book ever published. The goal is to be a true online library. Over 20 million records from a variety of large catalogs as well as single contributions, with more on the way.' actual_plugin = 'calibre.gui2.store.open_library_plugin:OpenLibraryStore' drm_free_only = True @@ -1311,7 +1311,7 @@ class StoreOpenLibraryStore(StoreBase): class StoreOReillyStore(StoreBase): name = 'OReilly' - description = _('Programming and tech ebooks from OReilly.') + description = u'Programming and tech ebooks from OReilly.' actual_plugin = 'calibre.gui2.store.oreilly_plugin:OReillyStore' drm_free_only = True @@ -1320,7 +1320,7 @@ class StoreOReillyStore(StoreBase): class StorePragmaticBookshelfStore(StoreBase): name = 'Pragmatic Bookshelf' - description = _('The Pragmatic Bookshelf\'s collection of programming and tech books avaliable as ebooks.') + description = u'The Pragmatic Bookshelf\'s collection of programming and tech books avaliable as ebooks.' actual_plugin = 'calibre.gui2.store.pragmatic_bookshelf_plugin:PragmaticBookshelfStore' drm_free_only = True @@ -1329,7 +1329,7 @@ class StorePragmaticBookshelfStore(StoreBase): class StoreSmashwordsStore(StoreBase): name = 'Smashwords' - description = _('An ebook publishing and distribution platform for ebook authors, publishers and readers. Covers many genres and formats.') + description = u'An ebook publishing and distribution platform for ebook authors, publishers and readers. Covers many genres and formats.' actual_plugin = 'calibre.gui2.store.smashwords_plugin:SmashwordsStore' drm_free_only = True @@ -1339,7 +1339,7 @@ class StoreSmashwordsStore(StoreBase): class StoreWaterstonesUKStore(StoreBase): name = 'Waterstones UK' author = 'Charles Haley' - description = _('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.') + 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 @@ -1348,7 +1348,7 @@ class StoreWaterstonesUKStore(StoreBase): class StoreWeightlessBooksStore(StoreBase): name = 'Weightless Books' - description = _('An independent DRM-free ebooksite devoted to ebooks of all sorts.') + description = u'An independent DRM-free ebooksite devoted to ebooks of all sorts.' actual_plugin = 'calibre.gui2.store.weightless_books_plugin:WeightlessBooksStore' drm_free_only = True @@ -1357,7 +1357,7 @@ class StoreWeightlessBooksStore(StoreBase): class StoreWizardsTowerBooksStore(StoreBase): name = 'Wizards Tower Books' - description = _('A science fiction and fantasy publisher. Concentrates mainly on making out-of-print works available once more as e-books, and helping other small presses exploit the e-book market. Also publishes a small number of limited-print-run anthologies with a view to encouraging diversity in the science fiction and fantasy field.') + description = u'A science fiction and fantasy publisher. Concentrates mainly on making out-of-print works available once more as e-books, and helping other small presses exploit the e-book market. Also publishes a small number of limited-print-run anthologies with a view to encouraging diversity in the science fiction and fantasy field.' actual_plugin = 'calibre.gui2.store.wizards_tower_books_plugin:WizardsTowerBooksStore' drm_free_only = True From 1c448eae14a53fa95f2ee24271139245f41ddb26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= Date: Sun, 22 May 2011 21:41:42 +0200 Subject: [PATCH 17/19] new descriptions --- src/calibre/customize/builtins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 0e239a2706..89d9512317 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1238,7 +1238,7 @@ class StoreFoylesUKStore(StoreBase): class StoreGandalfStore(StoreBase): name = 'Gandalf' author = u'Tomasz Długosz' - description = u'Zaczarowany świat książek.' + description = u'Księgarnia internetowa Gandalf.' actual_plugin = 'calibre.gui2.store.gandalf_plugin:GandalfStore' drm_free_only = False @@ -1293,7 +1293,7 @@ class StoreMobileReadStore(StoreBase): class StoreNextoStore(StoreBase): name = 'Nexto' author = u'Tomasz Długosz' - description = u'Ebooki, prasa - księgarnia internetowa.' + description = u'Największy w Polsce sklep internetowy z audiobookami mp3, ebookami pdf oraz prasą do pobrania on-line.' actual_plugin = 'calibre.gui2.store.nexto_plugin:NextoStore' drm_free_only = False From fa50fa00b3f508560bda6a49e594600586162d36 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sun, 22 May 2011 17:18:48 -0400 Subject: [PATCH 18/19] Store: Fix Woblink. --- src/calibre/customize/builtins.py | 2 +- src/calibre/gui2/store/woblink_plugin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 89d9512317..383a154eff 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1367,7 +1367,7 @@ class StoreWizardsTowerBooksStore(StoreBase): class StoreWoblinkStore(StoreBase): name = 'Woblink' author = 'Tomasz Długosz' - description = _('Czytanie zdarza się wszędzie!') + description = u'Czytanie zdarza się wszędzie!' actual_plugin = 'calibre.gui2.store.woblink_plugin:WoblinkStore' drm_free_only = False diff --git a/src/calibre/gui2/store/woblink_plugin.py b/src/calibre/gui2/store/woblink_plugin.py index 9659f72fd1..69be8f2e94 100644 --- a/src/calibre/gui2/store/woblink_plugin.py +++ b/src/calibre/gui2/store/woblink_plugin.py @@ -40,7 +40,7 @@ class WoblinkStore(BasicStoreConfig, StorePlugin): d.exec_() def search(self, query, max_results=10, timeout=60): - url = 'http://woblink.com/publication?query' + urllib.quote_plus(query.encode('utf-8')) + url = 'http://woblink.com/publication?query=' + urllib.quote_plus(query.encode('utf-8')) br = browser() From 257195be1f79361950e4b94167e06b07421870d0 Mon Sep 17 00:00:00 2001 From: John Schember Date: Mon, 23 May 2011 07:44:03 -0400 Subject: [PATCH 19/19] .. --- src/calibre/customize/builtins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 383a154eff..680e36d0f3 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1269,7 +1269,7 @@ class StoreKoboStore(StoreBase): actual_plugin = 'calibre.gui2.store.kobo_plugin:KoboStore' drm_free_only = False - headquarters = 'US' + headquarters = 'CA' formats = ['EPUB'] class StoreManyBooksStore(StoreBase):