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

Update Amazon metadata plugin for changes to amazon.co.jp

Browse Source 
Fixes #1922309 [Japanese amazon encoding issue](https://bugs.launchpad.net/calibre/+bug/1922309)
This commit is contained in:
Kovid Goyal 2021-04-02 10:08:13 +05:30
parent 151bc8eca0
commit eb56bc531b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -908,7 +908,7 @@ class Worker(Thread): # Get details {{{
class Amazon(Source):
name = 'Amazon.com'
version = (1, 2, 15)
version = (1, 2, 16)
minimum_calibre_version = (2, 82, 0)
description = _('Downloads metadata and covers from Amazon')
@ -1178,9 +1178,6 @@ class Amazon(Source):
if not for_amazon:
return terms, domain
if domain == 'jp':
# magic parameter to enable Japanese Shift_JIS encoding.
q['__mk_ja_JP'] = 'カタカナ'
if domain == 'nl':
q['__mk_nl_NL'] = 'ÅMÅŽÕÑ'
if 'field-keywords' not in q:
@ -1189,17 +1186,15 @@ class Amazon(Source):
q['field-keywords'] += ' ' + q.pop(f, '')
q['field-keywords'] = q['field-keywords'].strip()
encode_to = 'Shift_JIS' if domain == 'jp' else 'utf-8'
encoded_q = dict([(x.encode(encode_to, 'ignore'), y.encode(encode_to,
'ignore')) for x, y in q.items()])
encoded_q = dict([(x.encode('utf-8', 'ignore'), y.encode(
'utf-8', 'ignore')) for x, y in q.items()])
url_query = urlencode(encoded_q)
if encode_to == 'utf-8':
# amazon's servers want IRIs with unicode characters not percent esaped
parts = []
for x in url_query.split(b'&' if isinstance(url_query, bytes) else '&'):
k, v = x.split(b'=' if isinstance(x, bytes) else '=', 1)
parts.append('{}={}'.format(iri_quote_plus(unquote_plus(k)), iri_quote_plus(unquote_plus(v))))
url_query = '&'.join(parts)
# amazon's servers want IRIs with unicode characters not percent esaped
parts = []
for x in url_query.split(b'&' if isinstance(url_query, bytes) else '&'):
k, v = x.split(b'=' if isinstance(x, bytes) else '=', 1)
parts.append('{}={}'.format(iri_quote_plus(unquote_plus(k)), iri_quote_plus(unquote_plus(v))))
url_query = '&'.join(parts)
url = 'https://www.amazon.%s/s/?' % self.get_website_domain(
domain) + url_query
return url, domain