Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont try to get cached URL for directly contrsucted asing based URLs

Browse Source
This commit is contained in:
Kovid Goyal 2017-03-02 10:28:58 +05:30
parent f4c054397a
commit c16f555f18
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/ebooks/metadata/sources/amazon.py
View File

@ -1247,25 +1247,20 @@ class Amazon(Source):
log('User-agent:', br.current_user_agent()) log('User-agent:', br.current_user_agent())
if testing: if testing:
print('User-agent:', br.current_user_agent()) print('User-agent:', br.current_user_agent())
if udata is not None: if udata is not None and not USE_SEARCH_ENGINE:
# Try to directly get details page instead of running a search # Try to directly get details page instead of running a search
# Cannot use search engine as the directly constructed URL is
# usually redirected to a full URL by amazon, which is therefore
# not cached
domain, idtype, asin, durl = udata domain, idtype, asin, durl = udata
cover_url_processor = None if durl is not None:
if USE_SEARCH_ENGINE:
se = search_engines_module()
durl = se.wayback_machine_cached_url(
durl, br, timeout=timeout, log=log)
cover_url_processor = se.wayback_url_processor
if durl is None:
log('Failed to get cached URL for asin:', asin)
else:
preparsed_root = parse_details_page( preparsed_root = parse_details_page(
durl, log, timeout, br, domain) durl, log, timeout, br, domain)
if preparsed_root is not None: if preparsed_root is not None:
qasin = parse_asin(preparsed_root[1], log, durl) qasin = parse_asin(preparsed_root[1], log, durl)
if qasin == asin: if qasin == asin:
w = Worker(durl, result_queue, br, log, 0, domain, w = Worker(durl, result_queue, br, log, 0, domain,
self, testing=testing, preparsed_root=preparsed_root, cover_url_processor=cover_url_processor) self, testing=testing, preparsed_root=preparsed_root)
try: try:
w.get_details() w.get_details()
return return