From 715f6ea9beb724ad5f1680996bdd62cb81cd7057 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 18 May 2013 13:57:03 +0200 Subject: [PATCH] Fix several problems in the Foyles store plugin --- src/calibre/gui2/store/stores/foyles_uk_plugin.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/store/stores/foyles_uk_plugin.py b/src/calibre/gui2/store/stores/foyles_uk_plugin.py index 199b15bc2e..69cf0d93c7 100644 --- a/src/calibre/gui2/store/stores/foyles_uk_plugin.py +++ b/src/calibre/gui2/store/stores/foyles_uk_plugin.py @@ -54,14 +54,13 @@ class FoylesUKStore(BasicStoreConfig, StorePlugin): id_ = ''.join(data.xpath('.//p[@class="doc-cover"]/a/@href')).strip() if not id_: continue + id_ = 'http://ebooks.foyles.co.uk' + id_ cover_url = ''.join(data.xpath('.//p[@class="doc-cover"]/a/img/@src')) title = ''.join(data.xpath('.//span[@class="title"]/a/text()')) author = ', '.join(data.xpath('.//span[@class="author"]/span[@class="author"]/text()')) - price = ''.join(data.xpath('.//span[@itemprop="price"]/text()')) + price = ''.join(data.xpath('.//span[@itemprop="price"]/text()')).strip() format_ = ''.join(data.xpath('.//p[@class="doc-meta-format"]/span[last()]/text()')) - format_, ign, drm = format_.partition(' ') - drm = SearchResult.DRM_LOCKED if 'DRM' in drm else SearchResult.DRM_UNLOCKED counter -= 1 @@ -71,7 +70,7 @@ class FoylesUKStore(BasicStoreConfig, StorePlugin): s.author = author.strip() s.price = price s.detail_item = id_ - s.drm = drm + s.drm = SearchResult.DRM_LOCKED s.formats = format_ yield s