diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py index 7b4027794a..6833bd3710 100644 --- a/src/calibre/gui2/store/stores/amazon_de_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 2 # Needed for dynamic plugin loading +store_version = 3 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -18,13 +18,26 @@ from calibre import browser from calibre.gui2 import open_url from calibre.gui2.store.search_result import SearchResult +class AmazonDEKindleStore(StorePlugin): + ''' + For comments on the implementation, please see amazon_plugin.py + ''' + aff_id = {'tag': 'charhale0a-21'} + store_link = ('http://www.amazon.de/gp/redirect.html?ie=UTF8&site-redirect=de' + '&tag=%(tag)s&linkCode=ur2&camp=1638&creative=19454' + '&location=http://www.amazon.de/ebooks-kindle/b?node=530886031') + store_link_details = ('http://www.amazon.de/gp/redirect.html?ie=UTF8' + '&location=http://www.amazon.de/dp/%(asin)s&site-redirect=de' + '&tag=%(tag)s&linkCode=ur2&camp=1638&creative=6742') + search_url = 'http://www.amazon.de/s/?url=search-alias%3Ddigital-text&field-keywords=' -# This class is copy/pasted from amason_uk_plugin. Do not modify it in any -# other amazon EU plugin. Be sure to paste it into all other amazon EU plugins -# when modified. + author_article = 'von ' + + and_word = ' und ' + + # ---- Copy from here to end -class AmazonEUBase(StorePlugin): ''' For comments on the implementation, please see amazon_plugin.py ''' @@ -108,20 +121,3 @@ class AmazonEUBase(StorePlugin): def get_details(self, search_result, timeout): pass -class AmazonDEKindleStore(AmazonEUBase): - ''' - For comments on the implementation, please see amazon_plugin.py - ''' - - aff_id = {'tag': 'charhale0a-21'} - store_link = ('http://www.amazon.de/gp/redirect.html?ie=UTF8&site-redirect=de' - '&tag=%(tag)s&linkCode=ur2&camp=1638&creative=19454' - '&location=http://www.amazon.de/ebooks-kindle/b?node=530886031') - store_link_details = ('http://www.amazon.de/gp/redirect.html?ie=UTF8' - '&location=http://www.amazon.de/dp/%(asin)s&site-redirect=de' - '&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 ' - - and_word = ' und ' \ No newline at end of file diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py index 68387ffe11..0b71ae657b 100644 --- a/src/calibre/gui2/store/stores/amazon_es_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 2 # Needed for dynamic plugin loading +store_version = 3 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -18,12 +18,25 @@ from calibre import browser from calibre.gui2 import open_url from calibre.gui2.store.search_result import SearchResult +class AmazonESKindleStore(StorePlugin): + ''' + For comments on the implementation, please see amazon_plugin.py + ''' -# This class is copy/pasted from amason_uk_plugin. Do not modify it in any -# other amazon EU plugin. Be sure to paste it into all other amazon EU plugins -# when modified. + aff_id = {'tag': 'charhale09-21'} + store_link = ('http://www.amazon.es/ebooks-kindle/b?_encoding=UTF8&' + 'node=827231031&tag=%(tag)s&ie=UTF8&linkCode=ur2&camp=3626&creative=24790') + 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=' + + author_article = 'de ' + + and_word = ' y ' + + # ---- Copy from here to end -class AmazonEUBase(StorePlugin): ''' For comments on the implementation, please see amazon_plugin.py ''' @@ -107,19 +120,3 @@ class AmazonEUBase(StorePlugin): def get_details(self, search_result, timeout): pass -class AmazonESKindleStore(AmazonEUBase): - ''' - For comments on the implementation, please see amazon_plugin.py - ''' - - aff_id = {'tag': 'charhale09-21'} - store_link = ('http://www.amazon.es/ebooks-kindle/b?_encoding=UTF8&' - 'node=827231031&tag=%(tag)s&ie=UTF8&linkCode=ur2&camp=3626&creative=24790') - 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=' - - author_article = 'de ' - - and_word = ' y ' \ 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 9b425a2fc9..4520a3a104 100644 --- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 2 # Needed for dynamic plugin loading +store_version = 3 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -18,13 +18,22 @@ from calibre import browser from calibre.gui2 import open_url from calibre.gui2.store.search_result import SearchResult +class AmazonFRKindleStore(StorePlugin): + ''' + For comments on the implementation, please see amazon_plugin.py + ''' + aff_id = {'tag': 'charhale-21'} + store_link = 'http://www.amazon.fr/livres-kindle/b?ie=UTF8&node=695398031&ref_=sa_menu_kbo1&_encoding=UTF8&tag=%(tag)s&linkCode=ur2&camp=1642&creative=19458' % aff_id + 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=' -# This class is copy/pasted from amason_uk_plugin. Do not modify it in any -# other amazon EU plugin. Be sure to paste it into all other amazon EU plugins -# when modified. + author_article = 'de ' + + and_word = ' et ' + + # ---- Copy from here to end -class AmazonEUBase(StorePlugin): ''' For comments on the implementation, please see amazon_plugin.py ''' @@ -108,16 +117,3 @@ class AmazonEUBase(StorePlugin): def get_details(self, search_result, timeout): pass -class AmazonFRKindleStore(AmazonEUBase): - ''' - For comments on the implementation, please see amazon_plugin.py - ''' - - aff_id = {'tag': 'charhale-21'} - store_link = 'http://www.amazon.fr/livres-kindle/b?ie=UTF8&node=695398031&ref_=sa_menu_kbo1&_encoding=UTF8&tag=%(tag)s&linkCode=ur2&camp=1642&creative=19458' % aff_id - 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 ' - - and_word = ' et ' diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py index 2493f78ea3..f8a756d1d5 100644 --- a/src/calibre/gui2/store/stores/amazon_it_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 2 # Needed for dynamic plugin loading +store_version = 3 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -18,12 +18,25 @@ from calibre import browser from calibre.gui2 import open_url from calibre.gui2.store.search_result import SearchResult +class AmazonITKindleStore(StorePlugin): + ''' + For comments on the implementation, please see amazon_plugin.py + ''' -# This class is copy/pasted from amason_uk_plugin. Do not modify it in any -# other amazon EU plugin. Be sure to paste it into all other amazon EU plugins -# when modified. + aff_id = {'tag': 'httpcharles07-21'} + store_link = ('http://www.amazon.it/ebooks-kindle/b?_encoding=UTF8&' + 'node=827182031&tag=%(tag)s&ie=UTF8&linkCode=ur2&camp=3370&creative=23322') + store_link_details = ('http://www.amazon.it/gp/redirect.html?ie=UTF8&' + '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 ' + + and_word = ' e ' + + # ---- Copy from here to end -class AmazonEUBase(StorePlugin): ''' For comments on the implementation, please see amazon_plugin.py ''' @@ -106,20 +119,3 @@ class AmazonEUBase(StorePlugin): def get_details(self, search_result, timeout): pass - -class AmazonITKindleStore(AmazonEUBase): - ''' - For comments on the implementation, please see amazon_plugin.py - ''' - - aff_id = {'tag': 'httpcharles07-21'} - store_link = ('http://www.amazon.it/ebooks-kindle/b?_encoding=UTF8&' - 'node=827182031&tag=%(tag)s&ie=UTF8&linkCode=ur2&camp=3370&creative=23322') - store_link_details = ('http://www.amazon.it/gp/redirect.html?ie=UTF8&' - '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 ' - - and_word = ' e ' \ 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 054072824b..f6082ac790 100644 --- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 2 # Needed for dynamic plugin loading +store_version = 3 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -19,11 +19,28 @@ from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -# This class is copy/pasted from amason_uk_plugin. Do not modify it in any -# other amazon EU plugin. Be sure to paste it into all other amazon EU plugins -# when modified. -class AmazonEUBase(StorePlugin): +class AmazonUKKindleStore(StorePlugin): + aff_id = {'tag': 'calcharles-21'} + store_link = ('http://www.amazon.co.uk/gp/redirect.html?ie=UTF8&' + 'location=http://www.amazon.co.uk/Kindle-eBooks/b?' + 'ie=UTF8&node=341689031&ref_=sa_menu_kbo2&tag=%(tag)s&' + 'linkCode=ur2&camp=1634&creative=19450') + store_link_details = ('http://www.amazon.co.uk/gp/redirect.html?ie=UTF8&' + 'location=http://www.amazon.co.uk/dp/%(asin)s&tag=%(tag)s&' + 'linkCode=ur2&camp=1634&creative=6738') + search_url = 'http://www.amazon.co.uk/s/?url=search-alias%3Ddigital-text&field-keywords=' + + author_article = 'by ' + + and_word = ' and ' + + # This code is copy/pasted from from here to the other amazon EU. Do not + # modify it in any other amazon EU plugin. Be sure to paste it into all + # other amazon EU plugins when modified. + + # ---- Copy from here to end + ''' For comments on the implementation, please see amazon_plugin.py ''' @@ -107,18 +124,3 @@ class AmazonEUBase(StorePlugin): def get_details(self, search_result, timeout): pass -class AmazonUKKindleStore(AmazonEUBase): - aff_id = {'tag': 'calcharles-21'} - store_link = ('http://www.amazon.co.uk/gp/redirect.html?ie=UTF8&' - 'location=http://www.amazon.co.uk/Kindle-eBooks/b?' - 'ie=UTF8&node=341689031&ref_=sa_menu_kbo2&tag=%(tag)s&' - 'linkCode=ur2&camp=1634&creative=19450') - store_link_details = ('http://www.amazon.co.uk/gp/redirect.html?ie=UTF8&' - 'location=http://www.amazon.co.uk/dp/%(asin)s&tag=%(tag)s&' - 'linkCode=ur2&camp=1634&creative=6738') - search_url = 'http://www.amazon.co.uk/s/?url=search-alias%3Ddigital-text&field-keywords=' - - author_article = 'by ' - - and_word = ' and ' -