diff --git a/src/calibre/gui2/store/stores/amazon_au_plugin.py b/src/calibre/gui2/store/stores/amazon_au_plugin.py index ae114aea83..c1cd2d0e13 100644 --- a/src/calibre/gui2/store/stores/amazon_au_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_au_plugin.py @@ -4,7 +4,7 @@ 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 from contextlib import closing import urllib @@ -18,10 +18,10 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.com.au/s/' +SEARCH_BASE_URL = 'https://www.amazon.com.au/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} -DETAILS_URL = 'http://amazon.com.au/dp/' -STORE_LINK = 'http://www.amazon.com.au' +DETAILS_URL = 'https://amazon.com.au/dp/' +STORE_LINK = 'https://www.amazon.com.au' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -142,6 +142,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'): diff --git a/src/calibre/gui2/store/stores/amazon_ca_plugin.py b/src/calibre/gui2/store/stores/amazon_ca_plugin.py index 9b90d7f128..3584e839af 100644 --- a/src/calibre/gui2/store/stores/amazon_ca_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_ca_plugin.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 4 # Needed for dynamic plugin loading +store_version = 5 # Needed for dynamic plugin loading from contextlib import closing import urllib @@ -18,10 +18,10 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.ca/s/' +SEARCH_BASE_URL = 'https://www.amazon.ca/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} -DETAILS_URL = 'http://amazon.ca/dp/' -STORE_LINK = 'http://www.amazon.ca' +DETAILS_URL = 'https://amazon.ca/dp/' +STORE_LINK = 'https://www.amazon.ca' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -142,6 +142,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'): diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py index 469ba52676..40d717e810 100644 --- a/src/calibre/gui2/store/stores/amazon_de_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 12 # Needed for dynamic plugin loading +store_version = 13 # Needed for dynamic plugin loading from contextlib import closing import urllib @@ -18,12 +18,12 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.de/s/' +SEARCH_BASE_URL = 'https://www.amazon.de/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} BY = 'von' KINDLE_EDITION = 'Kindle Edition' -DETAILS_URL = 'http://amazon.de/dp/' -STORE_LINK = 'http://www.amazon.de' +DETAILS_URL = 'https://amazon.de/dp/' +STORE_LINK = 'https://www.amazon.de' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -144,6 +144,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'): diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py index 0a5611dbde..6e013b2e88 100644 --- a/src/calibre/gui2/store/stores/amazon_es_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 12 # Needed for dynamic plugin loading +store_version = 13 # Needed for dynamic plugin loading from contextlib import closing import urllib @@ -18,12 +18,12 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.es/s/' +SEARCH_BASE_URL = 'https://www.amazon.es/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} BY = 'de' KINDLE_EDITION = 'Versión Kindle' -DETAILS_URL = 'http://amazon.es/dp/' -STORE_LINK = 'http://www.amazon.es' +DETAILS_URL = 'https://amazon.es/dp/' +STORE_LINK = 'https://www.amazon.es' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -144,6 +144,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'): diff --git a/src/calibre/gui2/store/stores/amazon_fr_plugin.py b/src/calibre/gui2/store/stores/amazon_fr_plugin.py index e325d0eab9..e9574cd624 100644 --- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 12 # Needed for dynamic plugin loading +store_version = 13 # Needed for dynamic plugin loading from contextlib import closing import urllib @@ -18,12 +18,12 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.fr/s/' +SEARCH_BASE_URL = 'https://www.amazon.fr/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} BY = 'de' KINDLE_EDITION = 'Format Kindle' -DETAILS_URL = 'http://amazon.fr/dp/' -STORE_LINK = 'http://www.amazon.fr' +DETAILS_URL = 'https://amazon.fr/dp/' +STORE_LINK = 'https://www.amazon.fr' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -144,6 +144,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'): diff --git a/src/calibre/gui2/store/stores/amazon_in_plugin.py b/src/calibre/gui2/store/stores/amazon_in_plugin.py index d9d3e1418f..953fff080f 100644 --- a/src/calibre/gui2/store/stores/amazon_in_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_in_plugin.py @@ -4,7 +4,7 @@ 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 from contextlib import closing import urllib @@ -18,10 +18,10 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.in/s/' +SEARCH_BASE_URL = 'https://www.amazon.in/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} -DETAILS_URL = 'http://amazon.in/dp/' -STORE_LINK = 'http://www.amazon.in' +DETAILS_URL = 'https://amazon.in/dp/' +STORE_LINK = 'https://www.amazon.in' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -144,6 +144,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'): diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py index ded3a8cae9..b99508afba 100644 --- a/src/calibre/gui2/store/stores/amazon_it_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 12 # Needed for dynamic plugin loading +store_version = 13 # Needed for dynamic plugin loading from contextlib import closing import urllib @@ -18,12 +18,12 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.it/s/' +SEARCH_BASE_URL = 'https://www.amazon.it/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} BY = 'di' KINDLE_EDITION = 'Formato Kindle' -DETAILS_URL = 'http://amazon.it/dp/' -STORE_LINK = 'http://www.amazon.it' +DETAILS_URL = 'https://amazon.it/dp/' +STORE_LINK = 'https://www.amazon.it' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -144,6 +144,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'): diff --git a/src/calibre/gui2/store/stores/amazon_plugin.py b/src/calibre/gui2/store/stores/amazon_plugin.py index 56ccc67225..1032182d9c 100644 --- a/src/calibre/gui2/store/stores/amazon_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_plugin.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 12 # Needed for dynamic plugin loading +store_version = 13 # Needed for dynamic plugin loading from contextlib import closing import urllib @@ -18,10 +18,10 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.com/s/' +SEARCH_BASE_URL = 'https://www.amazon.com/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} -DETAILS_URL = 'http://amazon.com/dp/' -STORE_LINK = 'http://www.amazon.com/Kindle-eBooks' +DETAILS_URL = 'https://amazon.com/dp/' +STORE_LINK = 'https://www.amazon.com/Kindle-eBooks' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -179,6 +179,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'): diff --git a/src/calibre/gui2/store/stores/amazon_uk_plugin.py b/src/calibre/gui2/store/stores/amazon_uk_plugin.py index 9786c6f3b7..184e0a42d6 100644 --- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 12 # Needed for dynamic plugin loading +store_version = 13 # Needed for dynamic plugin loading from contextlib import closing import urllib @@ -18,10 +18,10 @@ from calibre.gui2 import open_url from calibre.gui2.store import StorePlugin from calibre.gui2.store.search_result import SearchResult -SEARCH_BASE_URL = 'http://www.amazon.co.uk/s/' +SEARCH_BASE_URL = 'https://www.amazon.co.uk/s/' SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'} -DETAILS_URL = 'http://amazon.co.uk/dp/' -STORE_LINK = 'http://www.amazon.co.uk' +DETAILS_URL = 'https://amazon.co.uk/dp/' +STORE_LINK = 'https://www.amazon.co.uk' DRM_SEARCH_TEXT = 'Simultaneous Device Usage' DRM_FREE_TEXT = 'Unlimited' @@ -142,6 +142,7 @@ class AmazonKindleStore(StorePlugin): search_result.drm = SearchResult.DRM_LOCKED return True + if __name__ == '__main__': import sys for result in search_amazon(' '.join(sys.argv[1:]), write_html_to='/t/amazon.html'):