From 0c5a2cef7f5a4dbe0d4e56f6b8c119c53856d90a Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 26 Nov 2012 14:47:44 +0100 Subject: [PATCH] Remove the language equivalent of "by " from the EU amazon store author names. --- src/calibre/gui2/store/stores/amazon_de_plugin.py | 1 + src/calibre/gui2/store/stores/amazon_es_plugin.py | 4 +++- src/calibre/gui2/store/stores/amazon_fr_plugin.py | 1 + src/calibre/gui2/store/stores/amazon_it_plugin.py | 2 ++ src/calibre/gui2/store/stores/amazon_uk_plugin.py | 5 ++++- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py index 846903cd4a..3ccbef0b6e 100644 --- a/src/calibre/gui2/store/stores/amazon_de_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py @@ -22,3 +22,4 @@ class AmazonDEKindleStore(AmazonUKKindleStore): '&tag=%(tag)s&linkCode=ur2&camp=1638&creative=6742') search_url = 'http://www.amazon.de/s/?url=search-alias%3Ddigital-text&field-keywords=' + author_article = 'von ' diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py index afd6552272..131f77c7e9 100644 --- a/src/calibre/gui2/store/stores/amazon_es_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py @@ -19,4 +19,6 @@ class AmazonESKindleStore(AmazonUKKindleStore): store_link_details = ('http://www.amazon.es/gp/redirect.html?ie=UTF8&' 'location=http://www.amazon.es/dp/%(asin)s&tag=%(tag)s' '&linkCode=ur2&camp=3626&creative=24790') - search_url = 'http://www.amazon.es/s/?url=search-alias%3Ddigital-text&field-keywords=' \ No newline at end of file + search_url = 'http://www.amazon.es/s/?url=search-alias%3Ddigital-text&field-keywords=' + + author_article = 'de ' \ No newline at end of file diff --git a/src/calibre/gui2/store/stores/amazon_fr_plugin.py b/src/calibre/gui2/store/stores/amazon_fr_plugin.py index 97a6179d7b..cd59be0313 100644 --- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py @@ -19,3 +19,4 @@ class AmazonFRKindleStore(AmazonUKKindleStore): store_link_details = 'http://www.amazon.fr/gp/redirect.html?ie=UTF8&location=http://www.amazon.fr/dp/%(asin)s&tag=%(tag)s&linkCode=ur2&camp=1634&creative=6738' search_url = 'http://www.amazon.fr/s/?url=search-alias%3Ddigital-text&field-keywords=' + author_article = 'de ' diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py index 563c26bfa1..ad028bf963 100644 --- a/src/calibre/gui2/store/stores/amazon_it_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py @@ -20,3 +20,5 @@ class AmazonITKindleStore(AmazonUKKindleStore): 'location=http://www.amazon.it/dp/%(asin)s&tag=%(tag)s&' 'linkCode=ur2&camp=3370&creative=23322') search_url = 'http://www.amazon.it/s/?url=search-alias%3Ddigital-text&field-keywords=' + + author_article = 'di ' \ No newline at end of file diff --git a/src/calibre/gui2/store/stores/amazon_uk_plugin.py b/src/calibre/gui2/store/stores/amazon_uk_plugin.py index 15980a3e8c..0f9caf8f3e 100644 --- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py @@ -29,6 +29,8 @@ class AmazonUKKindleStore(StorePlugin): 'linkCode=ur2&camp=1634&creative=6738') search_url = 'http://www.amazon.co.uk/s/?url=search-alias%3Ddigital-text&field-keywords=' + author_article = 'by ' + ''' For comments on the implementation, please see amazon_plugin.py ''' @@ -88,7 +90,8 @@ class AmazonUKKindleStore(StorePlugin): title = ''.join(data.xpath(title_xpath)) author = ''.join(data.xpath(author_xpath)) try: - author = author.split('by ', 1)[1].split(" (")[0] + if self.author_article: + author = author.split(self.author_article, 1)[1].split(" (")[0] except: pass