Get Books: Fix Smashwords, Google boks and B&N stores. Add Nook UK store

src/calibre/customize/builtins.py

@@ -1529,6 +1529,15 @@ class StoreNextoStore(StoreBase):
     formats = ['EPUB', 'MOBI', 'PDF']
     affiliate = True
 
+class StoreNookUKStore(StoreBase):
+    name = 'Nook UK'
+    author = 'John Schember'
+    description = u'Barnes & Noble S.à r.l, a subsidiary of Barnes & Noble, Inc., a leading retailer of content, digital media and educational products, is proud to bring the award-winning NOOK® reading experience and a leading digital bookstore to the UK.'
+    actual_plugin = 'calibre.gui2.store.stores.nook_uk_plugin:NookUKStore'
+
+    headquarters = 'UK'
+    formats = ['NOOK']
+
 class StoreOpenBooksStore(StoreBase):
     name = 'Open Books'
     description = u'Comprehensive listing of DRM free ebooks from a variety of sources provided by users of calibre.'
@@ -1660,7 +1669,7 @@ plugins += [
     StoreAmazonITKindleStore,
     StoreAmazonUKKindleStore,
     StoreBaenWebScriptionStore,
-    StoreBNStore, StoreSonyStore,
+    StoreBNStore,
     StoreBeWriteStore,
     StoreBiblioStore,
     StoreBookotekaStore,
@@ -1686,12 +1695,14 @@ plugins += [
     StoreMillsBoonUKStore,
     StoreMobileReadStore,
     StoreNextoStore,
+    StoreNookUKStore,
     StoreOpenBooksStore,
     StoreOzonRUStore,
     StorePragmaticBookshelfStore,
     StorePublioStore,
     StoreRW2010Store,
     StoreSmashwordsStore,
+    StoreSonyStore,
     StoreVirtualoStore,
     StoreWaterstonesUKStore,
     StoreWeightlessBooksStore,

src/calibre/gui2/store/stores/bn_plugin.py

@@ -6,6 +6,7 @@ __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
+import re
 import urllib
 from contextlib import closing
 
@@ -50,12 +51,17 @@ class BNStore(BasicStoreConfig, StorePlugin):
                 if not id:
                     continue
 
-                cover_url = ''.join(data.xpath('.//img[contains(@class, "product-image")]/@src'))
+                cover_url = ''
+                cover_id = ''.join(data.xpath('.//img[contains(@class, "product-image")]/@id'))
+                m = re.search(r"%s'.*?srcUrl: '(?P<iurl>.*?)'.*?}" % cover_id, raw)
+                if m:
+                    cover_url = m.group('iurl')
 
                 title = ''.join(data.xpath('descendant::p[@class="title"]//span[@class="name"]//text()')).strip()
-                if not title: continue
+                if not title:
+                    continue
 
-                author = ', '.join(data.xpath('.//ul[@class="contributors"]//a[@class="subtle"]//text()')).strip()
+                author = ', '.join(data.xpath('.//ul[contains(@class, "contributors")]//a[contains(@class, "subtle")]//text()')).strip()
                 price = ''.join(data.xpath('.//a[contains(@class, "bn-price")]//text()'))
 
                 counter -= 1

src/calibre/gui2/store/stores/google_books_plugin.py

@@ -59,7 +59,7 @@ class GoogleBooksStore(BasicStoreConfig, StorePlugin):
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
             doc = html.fromstring(f.read())
-            for data in doc.xpath('//ol[@id="rso"]/li'):
+            for data in doc.xpath('//ol/li'):
                 if counter <= 0:
                     break
 
@@ -68,7 +68,7 @@ class GoogleBooksStore(BasicStoreConfig, StorePlugin):
                     continue
 
                 title = ''.join(data.xpath('.//h3/a//text()'))
-                authors = data.xpath('.//div[@class="f"]//a//text()')
+                authors = data.xpath('.//span[contains(@class, "f")]//a//text()')
                 while authors and authors[-1].strip().lower() in ('preview', 'read', 'more editions'):
                     authors = authors[:-1]
                 if not authors:

src/calibre/gui2/store/stores/nook_uk_plugin.py

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2012, John Schember <john@nachtimwald.com>'
+__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 NookUKStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+        url = "http://uk.nook.com"
+
+        if external or self.config.get('open_external', False):
+            open_url(QUrl(url_slash_cleaner(detail_item if detail_item else url)))
+        else:
+            d = WebStoreDialog(self.gui, url, parent, detail_item)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+        url = u'http://uk.nook.com/s/%s?s%%5Bdref%%5D=1&s%%5Bkeyword%%5D=%s' % (query.replace(' ', '-'), urllib.quote(query))
+
+        br = browser()
+
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            raw = f.read()
+            doc = html.fromstring(raw)
+            for data in doc.xpath('//ul[contains(@class, "product_list")]/li'):
+                if counter <= 0:
+                    break
+
+                id = ''.join(data.xpath('.//span[contains(@class, "image")]/a/@href'))
+                if not id:
+                    continue
+
+                cover_url = ''.join(data.xpath('.//span[contains(@class, "image")]//img/@data-src'))
+
+                title = ''.join(data.xpath('.//div[contains(@class, "title")]//text()')).strip()
+                if not title:
+                    continue
+
+                author = ', '.join(data.xpath('.//div[contains(@class, "contributor")]//a/text()')).strip()
+                price = ''.join(data.xpath('.//div[contains(@class, "action")]//a//text()')).strip()
+                price = re.sub(r'[^\d.,£]', '', price);
+
+                counter -= 1
+
+                s = SearchResult()
+                s.cover_url = cover_url
+                s.title = title.strip()
+                s.author = author.strip()
+                s.price = price.strip()
+                s.detail_item = 'http://uk.nook.com/' + id.strip()
+                s.drm = SearchResult.DRM_UNKNOWN
+                s.formats = 'Nook'
+
+                yield s

src/calibre/gui2/store/stores/smashwords_plugin.py

@@ -76,7 +76,7 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin):
                 
                 title = ''.join(data.xpath('//a[@class="bookTitle"]/text()'))
                 subnote = ''.join(data.xpath('//span[@class="subnote"]/text()'))
-                author = ''.join(data.xpath('//span[@class="subnote"]/a/text()'))
+                author = ''.join(data.xpath('//span[@class="subnote"]//a[1]//text()'))
                 if '$' in subnote:
                     price = subnote.partition('$')[2]
                     price = price.split(u'\xa0')[0]