Add Foyles. Fix waterstones to use deep linking.

src/calibre/customize/builtins.py

@@ -1184,12 +1184,16 @@ class StoreWaterstonesUKStore(StoreBase):
     description = _('Feel every word')
     actual_plugin = 'calibre.gui2.store.waterstones_uk_plugin:WaterstonesUKStore'
 
-plugins += [StoreAmazonKindleStore, StoreAmazonUKKindleStore,
-    StoreBaenWebScriptionStore, StoreBNStore,
+class StoreFoylesUKStore(StoreBase):
+    name = 'Foyles UK'
+    description = _('Foyles of London, online')
+    actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore'
+
+plugins += [StoreAmazonKindleStore, StoreBaenWebScriptionStore, StoreBNStore,
     StoreBeWriteStore, StoreDieselEbooksStore, StoreEbookscomStore,
     StoreEHarlequinStoretore,
     StoreFeedbooksStore, StoreGutenbergStore, StoreKoboStore, StoreManyBooksStore,
     StoreMobileReadStore, StoreOpenLibraryStore, StoreSmashwordsStore,
-    StoreWaterstonesUKStore]
+    StoreAmazonUKKindleStore, StoreFoylesUKStore, StoreWaterstonesUKStore]
 
 # }}}

src/calibre/gui2/store/foyles_uk_plugin.py

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+import urllib2
+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 FoylesUKStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+        url = 'http://www.awin1.com/cread.php?awinmid=1414&awinaffid=120917&clickref=&p='
+        url_redirect = 'http://www.foyles.co.uk'
+
+        if external or self.config.get('open_external', False):
+            if detail_item:
+                url = url + url_redirect + detail_item
+            open_url(QUrl(url_slash_cleaner(url)))
+        else:
+            detail_url = None
+            if detail_item:
+                detail_url = url + url_redirect + detail_item
+            d = WebStoreDialog(self.gui, url, parent, detail_url)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+        url = 'http://www.foyles.co.uk/Public/Shop/Search.aspx?fFacetId=1015&searchBy=1&quick=true&term=' + urllib2.quote(query)
+
+        br = browser()
+
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            doc = html.fromstring(f.read())
+            for data in doc.xpath('//table[contains(@id, "MainContent")]/tr/td/div[contains(@class, "Item")]'):
+                if counter <= 0:
+                    break
+                id = ''.join(data.xpath('.//a[@class="Title"]/@href')).strip()
+                if not id:
+                    continue
+
+                cover_url = ''.join(data.xpath('.//div[@class="image"]/a/img/@src'))
+
+                title = ''.join(data.xpath('.//a[@class="Title"]/text()'))
+                author = ', '.join(data.xpath('.//span[@class="Author"]/text()'))
+                price = ''.join(data.xpath('./ul/li[@class="Strong"]/text()'))
+                price = price[price.rfind(' '):]
+
+                counter -= 1
+
+                s = SearchResult()
+                s.cover_url = cover_url
+                s.title = title.strip()
+                s.author = author.strip()
+                s.price = price
+                s.detail_item = id
+                s.drm = SearchResult.DRM_LOCKED
+                s.formats = 'EPUB'
+
+                yield s

src/calibre/gui2/store/waterstones_uk_plugin.py

@@ -24,15 +24,17 @@ class WaterstonesUKStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
         url = 'http://clkuk.tradedoubler.com/click?p=51196&a=1951604&g=19333484'
+        url_details = 'http://clkuk.tradedoubler.com/click?p(51196)a(1951604)g(16460516)url({0})'
 
         if external or self.config.get('open_external', False):
             if detail_item:
-                url = detail_item
+                url = url_details.format(detail_item)
             open_url(QUrl(url))
         else:
             detail_url = None
             if detail_item:
-                detail_url = detail_item
+                detail_url = url_details.format(detail_item)
+                print(detail_url)
             d = WebStoreDialog(self.gui, url, parent, detail_url)
             d.setWindowTitle(self.name)
             d.set_tags(self.config.get('tags', ''))