diff --git a/resources/images/drm-locked.png b/resources/images/drm-locked.png
new file mode 100644
index 0000000000..84c7a5e7b1
Binary files /dev/null and b/resources/images/drm-locked.png differ
diff --git a/resources/images/drm-unlocked.png b/resources/images/drm-unlocked.png
new file mode 100644
index 0000000000..f7f20a68f0
Binary files /dev/null and b/resources/images/drm-unlocked.png differ
diff --git a/src/calibre/devices/kindle/apnx.py b/src/calibre/devices/kindle/apnx.py
index 178c1091f3..ee519750e0 100644
--- a/src/calibre/devices/kindle/apnx.py
+++ b/src/calibre/devices/kindle/apnx.py
@@ -164,7 +164,7 @@ class APNXBuilder(object):
if c == '/':
closing = True
continue
- elif c == 'p':
+ elif c in ('d', 'p'):
if closing:
in_p = False
else:
diff --git a/src/calibre/gui2/actions/store.py b/src/calibre/gui2/actions/store.py
index 4e96960243..aefebb7b33 100644
--- a/src/calibre/gui2/actions/store.py
+++ b/src/calibre/gui2/actions/store.py
@@ -10,6 +10,7 @@ from functools import partial
from PyQt4.Qt import QMenu
+from calibre.gui2 import JSONConfig
from calibre.gui2.actions import InterfaceAction
class StoreAction(InterfaceAction):
@@ -18,6 +19,8 @@ class StoreAction(InterfaceAction):
action_spec = (_('Get books'), 'store.png', None, None)
def genesis(self):
+ self.config = JSONConfig('store_action')
+
self.qaction.triggered.connect(self.search)
self.store_menu = QMenu()
self.load_menu()
@@ -31,9 +34,34 @@ class StoreAction(InterfaceAction):
self.qaction.setMenu(self.store_menu)
def search(self):
+ self.first_run_check()
from calibre.gui2.store.search import SearchDialog
sd = SearchDialog(self.gui.istores, self.gui)
sd.exec_()
def open_store(self, store_plugin):
+ self.first_run_check()
store_plugin.open(self.gui)
+
+ def first_run_check(self):
+ if self.config.get('first_run', True):
+ self.config['first_run'] = False
+ from calibre.gui2 import info_dialog
+ info_dialog(self.gui, _('About Get Books'), '' +
+ _('Calibre helps you find the ebooks you want by searching '
+ 'the websites of a variety of commercial and public domain '
+ 'book sources for you.') +
+ '
' +
+ _('Using the integrated search you can easily find which '
+ 'store has the book you are looking for, at the best price. '
+ 'You will also get DRM status and other useful information.')
+ + '
' +
+ _('All transactions (paid or otherwise) are handled between '
+ 'you and the particular website. '
+ 'Calibre is not part of this process and any issues related '
+ 'to a purchase should be directed to the website you are '
+ 'buying from. Be sure to double check that any books you get '
+ 'will work with your e-book reader, especially if the book you '
+ 'are buying has '
+ 'DRM.'
+ ), show=True, show_copy_button=False)
diff --git a/src/calibre/gui2/store/__init__.py b/src/calibre/gui2/store/__init__.py
index 26bafd2c95..43909e9d8b 100644
--- a/src/calibre/gui2/store/__init__.py
+++ b/src/calibre/gui2/store/__init__.py
@@ -76,10 +76,16 @@ class StorePlugin(object): # {{{
return items as a generator.
Don't be lazy with the search! Load as much data as possible in the
- :class:`calibre.gui2.store.search_result.SearchResult` object. If you have to parse
- multiple pages to get all of the data then do so. However, if data (such as cover_url)
+ :class:`calibre.gui2.store.search_result.SearchResult` object.
+ However, if data (such as cover_url)
isn't available because the store does not display cover images then it's okay to
ignore it.
+
+ At the very least a :class:`calibre.gui2.store.search_result.SearchResult`
+ returned by this function must have the title, author and id.
+
+ If you have to parse multiple pages to get all of the data then implement
+ :meth:`get_deatils` for retrieving additional information.
Also, by default search results can only include ebooks. A plugin can offer users
an option to include physical books in the search results but this must be
@@ -90,12 +96,33 @@ class StorePlugin(object): # {{{
:param query: The string query search with.
:param max_results: The maximum number of results to return.
- :param timeout: The maximum amount of time in seconds to spend download the search results.
+ :param timeout: The maximum amount of time in seconds to spend downloading data for search results.
:return: :class:`calibre.gui2.store.search_result.SearchResult` objects
item_data is plugin specific and is used in :meth:`open` to open to a specifc place in the store.
'''
raise NotImplementedError()
+
+ def get_details(self, search_result, timeout=60):
+ '''
+ Delayed search for information about specific search items.
+
+ Typically, this will be used when certain information such as
+ formats, drm status, cover url are not part of the main search
+ results and the information is on another web page.
+
+ Using this function allows for the main information (title, author)
+ to be displayed in the search results while other information can
+ take extra time to load. Splitting retrieving data that takes longer
+ to load into a separate function will give the illusion of the search
+ being faster.
+
+ :param search_result: A search result that need details set.
+ :param timeout: The maximum amount of time in seconds to spend downloading details.
+
+ :return: True if the search_result was modified otherwise False
+ '''
+ return False
def get_settings(self):
'''
diff --git a/src/calibre/gui2/store/amazon_plugin.py b/src/calibre/gui2/store/amazon_plugin.py
index 51986ee4df..d5d8b54600 100644
--- a/src/calibre/gui2/store/amazon_plugin.py
+++ b/src/calibre/gui2/store/amazon_plugin.py
@@ -168,5 +168,23 @@ class AmazonKindleStore(StorePlugin):
s.author = author.strip()
s.price = price.strip()
s.detail_item = asin.strip()
+ s.formats = 'Kindle'
yield s
+
+ def get_details(self, search_result, timeout):
+ url = 'http://amazon.com/dp/'
+
+ br = browser()
+ with closing(br.open(url + search_result.detail_item, timeout=timeout)) as nf:
+ idata = html.fromstring(nf.read())
+ if idata.xpath('boolean(//div[@class="content"]//li/b[contains(text(), "Simultaneous Device Usage")])'):
+ if idata.xpath('boolean(//div[@class="content"]//li[contains(., "Unlimited") and contains(b, "Simultaneous Device Usage")])'):
+ search_result.drm = SearchResult.DRM_UNLOCKED
+ else:
+ search_result.drm = SearchResult.DRM_UNKNOWN
+ else:
+ search_result.drm = SearchResult.DRM_LOCKED
+ return True
+
+
\ No newline at end of file
diff --git a/src/calibre/gui2/store/baen_webscription_plugin.py b/src/calibre/gui2/store/baen_webscription_plugin.py
index 46a7c1ec7c..d4f7924851 100644
--- a/src/calibre/gui2/store/baen_webscription_plugin.py
+++ b/src/calibre/gui2/store/baen_webscription_plugin.py
@@ -85,5 +85,7 @@ class BaenWebScriptionStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price
s.detail_item = id.strip()
+ s.drm = SearchResult.DRM_UNLOCKED
+ s.formats = 'RB, MOBI, EPUB, LIT, LRF, RTF, HTML'
yield s
diff --git a/src/calibre/gui2/store/bewrite_plugin.py b/src/calibre/gui2/store/bewrite_plugin.py
index 37bd9cf9a5..8cc4a2745f 100644
--- a/src/calibre/gui2/store/bewrite_plugin.py
+++ b/src/calibre/gui2/store/bewrite_plugin.py
@@ -60,14 +60,6 @@ class BeWriteStore(BasicStoreConfig, StorePlugin):
cover_url = ''
price = ''
- with closing(br.open(id.strip(), timeout=timeout/4)) as nf:
- idata = html.fromstring(nf.read())
- price = ''.join(idata.xpath('//div[@id="content"]//td[contains(text(), "ePub")]/text()'))
- price = '$' + price.split('$')[-1]
- cover_img = idata.xpath('//div[@id="content"]//img[1]/@src')
- if cover_img:
- cover_url = 'http://www.bewrite.net/mm5/' + cover_img[0]
-
counter -= 1
s = SearchResult()
@@ -76,5 +68,36 @@ class BeWriteStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price.strip()
s.detail_item = id.strip()
+ s.drm = SearchResult.DRM_UNLOCKED
yield s
+
+ def get_details(self, search_result, timeout):
+ br = browser()
+
+ with closing(br.open(search_result.detail_item, timeout=timeout)) as nf:
+ idata = html.fromstring(nf.read())
+
+ price = ''.join(idata.xpath('//div[@id="content"]//td[contains(text(), "ePub")]/text()'))
+ if not price:
+ price = ''.join(idata.xpath('//div[@id="content"]//td[contains(text(), "MOBI")]/text()'))
+ if not price:
+ price = ''.join(idata.xpath('//div[@id="content"]//td[contains(text(), "PDF")]/text()'))
+ price = '$' + price.split('$')[-1]
+ search_result.price = price.strip()
+
+ cover_img = idata.xpath('//div[@id="content"]//img[1]/@src')
+ if cover_img:
+ cover_url = 'http://www.bewrite.net/mm5/' + cover_img[0]
+ search_result.cover_url = cover_url.strip()
+
+ formats = set([])
+ if idata.xpath('boolean(//div[@id="content"]//td[contains(text(), "ePub")])'):
+ formats.add('EPUB')
+ if idata.xpath('boolean(//div[@id="content"]//td[contains(text(), "PDF")])'):
+ formats.add('PDF')
+ if idata.xpath('boolean(//div[@id="content"]//td[contains(text(), "MOBI")])'):
+ formats.add('MOBI')
+ search_result.formats = ', '.join(list(formats))
+
+ return True
diff --git a/src/calibre/gui2/store/bn_plugin.py b/src/calibre/gui2/store/bn_plugin.py
index 4da551fd92..8b1cfa03f0 100644
--- a/src/calibre/gui2/store/bn_plugin.py
+++ b/src/calibre/gui2/store/bn_plugin.py
@@ -78,5 +78,7 @@ class BNStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price
s.detail_item = id.strip()
+ s.drm = SearchResult.DRM_UNKNOWN
+ s.formats = 'Nook'
yield s
diff --git a/src/calibre/gui2/store/diesel_ebooks_plugin.py b/src/calibre/gui2/store/diesel_ebooks_plugin.py
index 66c22f847f..b33bad15f9 100644
--- a/src/calibre/gui2/store/diesel_ebooks_plugin.py
+++ b/src/calibre/gui2/store/diesel_ebooks_plugin.py
@@ -75,6 +75,8 @@ class DieselEbooksStore(BasicStoreConfig, StorePlugin):
if price_elem:
price = price_elem[0]
+ formats = ', '.join(data.xpath('.//td[@class="format"]/text()'))
+
counter -= 1
s = SearchResult()
@@ -83,5 +85,18 @@ class DieselEbooksStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price.strip()
s.detail_item = '/item/' + id.strip()
+ s.formats = formats
yield s
+
+ def get_details(self, search_result, timeout):
+ url = 'http://www.diesel-ebooks.com/item/'
+
+ br = browser()
+ with closing(br.open(url + search_result.detail_item, timeout=timeout)) as nf:
+ idata = html.fromstring(nf.read())
+ if idata.xpath('boolean(//table[@class="format-info"]//tr[contains(th, "DRM") and contains(td, "No")])'):
+ search_result.drm = SearchResult.DRM_UNLOCKED
+ else:
+ search_result.drm = SearchResult.DRM_LOCKED
+ return True
diff --git a/src/calibre/gui2/store/ebooks_com_plugin.py b/src/calibre/gui2/store/ebooks_com_plugin.py
index 259e996ebe..1597cc89ca 100644
--- a/src/calibre/gui2/store/ebooks_com_plugin.py
+++ b/src/calibre/gui2/store/ebooks_com_plugin.py
@@ -7,6 +7,7 @@ __copyright__ = '2011, John Schember '
__docformat__ = 'restructuredtext en'
import random
+import re
import urllib2
from contextlib import closing
@@ -63,15 +64,6 @@ class EbookscomStore(BasicStoreConfig, StorePlugin):
id = id.split('=')[-1]
if not id:
continue
-
- price = ''
- with closing(br.open('http://www.ebooks.com/ebooks/book_display.asp?IID=' + id.strip(), timeout=timeout)) as fp:
- pdoc = html.fromstring(fp.read())
- pdata = pdoc.xpath('//table[@class="price"]/tr/td/text()')
- if len(pdata) >= 2:
- price = pdata[1]
- if not price:
- continue
cover_url = ''.join(data.xpath('.//img[1]/@src'))
@@ -89,7 +81,40 @@ class EbookscomStore(BasicStoreConfig, StorePlugin):
s.cover_url = cover_url
s.title = title.strip()
s.author = author.strip()
- s.price = price.strip()
s.detail_item = '?url=http://www.ebooks.com/cj.asp?IID=' + id.strip() + '&cjsku=' + id.strip()
yield s
+
+ def get_details(self, search_result, timeout):
+ url = 'http://www.ebooks.com/ebooks/book_display.asp?IID='
+
+ mo = re.search(r'\?IID=(?P\d+)', search_result.detail_item)
+ if mo:
+ id = mo.group('id')
+ if not id:
+ return
+
+ price = _('Not Available')
+ br = browser()
+ with closing(br.open(url + id, timeout=timeout)) as nf:
+ pdoc = html.fromstring(nf.read())
+
+ pdata = pdoc.xpath('//table[@class="price"]/tr/td/text()')
+ if len(pdata) >= 2:
+ price = pdata[1]
+
+ search_result.drm = SearchResult.DRM_UNLOCKED
+ for sec in ('Printing', 'Copying', 'Lending'):
+ if pdoc.xpath('boolean(//div[@class="formatTableInner"]//table//tr[contains(th, "%s") and contains(td, "Off")])' % sec):
+ search_result.drm = SearchResult.DRM_LOCKED
+ break
+
+ fdata = ', '.join(pdoc.xpath('//table[@class="price"]//tr//td[1]/text()'))
+ fdata = fdata.replace(':', '')
+ fdata = re.sub(r'\s{2,}', ' ', fdata)
+ fdata = fdata.replace(' ,', ',')
+ fdata = fdata.strip()
+ search_result.formats = fdata
+
+ search_result.price = price.strip()
+ return True
diff --git a/src/calibre/gui2/store/eharlequin_plugin.py b/src/calibre/gui2/store/eharlequin_plugin.py
index 1886671b0a..4f54508c80 100644
--- a/src/calibre/gui2/store/eharlequin_plugin.py
+++ b/src/calibre/gui2/store/eharlequin_plugin.py
@@ -7,6 +7,7 @@ __copyright__ = '2011, John Schember '
__docformat__ = 'restructuredtext en'
import random
+import re
import urllib2
from contextlib import closing
@@ -69,12 +70,35 @@ class EHarlequinStore(BasicStoreConfig, StorePlugin):
cover_url = ''.join(data.xpath('.//a[@href="%s"]/img/@src' % id))
counter -= 1
-
+
s = SearchResult()
s.cover_url = cover_url
s.title = title.strip()
s.author = author.strip()
s.price = price.strip()
s.detail_item = '?url=http://ebooks.eharlequin.com/' + id.strip()
+ s.formats = 'EPUB'
yield s
+
+ def get_details(self, search_result, timeout):
+ url = 'http://ebooks.eharlequin.com/en/ContentDetails.htm?ID='
+
+ mo = re.search(r'\?ID=(?P.+)', search_result.detail_item)
+ if mo:
+ id = mo.group('id')
+ if not id:
+ return
+
+
+ br = browser()
+ with closing(br.open(url + id, timeout=timeout)) as nf:
+ idata = html.fromstring(nf.read())
+ drm = SearchResult.DRM_UNKNOWN
+ if idata.xpath('boolean(//div[@class="drm_head"])'):
+ if idata.xpath('boolean(//td[contains(., "Copy") and contains(., "not")])'):
+ drm = SearchResult.DRM_LOCKED
+ else:
+ drm = SearchResult.DRM_UNLOCKED
+ search_result.drm = drm
+ return True
diff --git a/src/calibre/gui2/store/feedbooks_plugin.py b/src/calibre/gui2/store/feedbooks_plugin.py
index 12873f8bc9..e56964b339 100644
--- a/src/calibre/gui2/store/feedbooks_plugin.py
+++ b/src/calibre/gui2/store/feedbooks_plugin.py
@@ -72,8 +72,10 @@ class FeedbooksStore(BasicStoreConfig, StorePlugin):
title = ''.join(data.xpath('//h5//a/text()'))
author = ''.join(data.xpath('//h6//a/text()'))
price = ''.join(data.xpath('//a[@class="buy"]/text()'))
+ formats = 'EPUB'
if not price:
price = '$0.00'
+ formats = 'EPUB, MOBI, PDF'
cover_url = ''
cover_url_img = data.xpath('//img')
if cover_url_img:
@@ -88,5 +90,18 @@ class FeedbooksStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price.replace(' ', '').strip()
s.detail_item = id.strip()
+ s.formats = formats
yield s
+
+ def get_details(self, search_result, timeout):
+ url = 'http://m.feedbooks.com/'
+
+ br = browser()
+ with closing(br.open(url_slash_cleaner(url + search_result.detail_item), timeout=timeout)) as nf:
+ idata = html.fromstring(nf.read())
+ if idata.xpath('boolean(//div[contains(@class, "m-description-long")]//p[contains(., "DRM") or contains(b, "Protection")])'):
+ search_result.drm = SearchResult.DRM_LOCKED
+ else:
+ search_result.drm = SearchResult.DRM_UNLOCKED
+ return True
diff --git a/src/calibre/gui2/store/gutenberg_plugin.py b/src/calibre/gui2/store/gutenberg_plugin.py
index 8d04b6236d..04fe4da0fb 100644
--- a/src/calibre/gui2/store/gutenberg_plugin.py
+++ b/src/calibre/gui2/store/gutenberg_plugin.py
@@ -79,5 +79,15 @@ class GutenbergStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price.strip()
s.detail_item = '/ebooks/' + id.strip()
+ s.drm = SearchResult.DRM_UNLOCKED
yield s
+
+ def get_details(self, search_result, timeout):
+ url = 'http://m.gutenberg.org/'
+
+ br = browser()
+ with closing(br.open(url + search_result.detail_item, timeout=timeout)) as nf:
+ idata = html.fromstring(nf.read())
+ search_result.formats = ', '.join(idata.xpath('//a[@type!="application/atom+xml"]//span[@class="title"]/text()'))
+ return True
\ No newline at end of file
diff --git a/src/calibre/gui2/store/kobo_plugin.py b/src/calibre/gui2/store/kobo_plugin.py
index d37e806c3f..421348d210 100644
--- a/src/calibre/gui2/store/kobo_plugin.py
+++ b/src/calibre/gui2/store/kobo_plugin.py
@@ -63,7 +63,7 @@ class KoboStore(BasicStoreConfig, StorePlugin):
if not id:
continue
- price = ''.join(data.xpath('.//span[@class="SCOurPrice"]/strong/text()'))
+ price = ''.join(data.xpath('.//li[@class="OurPrice"]/strong/text()'))
if not price:
price = '$0.00'
@@ -71,6 +71,7 @@ class KoboStore(BasicStoreConfig, StorePlugin):
title = ''.join(data.xpath('.//div[@class="SCItemHeader"]/h1/a[1]/text()'))
author = ''.join(data.xpath('.//div[@class="SCItemSummary"]/span/a[1]/text()'))
+ drm = data.xpath('boolean(.//span[@class="SCAvailibilityFormatsText" and contains(text(), "DRM")])')
counter -= 1
@@ -80,5 +81,7 @@ class KoboStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price.strip()
s.detail_item = '?url=http://www.kobobooks.com/' + id.strip()
+ s.drm = SearchResult.DRM_LOCKED if drm else SearchResult.DRM_UNLOCKED
+ s.formats = 'EPUB'
yield s
diff --git a/src/calibre/gui2/store/manybooks_plugin.py b/src/calibre/gui2/store/manybooks_plugin.py
index 72fe54c427..57eb42c13e 100644
--- a/src/calibre/gui2/store/manybooks_plugin.py
+++ b/src/calibre/gui2/store/manybooks_plugin.py
@@ -89,5 +89,7 @@ class ManyBooksStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price.strip()
s.detail_item = '/titles/' + id
+ s.drm = SearchResult.DRM_UNLOCKED
+ s.formts = 'EPUB, PDB (eReader, PalmDoc, zTXT, Plucker, iSilo), FB2, ZIP, AZW, MOBI, PRC, LIT, PKG, PDF, TXT, RB, RTF, LRF, TCR, JAR'
yield s
diff --git a/src/calibre/gui2/store/mobileread_plugin.py b/src/calibre/gui2/store/mobileread_plugin.py
index b65748ac57..2a255de8f3 100644
--- a/src/calibre/gui2/store/mobileread_plugin.py
+++ b/src/calibre/gui2/store/mobileread_plugin.py
@@ -76,6 +76,7 @@ class MobileReadStore(BasicStoreConfig, StorePlugin):
matches = heapq.nlargest(max_results, matches)
for score, book in matches:
book.price = '$0.00'
+ book.drm = SearchResult.DRM_UNLOCKED
yield book
def update_book_list(self, timeout=10):
@@ -103,8 +104,8 @@ class MobileReadStore(BasicStoreConfig, StorePlugin):
for book_data in data.xpath('//ul/li'):
book = BookRef()
book.detail_item = ''.join(book_data.xpath('.//a/@href'))
- book.format = ''.join(book_data.xpath('.//i/text()'))
- book.format = book.format.strip()
+ book.formats = ''.join(book_data.xpath('.//i/text()'))
+ book.formats = book.formats.strip()
text = ''.join(book_data.xpath('.//a/text()'))
if ':' in text:
@@ -130,8 +131,6 @@ class BookRef(SearchResult):
def __init__(self):
SearchResult.__init__(self)
- self.format = ''
-
class MobeReadStoreDialog(QDialog, Ui_Dialog):
@@ -223,7 +222,7 @@ class BooksModel(QAbstractItemModel):
self.books = []
if self.filter:
for b in self.all_books:
- test = '%s %s %s' % (b.title, b.author, b.format)
+ test = '%s %s %s' % (b.title, b.author, b.formats)
test = test.lower()
include = True
for item in self.filter.split(' '):
@@ -276,7 +275,7 @@ class BooksModel(QAbstractItemModel):
elif col == 1:
return QVariant(result.author)
elif col == 2:
- return QVariant(result.format)
+ return QVariant(result.formats)
return NONE
def data_as_text(self, result, col):
@@ -286,7 +285,7 @@ class BooksModel(QAbstractItemModel):
elif col == 1:
text = result.author
elif col == 2:
- text = result.format
+ text = result.formats
return text
def sort(self, col, order, reset=True):
diff --git a/src/calibre/gui2/store/open_library_plugin.py b/src/calibre/gui2/store/open_library_plugin.py
index 15b674f262..0e2fa4b14f 100644
--- a/src/calibre/gui2/store/open_library_plugin.py
+++ b/src/calibre/gui2/store/open_library_plugin.py
@@ -68,5 +68,15 @@ class OpenLibraryStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price
s.detail_item = id.strip()
+ s.drm = SearchResult.DRM_UNKNOWN
yield s
+
+ def get_details(self, search_result, timeout):
+ url = 'http://openlibrary.org/'
+
+ br = browser()
+ with closing(br.open(url_slash_cleaner(url + search_result.detail_item), timeout=timeout)) as nf:
+ idata = html.fromstring(nf.read())
+ search_result.formats = ', '.join(list(set(idata.xpath('//a[contains(@title, "Download")]/text()'))))
+ return True
diff --git a/src/calibre/gui2/store/search.py b/src/calibre/gui2/store/search.py
index ce74d52547..d5fbe19e93 100644
--- a/src/calibre/gui2/store/search.py
+++ b/src/calibre/gui2/store/search.py
@@ -21,6 +21,7 @@ from calibre import browser
from calibre.gui2 import NONE
from calibre.gui2.progress_indicator import ProgressIndicator
from calibre.gui2.store.search_ui import Ui_Dialog
+from calibre.gui2.store.search_result import SearchResult
from calibre.library.caches import _match, CONTAINS_MATCH, EQUALS_MATCH, \
REGEXP_MATCH
from calibre.utils.config import DynamicConfig
@@ -33,6 +34,14 @@ TIMEOUT = 75 # seconds
SEARCH_THREAD_TOTAL = 4
COVER_DOWNLOAD_THREAD_TOTAL = 2
+def comparable_price(text):
+ if len(text) < 3 or text[-3] not in ('.', ','):
+ text += '00'
+ text = re.sub(r'\D', '', text)
+ text = text.rjust(6, '0')
+ return text
+
+
class SearchDialog(QDialog, Ui_Dialog):
def __init__(self, istores, *args):
@@ -87,9 +96,13 @@ class SearchDialog(QDialog, Ui_Dialog):
# Author
self.results_view.setColumnWidth(2,int(total*.35))
# Price
- self.results_view.setColumnWidth(3, int(total*.10))
+ self.results_view.setColumnWidth(3, int(total*.5))
+ # DRM
+ self.results_view.setColumnWidth(4, int(total*.5))
# Store
- self.results_view.setColumnWidth(4, int(total*.20))
+ self.results_view.setColumnWidth(5, int(total*.15))
+ # Formats
+ self.results_view.setColumnWidth(6, int(total*.5))
def do_search(self, checked=False):
# Stop all running threads.
@@ -102,6 +115,9 @@ class SearchDialog(QDialog, Ui_Dialog):
query = unicode(self.search_edit.text())
if not query.strip():
return
+ # Give the query to the results model so it can do
+ # futher filtering.
+ self.results_view.model().set_query(query)
# Plugins are in alphebetic order. Randomize the
# order of plugin names. This way plugins closer
@@ -110,6 +126,8 @@ class SearchDialog(QDialog, Ui_Dialog):
store_names = self.store_plugins.keys()
if not store_names:
return
+ # Remove all of our internal filtering logic from the query.
+ query = self.clean_query(query)
shuffle(store_names)
# Add plugins that the user has checked to the search pool's work queue.
for n in store_names:
@@ -121,6 +139,29 @@ class SearchDialog(QDialog, Ui_Dialog):
self.search_pool.start_threads()
self.pi.startAnimation()
+ def clean_query(self, query):
+ query = query.lower()
+ # Remove control modifiers.
+ query = query.replace('\\', '')
+ query = query.replace('!', '')
+ query = query.replace('=', '')
+ query = query.replace('~', '')
+ query = query.replace('>', '')
+ query = query.replace('<', '')
+ # Remove the prefix.
+ for loc in ( 'all', 'author', 'authors', 'title'):
+ query = re.sub(r'%s:"?(?P[^\s"]+)"?' % loc, '\g', query)
+ # Remove the prefix and search text.
+ for loc in ('cover', 'drm', 'format', 'formats', 'price', 'store'):
+ query = re.sub(r'%s:"[^"]"' % loc, '', query)
+ query = re.sub(r'%s:[^\s]*' % loc, '', query)
+ # Remove logic.
+ query = re.sub(r'(^|\s)(and|not|or)(\s|$)', ' ', query)
+ # Remove excess whitespace.
+ query = re.sub(r'\s{2,}', ' ', query)
+ query = query.strip()
+ return query
+
def save_state(self):
self.config['store_search_geometry'] = self.saveGeometry()
self.config['store_search_store_splitter_state'] = self.store_splitter.saveState()
@@ -170,9 +211,9 @@ class SearchDialog(QDialog, Ui_Dialog):
self.pi.stopAnimation()
while self.search_pool.has_results():
- res = self.search_pool.get_result()
+ res, store_plugin = self.search_pool.get_result()
if res:
- self.results_view.model().add_result(res)
+ self.results_view.model().add_result(res, store_plugin)
def open_store(self, index):
result = self.results_view.model().get_result(index)
@@ -294,18 +335,14 @@ class SearchThread(Thread):
while self._run and not self.tasks.empty():
try:
query, store_name, store_plugin, timeout = self.tasks.get()
- squery = query
- for loc in SearchFilter.USABLE_LOCATIONS:
- squery = re.sub(r'%s:"?(?P[^\s"]+)"?' % loc, '\g', squery)
- for res in store_plugin.search(squery, timeout=timeout):
+ for res in store_plugin.search(query, timeout=timeout):
if not self._run:
return
res.store_name = store_name
- if SearchFilter(res).parse(query):
- self.results.put(res)
+ self.results.put((res, store_plugin))
self.tasks.task_done()
except:
- pass
+ traceback.print_exc()
class CoverThreadPool(GenericDownloadThreadPool):
@@ -349,29 +386,93 @@ class CoverThread(Thread):
continue
+class DetailsThreadPool(GenericDownloadThreadPool):
+ '''
+ Once started all threads run until abort is called.
+ '''
+
+ def add_task(self, search_result, store_plugin, update_callback, timeout=10):
+ self.tasks.put((search_result, store_plugin, update_callback, timeout))
+
+
+class DetailsThread(Thread):
+
+ def __init__(self, tasks, results):
+ Thread.__init__(self)
+ self.daemon = True
+ self.tasks = tasks
+ self.results = results
+ self._run = True
+
+ def abort(self):
+ self._run = False
+
+ def run(self):
+ while self._run:
+ try:
+ time.sleep(.1)
+ while not self.tasks.empty():
+ if not self._run:
+ break
+ result, store_plugin, callback, timeout = self.tasks.get()
+ if result:
+ store_plugin.get_details(result, timeout)
+ callback(result)
+ self.tasks.task_done()
+ except:
+ continue
+
class Matches(QAbstractItemModel):
- HEADERS = [_('Cover'), _('Title'), _('Author(s)'), _('Price'), _('Store')]
+ HEADERS = [_('Cover'), _('Title'), _('Author(s)'), _('Price'), _('DRM'), _('Store'), _('Formats')]
def __init__(self):
QAbstractItemModel.__init__(self)
+
+ self.DRM_LOCKED_ICON = QPixmap(I('drm-locked.png')).scaledToHeight(64)
+ self.DRM_UNLOCKED_ICON = QPixmap(I('drm-unlocked.png')).scaledToHeight(64)
+ self.DRM_UNKNOWN_ICON = QPixmap(I('dialog_warning.png')).scaledToHeight(64)
+
+ # All matches. Used to determine the order to display
+ # self.matches because the SearchFilter returns
+ # matches unordered.
+ self.all_matches = []
+ # Only the showing matches.
self.matches = []
+ self.query = ''
+ self.search_filter = SearchFilter()
self.cover_pool = CoverThreadPool(CoverThread, 2)
self.cover_pool.start_threads()
+ self.details_pool = DetailsThreadPool(DetailsThread, 4)
+ self.details_pool.start_threads()
def closing(self):
self.cover_pool.abort()
+ self.details_pool.abort()
def clear_results(self):
+ self.all_matches = []
self.matches = []
+ self.all_matches = []
+ self.search_filter.clear_search_results()
+ self.query = ''
self.cover_pool.abort()
self.cover_pool.start_threads()
+ self.details_pool.abort()
+ self.details_pool.start_threads()
self.reset()
- def add_result(self, result):
+ def add_result(self, result, store_plugin):
self.layoutAboutToBeChanged.emit()
- self.matches.append(result)
- self.cover_pool.add_task(result, self.update_result)
+ self.all_matches.append(result)
+ self.search_filter.add_search_result(result)
+ if result.cover_url:
+ result.cover_queued = True
+ self.cover_pool.add_task(result, self.filter_results)
+ else:
+ result.cover_queued = False
+ self.details_pool.add_task(result, store_plugin, self.got_result_details)
+ self.filter_results()
self.layoutChanged.emit()
def get_result(self, index):
@@ -380,11 +481,30 @@ class Matches(QAbstractItemModel):
return self.matches[row]
else:
return None
-
- def update_result(self):
+
+ def filter_results(self):
self.layoutAboutToBeChanged.emit()
+ if self.query:
+ self.matches = list(self.search_filter.parse(self.query))
+ else:
+ self.matches = list(self.search_filter.universal_set())
+ self.reorder_matches()
self.layoutChanged.emit()
+ def got_result_details(self, result):
+ if not result.cover_queued and result.cover_url:
+ result.cover_queued = True
+ self.cover_pool.add_task(result, self.filter_results)
+ if result in self.matches:
+ row = self.matches.index(result)
+ self.dataChanged.emit(self.index(row, 0), self.index(row, self.columnCount() - 1))
+ if result.drm not in (SearchResult.DRM_LOCKED, SearchResult.DRM_UNLOCKED, SearchResult.DRM_UNKNOWN):
+ result.drm = SearchResult.DRM_UNKNOWN
+ self.filter_results()
+
+ def set_query(self, query):
+ self.query = query
+
def index(self, row, column, parent=QModelIndex()):
return self.createIndex(row, column)
@@ -420,14 +540,41 @@ class Matches(QAbstractItemModel):
return QVariant(result.author)
elif col == 3:
return QVariant(result.price)
- elif col == 4:
+ elif col == 5:
return QVariant(result.store_name)
+ elif col == 6:
+ return QVariant(result.formats)
return NONE
elif role == Qt.DecorationRole:
if col == 0 and result.cover_data:
p = QPixmap()
p.loadFromData(result.cover_data)
return QVariant(p)
+ if col == 4:
+ if result.drm == SearchResult.DRM_LOCKED:
+ return QVariant(self.DRM_LOCKED_ICON)
+ elif result.drm == SearchResult.DRM_UNLOCKED:
+ return QVariant(self.DRM_UNLOCKED_ICON)
+ elif result.drm == SearchResult.DRM_UNKNOWN:
+ return QVariant(self.DRM_UNKNOWN_ICON)
+ elif role == Qt.ToolTipRole:
+ if col == 1:
+ return QVariant('%s
' % result.title)
+ elif col == 2:
+ return QVariant('%s
' % result.author)
+ elif col == 3:
+ return QVariant('' + _('Detected price as: %s. Check with the store before making a purchase to verify this price is correct. This price often does not include promotions the store may be running.') % result.price + '
')
+ elif col == 4:
+ if result.drm == SearchResult.DRM_LOCKED:
+ return QVariant('' + _('This book as been detected as having DRM restrictions. This book may not work with your reader and you will have limitations placed upon you as to what you can do with this book. Check with the store before making any purchases to ensure you can actually read this book.') + '
')
+ elif result.drm == SearchResult.DRM_UNLOCKED:
+ return QVariant('' + _('This book has been detected as being DRM Free. You should be able to use this book on any device provided it is in a format calibre supports for conversion. However, before making a purchase double check the DRM status with the store. The store may not be disclosing the use of DRM.') + '
')
+ else:
+ return QVariant('' + _('The DRM status of this book could not be determined. There is a very high likelihood that this book is actually DRM restricted.') + '
')
+ elif col == 5:
+ return QVariant('%s
' % result.store_name)
+ elif col == 6:
+ return QVariant('%s
' % result.formats)
elif role == Qt.SizeHintRole:
return QSize(64, 64)
return NONE
@@ -439,24 +586,33 @@ class Matches(QAbstractItemModel):
elif col == 2:
text = result.author
elif col == 3:
- text = result.price
- if len(text) < 3 or text[-3] not in ('.', ','):
- text += '00'
- text = re.sub(r'\D', '', text)
- text = text.rjust(6, '0')
+ text = comparable_price(result.price)
elif col == 4:
+ if result.drm == SearchResult.DRM_UNLOCKED:
+ text = 'a'
+ elif result.drm == SearchResult.DRM_LOCKED:
+ text = 'b'
+ else:
+ text = 'c'
+ elif col == 5:
text = result.store_name
+ elif col == 6:
+ text = ', '.join(sorted(result.formats.split(',')))
return text
def sort(self, col, order, reset=True):
if not self.matches:
return
descending = order == Qt.DescendingOrder
- self.matches.sort(None,
+ self.all_matches.sort(None,
lambda x: sort_key(unicode(self.data_as_text(x, col))),
descending)
+ self.reorder_matches()
if reset:
self.reset()
+
+ def reorder_matches(self):
+ self.matches = sorted(self.matches, key=lambda x: self.all_matches.index(x))
class SearchFilter(SearchQueryParser):
@@ -466,22 +622,33 @@ class SearchFilter(SearchQueryParser):
'author',
'authors',
'cover',
+ 'drm',
+ 'format',
+ 'formats',
'price',
'title',
'store',
]
- def __init__(self, search_result):
+ def __init__(self):
SearchQueryParser.__init__(self, locations=self.USABLE_LOCATIONS)
- self.search_result = search_result
+ self.srs = set([])
+
+ def add_search_result(self, search_result):
+ self.srs.add(search_result)
+
+ def clear_search_results(self):
+ self.srs = set([])
def universal_set(self):
- return set([self.search_result])
+ return self.srs
def get_matches(self, location, query):
location = location.lower().strip()
if location == 'authors':
location = 'author'
+ elif location == 'formats':
+ location = 'format'
matchkind = CONTAINS_MATCH
if len(query) > 1:
@@ -502,38 +669,54 @@ class SearchFilter(SearchQueryParser):
all_locs = set(self.USABLE_LOCATIONS) - set(['all'])
locations = all_locs if location == 'all' else [location]
q = {
- 'author': self.search_result.author.lower(),
- 'cover': self.search_result.cover_url,
- 'format': '',
- 'price': self.search_result.price,
- 'store': self.search_result.store_name.lower(),
- 'title': self.search_result.title.lower(),
+ 'author': lambda x: x.author.lower(),
+ 'cover': lambda x: x.cover_url,
+ 'drm': lambda x: x.drm,
+ 'format': lambda x: x.formats,
+ 'price': lambda x: comparable_price(x.price),
+ 'store': lambda x: x.store_name.lower(),
+ 'title': lambda x: x.title.lower(),
}
for x in ('author', 'format'):
q[x+'s'] = q[x]
- for locvalue in locations:
- ac_val = q[locvalue]
- if query == 'true':
- if ac_val is not None:
- matches.add(self.search_result)
- continue
- if query == 'false':
- if ac_val is None:
- matches.add(self.search_result)
- continue
- try:
- ### Can't separate authors because comma is used for name sep and author sep
- ### Exact match might not get what you want. For that reason, turn author
- ### exactmatch searches into contains searches.
- if locvalue == 'author' and matchkind == EQUALS_MATCH:
- m = CONTAINS_MATCH
- else:
- m = matchkind
-
- vals = [ac_val]
- if _match(query, vals, m):
- matches.add(self.search_result)
- break
- except ValueError: # Unicode errors
- traceback.print_exc()
+ for sr in self.srs:
+ for locvalue in locations:
+ accessor = q[locvalue]
+ if query == 'true':
+ if locvalue == 'drm':
+ if accessor(sr) == SearchResult.DRM_LOCKED:
+ matches.add(sr)
+ else:
+ if accessor(sr) is not None:
+ matches.add(sr)
+ continue
+ if query == 'false':
+ if locvalue == 'drm':
+ if accessor(sr) == SearchResult.DRM_UNKNOWN:
+ matches.add(sr)
+ else:
+ if accessor(sr) is None:
+ matches.add(sr)
+ continue
+ # this is bool, so can't match below
+ if locvalue == 'drm':
+ continue
+ try:
+ ### Can't separate authors because comma is used for name sep and author sep
+ ### Exact match might not get what you want. For that reason, turn author
+ ### exactmatch searches into contains searches.
+ if locvalue == 'author' and matchkind == EQUALS_MATCH:
+ m = CONTAINS_MATCH
+ else:
+ m = matchkind
+
+ if locvalue == 'format':
+ vals = accessor(sr).split(',')
+ else:
+ vals = [accessor(sr)]
+ if _match(query, vals, m):
+ matches.add(sr)
+ break
+ except ValueError: # Unicode errors
+ traceback.print_exc()
return matches
diff --git a/src/calibre/gui2/store/search.ui b/src/calibre/gui2/store/search.ui
index 16fc0c4deb..dd7db939a4 100644
--- a/src/calibre/gui2/store/search.ui
+++ b/src/calibre/gui2/store/search.ui
@@ -11,7 +11,11 @@
- calibre Store Search
+ Get Books
+
+
+
+ :/images/store.png:/images/store.png
true
@@ -58,8 +62,8 @@
0
0
- 215
- 116
+ 170
+ 138
@@ -174,7 +178,9 @@
-
+
+
+
close
diff --git a/src/calibre/gui2/store/search_result.py b/src/calibre/gui2/store/search_result.py
index 6e0ed0b572..b817b68a77 100644
--- a/src/calibre/gui2/store/search_result.py
+++ b/src/calibre/gui2/store/search_result.py
@@ -8,6 +8,10 @@ __docformat__ = 'restructuredtext en'
class SearchResult(object):
+ DRM_LOCKED = 1
+ DRM_UNLOCKED = 2
+ DRM_UNKNOWN = 3
+
def __init__(self):
self.store_name = ''
self.cover_url = ''
@@ -16,3 +20,5 @@ class SearchResult(object):
self.author = ''
self.price = ''
self.detail_item = ''
+ self.drm = None
+ self.formats = ''
diff --git a/src/calibre/gui2/store/smashwords_plugin.py b/src/calibre/gui2/store/smashwords_plugin.py
index 1806e9f4e1..629a85dca5 100644
--- a/src/calibre/gui2/store/smashwords_plugin.py
+++ b/src/calibre/gui2/store/smashwords_plugin.py
@@ -90,5 +90,15 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin):
s.author = author.strip()
s.price = price.strip()
s.detail_item = '/books/view/' + id.strip()
+ s.drm = SearchResult.DRM_UNLOCKED
yield s
+
+ def get_details(self, search_result, timeout):
+ url = 'http://www.smashwords.com/'
+
+ br = browser()
+ with closing(br.open(url + search_result.detail_item, timeout=timeout)) as nf:
+ idata = html.fromstring(nf.read())
+ search_result.formats = ', '.join(list(set(idata.xpath('//td//b//text()'))))
+ return True