From 9e114a9e1f763c8160c652eb45c1f80e85a527b5 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 9 Oct 2011 17:39:25 +0200
Subject: [PATCH 1/2] Clean up/fix code to strip leading "by " in German and
 French.

---
 .../gui2/store/stores/amazon_de_plugin.py       | 17 ++---------------
 .../gui2/store/stores/amazon_fr_plugin.py       |  5 +++--
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py
index 4948a48714..ea92839268 100644
--- a/src/calibre/gui2/store/stores/amazon_de_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py
@@ -43,20 +43,9 @@ class AmazonDEKindleStore(StorePlugin):
         with closing(br.open(url, timeout=timeout)) as f:
             doc = html.fromstring(f.read().decode('latin-1', 'replace'))
 
-            # Amazon has two results pages.
-            # 20110725: seems that is_shot is gone.
-#            is_shot = doc.xpath('boolean(//div[@id="shotgunMainResults"])')
-#            # Horizontal grid of books.
-#            if is_shot:
-#                data_xpath = '//div[contains(@class, "result")]'
-#                format_xpath = './/div[@class="productTitle"]/text()'
-#                cover_xpath = './/div[@class="productTitle"]//img/@src'
-#            # Vertical list of books.
-#            else:
             data_xpath = '//div[contains(@class, "result") and contains(@class, "product")]'
             format_xpath = './/span[@class="format"]/text()'
             cover_xpath = './/img[@class="productImage"]/@src'
-# end is_shot else
 
             for data in doc.xpath(data_xpath):
                 if counter <= 0:
@@ -79,11 +68,9 @@ class AmazonDEKindleStore(StorePlugin):
                 title = ''.join(data.xpath('.//div[@class="title"]/a/text()'))
                 price = ''.join(data.xpath('.//div[@class="newPrice"]/span/text()'))
 
-#                if is_shot:
-#                    author = format.split(' von ')[-1]
-#                else:
                 author = ''.join(data.xpath('.//div[@class="title"]/span[@class="ptBrand"]/text()'))
-                author = author.split('von ')[-1]
+                if author.startswith('von '):
+                    author = author[4:]
 
                 counter -= 1
 
diff --git a/src/calibre/gui2/store/stores/amazon_fr_plugin.py b/src/calibre/gui2/store/stores/amazon_fr_plugin.py
index 186ca8d4b4..ca36f1055b 100644
--- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py
@@ -65,7 +65,8 @@ class AmazonFRKindleStore(StorePlugin):
                 title = ''.join(data.xpath('.//div[@class="title"]/a/text()'))
                 price = ''.join(data.xpath('.//div[@class="newPrice"]/span/text()'))
                 author = unicode(''.join(data.xpath('.//div[@class="title"]/span[@class="ptBrand"]/text()')))
-                author = author.split('et ')[-1]
+                if author.startswith('de '):
+                    author = author[3:]
 
                 counter -= 1
 
@@ -77,5 +78,5 @@ class AmazonFRKindleStore(StorePlugin):
                 s.detail_item = asin.strip()
                 s.formats = 'Kindle'
                 s.drm = SearchResult.DRM_UNKNOWN
-                
+
                 yield s

From 18ed5671c699b90dbee72dd7dd2a4e426ee84148 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 9 Oct 2011 17:48:40 +0200
Subject: [PATCH 2/2] Fix 'by' splitting in the UK plugin.

---
 .../gui2/store/stores/amazon_uk_plugin.py       | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/calibre/gui2/store/stores/amazon_uk_plugin.py b/src/calibre/gui2/store/stores/amazon_uk_plugin.py
index 3b2a4d05cc..ef15951d50 100644
--- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py
@@ -40,20 +40,9 @@ class AmazonUKKindleStore(StorePlugin):
         with closing(br.open(url, timeout=timeout)) as f:
             doc = html.fromstring(f.read().decode('latin-1', 'replace'))
 
-            # Amazon has two results pages.
-            # 20110725: seems that is_shot is gone.
-#            is_shot = doc.xpath('boolean(//div[@id="shotgunMainResults"])')
-#            # Horizontal grid of books.
-#            if is_shot:
-#                data_xpath = '//div[contains(@class, "result")]'
-#                format_xpath = './/div[@class="productTitle"]/text()'
-#                cover_xpath = './/div[@class="productTitle"]//img/@src'
-#            # Vertical list of books.
-#            else:
             data_xpath = '//div[contains(@class, "result") and contains(@class, "product")]'
             format_xpath = './/span[@class="format"]/text()'
             cover_xpath = './/img[@class="productImage"]/@src'
-# end is_shot else
 
             for data in doc.xpath(data_xpath):
                 if counter <= 0:
@@ -76,11 +65,9 @@ class AmazonUKKindleStore(StorePlugin):
                 title = ''.join(data.xpath('.//div[@class="title"]/a/text()'))
                 price = ''.join(data.xpath('.//div[@class="newPrice"]/span/text()'))
 
-#                if is_shot:
-#                    author = format.split(' von ')[-1]
-#                else:
                 author = ''.join(data.xpath('.//div[@class="title"]/span[@class="ptBrand"]/text()'))
-                author = author.split('by ')[-1]
+                if author.startswith('by '):
+                    author = author[3:]
 
                 counter -= 1