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

Fix #5501 (Error after query of social metadata if ISBN not find)

Browse Source
This commit is contained in:
Kovid Goyal 2010-05-15 10:29:21 -06:00
parent de305d2d95
commit d866fcc48f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,12 +19,18 @@ AWS_NS = 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'
def AWS(tag): def AWS(tag):
return '{%s}%s'%(AWS_NS, tag) return '{%s}%s'%(AWS_NS, tag)
def check_for_errors(root): class ISBNNotFound(ValueError):
pass
def check_for_errors(root, isbn):
err = root.find('.//'+AWS('Error')) err = root.find('.//'+AWS('Error'))
if err is not None: if err is not None:
text = etree.tostring(err, method='text', pretty_print=True,
encoding=unicode)
if 'AWS.InvalidParameterValue'+isbn in text:
raise ISBNNotFound(isbn)
raise Exception('Failed to get metadata with error: '\ raise Exception('Failed to get metadata with error: '\
+ etree.tostring(err, method='text', pretty_print=True, + text)
encoding=unicode))
def get_social_metadata(title, authors, publisher, isbn): def get_social_metadata(title, authors, publisher, isbn):
mi = MetaInformation(title, authors) mi = MetaInformation(title, authors)
@ -32,7 +38,10 @@ def get_social_metadata(title, authors, publisher, isbn):
br = browser() br = browser()
response_xml = br.open('http://status.calibre-ebook.com/aws/metadata/'+isbn).read() response_xml = br.open('http://status.calibre-ebook.com/aws/metadata/'+isbn).read()
root = etree.fromstring(response_xml) root = etree.fromstring(response_xml)
check_for_errors(root) try:
check_for_errors(root, isbn)
except ISBNNotFound:
return mi
mi.title = root.findtext('.//'+AWS('Title')) mi.title = root.findtext('.//'+AWS('Title'))
authors = [x.text for x in root.findall('.//'+AWS('Author'))] authors = [x.text for x in root.findall('.//'+AWS('Author'))]
if authors: if authors: